commit c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 Author: Linus Torvalds Date: Tue Jan 18 15:14:02 2011 -0800 Linux 2.6.38-rc1 commit 39f3b1a6878bd9d8c81443546c1115c38d18d44d Merge: 335bc70 c7bf71c Author: Linus Torvalds Date: Tue Jan 18 14:30:00 2011 -0800 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: (lm93) Add support for LM94 commit 335bc70b6b5fdc9b4e28cb56c27f10124064f9da Merge: 404cbbd 66832eb Author: Linus Torvalds Date: Tue Jan 18 14:29:37 2011 -0800 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: Validate cpu early in perf_event_alloc() perf: Find_get_context: fix the per-cpu-counter check perf: Fix contexted inheritance commit 404cbbd52f10d1d5719ad82ce8ba903890779255 Merge: 5d7e8af 7b698ea Author: Linus Torvalds Date: Tue Jan 18 14:29:21 2011 -0800 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: Clear irqstack thread_info x86: Make relocatable kernel work with new binutils commit 5d7e8af3c5727626b9e7f909c778b9ac9b4a1809 Merge: aa891f6 79aa18d Author: Linus Torvalds Date: Tue Jan 18 14:28:48 2011 -0800 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus: (26 commits) MIPS: Malta: enable Cirrus FB console MIPS: add CONFIG_VIRTUALIZATION for virtio support MIPS: Implement __read_mostly MIPS: ath79: add common WMAC device for AR913X based boards MIPS: ath79: Add initial support for the Atheros AP81 reference board MIPS: ath79: add common SPI controller device SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs MIPS: ath79: add common GPIO buttons device MIPS: ath79: add common watchdog device MIPS: ath79: add common GPIO LEDs device MIPS: ath79: add initial support for the Atheros PB44 reference board MIPS: ath79: utilize the MIPS multi-machine support MIPS: ath79: add GPIOLIB support MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs MIPS: jump label: Add MIPS support. MIPS: Use WARN() in uasm for better diagnostics. MIPS: Optimize TLB handlers for Octeon CPUs MIPS: Add LDX and LWX instructions to uasm. MIPS: Use BBIT instructions in TLB handlers MIPS: Declare uasm bbit0 and bbit1 functions. ... commit c7bf71c517abfc3b15970d67910e0f62e0522939 Author: Guenter Roeck Date: Mon Jan 17 12:48:20 2011 -0800 hwmon: (lm93) Add support for LM94 This patch adds basic support for LM94 to the LM93 driver. LM94 specific sensors and features are not supported. Signed-off-by: Guenter Roeck Acked-by: Jean Delvare commit 66832eb4baaaa9abe4c993ddf9113a79e39b9915 Author: Oleg Nesterov Date: Tue Jan 18 17:10:32 2011 +0100 perf: Validate cpu early in perf_event_alloc() Starting from perf_event_alloc()->perf_init_event(), the kernel assumes that event->cpu is either -1 or the valid CPU number. Change perf_event_alloc() to validate this argument early. This also means we can remove the similar check in find_get_context(). Signed-off-by: Oleg Nesterov Acked-by: Peter Zijlstra Cc: Alan Stern Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Prasad Cc: Roland McGrath Cc: gregkh@suse.de Cc: stable@kernel.org LKML-Reference: <20110118161032.GC693@redhat.com> Signed-off-by: Ingo Molnar commit 22a4ec729017ba613337a28f306f94ba5023fe2e Author: Oleg Nesterov Date: Tue Jan 18 17:10:08 2011 +0100 perf: Find_get_context: fix the per-cpu-counter check If task == NULL, find_get_context() should always check that cpu is correct. Afaics, the bug was introduced by 38a81da2 "perf events: Clean up pid passing", but even before that commit "&& cpu != -1" was not exactly right, -ESRCH from find_task_by_vpid() is not accurate. Signed-off-by: Oleg Nesterov Acked-by: Peter Zijlstra Cc: Alan Stern Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Paul Mackerras Cc: Prasad Cc: Roland McGrath Cc: gregkh@suse.de Cc: stable@kernel.org LKML-Reference: <20110118161008.GB693@redhat.com> Signed-off-by: Ingo Molnar commit 79aa18d557bef02171da42ee928c23509e6ef4f7 Author: Aurelien Jarno Date: Tue Jan 18 12:20:45 2011 +0100 MIPS: Malta: enable Cirrus FB console While most users of a physical Malta board are using the serial port as the console, a lot of QEMU users would prefer to interact with a graphical console. Enable the Cirrus FB support in the Malta default configuration to make that possible. Note that the default console will still be the serial port, users have to pass "console=tty0" to the kernel to use the Cirrus FB. Signed-off-by: Aurelien Jarno To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2001/ Signed-off-by: Ralf Baechle commit 92e88b4e903dc6de7a82b76fd241e2ac6f87aa9e Author: Aurelien Jarno Date: Tue Jan 18 12:20:44 2011 +0100 MIPS: add CONFIG_VIRTUALIZATION for virtio support Add CONFIG_VIRTUALIZATION to the MIPS architecture and include the the virtio code there. Used to enable the virtio drivers under QEMU. Signed-off-by: Aurelien Jarno To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2002/ Signed-off-by: Ralf Baechle commit 1befdd5536e1500371f7f884d0f0ae528a519333 Author: David Daney Date: Thu Oct 14 12:36:49 2010 -0700 MIPS: Implement __read_mostly Just do what everyone else is doing by placing __read_mostly things in the .data.read_mostly section. mips_io_port_base can not be read-only (const) and writable (__read_mostly) at the same time. One of them has to go, so I chose to eliminate the __read_mostly. It will still get stuck in a portion of memory that is not adjacent to things that are written, and thus not be on a dirty cache line, for whatever that is worth. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: http://patchwork.linux-mips.org/patch/1702/ Signed-off-by: Ralf Baechle commit f5b35d0b16a08e6c1e7c8a41fa87ad10cf9aefa4 Author: Gabor Juhos Date: Tue Jan 4 21:28:29 2011 +0100 MIPS: ath79: add common WMAC device for AR913X based boards Add common platform_device and helper code to make the registration of the built-in wireless MAC easier on the Atheros AR9130/AR9132 based boards. Also register the WMAC device on the AR81 board. Signed-off-by: Gabor Juhos Cc: linux-mips@linux-mips.org Cc: Imre Kaloz , Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1962/ Signed-off-by: Ralf Baechle commit aa6695ec8b51da7aaa245310073ddd39a306a77f Author: Gabor Juhos Date: Tue Jan 4 21:28:28 2011 +0100 MIPS: ath79: Add initial support for the Atheros AP81 reference board Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1952/ Signed-off-by: Ralf Baechle commit 68a1d3163678a42ad2d0a9013672083c4fb613be Author: Gabor Juhos Date: Tue Jan 4 21:28:23 2011 +0100 MIPS: ath79: add common SPI controller device Several boards are using the built-in SPI controller of the AR71XX/AR724X/AR913X SoCs. This patch adds common platform_device and helper code to register it. Additionally, the patch registers the SPI bus on the PB44 board. Signed-off-by: Gabor Juhos Cc: linux-mips@linux-mips.org Cc: Imre Kaloz Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1956/ Signed-off-by: Ralf Baechle commit 8efaef4dc842a8a050d10aef30e26220b8995fc3 Author: Gabor Juhos Date: Tue Jan 4 21:28:22 2011 +0100 SPI: Add SPI controller driver for the Atheros AR71XX/AR724X/AR913X SoCs The Atheros AR71XX/AR724X/AR913X SoCs have a built-in SPI controller. This patch implements a driver for that. Signed-off-by: Gabor Juhos Cc: David Brownell Cc: spi-devel-general@lists.sourceforge.net Acked-by: Grant Likely Cc: linux-mips@linux-mips.org Cc: Imre Kaloz Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1960/ Signed-off-by: Ralf Baechle commit 3f348c5d1aaa0b8b2563f50d2d9a0c64e7d649fb Author: Gabor Juhos Date: Tue Jan 4 21:28:21 2011 +0100 MIPS: ath79: add common GPIO buttons device Almost all boards have one or more push buttons connected to GPIO lines. This patch adds common code to register a platform_device for them. The patch also adds support for the buttons on the PB44 board. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1954/ Signed-off-by: Ralf Baechle commit 858f763c1cc37ecc6ab39dec60bb3a46606dcac4 Author: Gabor Juhos Date: Tue Jan 4 21:28:20 2011 +0100 MIPS: ath79: add common watchdog device All supported SoCs have a built-in hardware watchdog driver. This patch registers a platform_device for that to make it usable. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1955/ Signed-off-by: Ralf Baechle commit d8fec1fc80cd8639449e2b5012688f5be109eeaf Author: Gabor Juhos Date: Tue Jan 4 21:28:18 2011 +0100 MIPS: ath79: add common GPIO LEDs device Almost all boards have one or more LEDs connected to GPIO lines. This patch adds common code to register a platform_device for them. The patch also adds support for the LEDs on the PB44 board. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1953/ Signed-off-by: Ralf Baechle commit 0cde72284c9c7d4b348ece9e1fe136f787185cd7 Author: Gabor Juhos Date: Tue Jan 4 21:28:17 2011 +0100 MIPS: ath79: add initial support for the Atheros PB44 reference board Signed-off-by: Gabor Juhos Cc: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1950/ Signed-off-by: Ralf Baechle commit 0aabf1a4d9b6b2d2371f641ec19fb7551cea4a90 Author: Gabor Juhos Date: Tue Jan 4 21:28:16 2011 +0100 MIPS: ath79: utilize the MIPS multi-machine support Signed-off-by: Gabor Juhos Cc: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1949/ Signed-off-by: Ralf Baechle commit 6eae43c57ee92de91f6cc7c391cea97c43295da0 Author: Gabor Juhos Date: Tue Jan 4 21:28:15 2011 +0100 MIPS: ath79: add GPIOLIB support This patch implements generic GPIO routines for the built-in GPIO controllers of the Atheros AR71XX/AR724X/AR913X SoCs. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: David Brownell Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1948/ Signed-off-by: Ralf Baechle commit d4a67d9dc8a5a80c4ec1814791af8c0252c158b8 Author: Gabor Juhos Date: Tue Jan 4 21:28:14 2011 +0100 MIPS: Add initial support for the Atheros AR71XX/AR724X/AR931X SoCs This patch adds initial support for various Atheros SoCs based on the MIPS 24Kc core. The following models are supported at the moment: - AR7130 - AR7141 - AR7161 - AR9130 - AR9132 - AR7240 - AR7241 - AR7242 The current patch contains minimal support only, but the resulting kernel can boot into user-space with using of an initramfs image on various boards which are using these SoCs. Support for more built-in devices and individual boards will be implemented in further patches. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Cc: linux-mips@linux-mips.org Cc: Luis R. Rodriguez Cc: Cliff Holden Cc: Kathy Giori Patchwork: https://patchwork.linux-mips.org/patch/1947/ Signed-off-by: Ralf Baechle commit 94bb0c1ab293c298a8852e4f10c4215bad6daa9b Author: David Daney Date: Tue Dec 28 13:26:23 2010 -0800 MIPS: jump label: Add MIPS support. In order not to be left behind, we add jump label support for MIPS. Tested on 64-bit big endian (Octeon), and 32-bit little endian (malta/qemu). Signed-off-by: David Daney To: linux-mips@linux-mips.org Cc: Steven Rostedt Cc: Jason Baron Patchwork: https://patchwork.linux-mips.org/patch/1923/ Signed-off-by: Ralf Baechle commit 8d662c8d34a05e8e47deaa9e22fe770dc557c2d3 Author: David Daney Date: Mon Dec 27 18:18:29 2010 -0800 MIPS: Use WARN() in uasm for better diagnostics. On the off chance that uasm ever warns about overflow, there is no way to know what the offending instruction is. Change the printks to WARNs, so we can get a nice stack trace. It has the added benefit of being much more noticeable than the short single line warning message, so is less likely to be ignored. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1905/ Signed-off-by: Ralf Baechle commit 2c8c53e28f178577dfdf3a69731b998b7e3df8ae Author: David Daney Date: Mon Dec 27 18:07:57 2010 -0800 MIPS: Optimize TLB handlers for Octeon CPUs Octeon can use scratch registers in the TLB handlers. Octeon II can use LDX instructions. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1904/ Signed-off-by: Ralf Baechle commit bb3d68c30a00918d4c9fa02a5c17a5aacf597977 Author: David Daney Date: Mon Dec 27 18:07:56 2010 -0800 MIPS: Add LDX and LWX instructions to uasm. Needed by Octeon II optimized TLB handlers. Signed-off-by: David Daney To: linux-mips@linux-mips.org Pachwork: https://patchwork.linux-mips.org/patch/1903/ Signed-off-by: Ralf Baechle commit cc33ae437975416a1b78f99e2715e91ab643526a Author: David Daney Date: Mon Dec 20 15:54:50 2010 -0800 MIPS: Use BBIT instructions in TLB handlers If the CPU supports BBIT0 and BBIT1, use them in TLB handlers as they are more efficient than an AND followed by an branch and then restoring the clobbered register. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1873/ Signed-off-by: Ralf Baechle commit afc7c9864a2d1b0c398425aac84b8a095c8dfa7c Author: David Daney Date: Mon Dec 20 15:54:49 2010 -0800 MIPS: Declare uasm bbit0 and bbit1 functions. these are already defined, but declaring them allow them to be used outside of uasm.c. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1872/ Signed-off-by: Ralf Baechle commit 3d8bfdd0307223de678962f1c1907a7cec549136 Author: David Daney Date: Tue Dec 21 14:19:11 2010 -0800 MIPS: Use C0_KScratch (if present) to hold PGD pointer. Decide at runtime to use either Context or KScratch to hold the PGD pointer. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1876/ Signed-off-by: Ralf Baechle commit c42aef0947d717849f31965ecc0778707839bfe0 Author: David Daney Date: Tue Dec 21 14:19:10 2010 -0800 MIPS: Add DINSM to uasm. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1875/ Signed-off-by: Ralf Baechle commit e77c32fe284a4da1b4e0994890a4d3527812eb61 Author: David Daney Date: Tue Dec 21 14:19:09 2010 -0800 MIPS: Probe for presence of KScratch registers. Probe c0_config4 for KScratch registers and report them in /proc/cpuinfo. Signed-off-by: David Daney To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/1877/ Signed-off-by: Ralf Baechle commit 487d70d0b8bd1c70d099a7526077ffefee412050 Author: Gabor Juhos Date: Tue Nov 23 16:06:25 2010 +0100 MIPS: Add generic support for multiple machines within a single kernel This patch adds a generic solution to support multiple machines based on a given SoC within a single kernel image. It is implemented already for several other architectures but MIPS has no generic support for that yet. [Ralf: This competes with DT but DT is a much more complex solution and this code has been used by OpenWRT for a long time so for now DT is a bad reason to stop the merge but longer term this should be migrated to DT.] Signed-off-by: Gabor Juhos Cc: linux-mips@linux-mips.org Cc: kaloz@openwrt.org Cc: Luis R. Rodriguez Cc: Cliff Holden Patchwork: https://patchwork.linux-mips.org/patch/1814/ Signed-off-by: Ralf Baechle commit 0bec405e8ee390067e63265b3002aaac49d4eea8 Author: Joe Perches Date: Fri Nov 12 13:37:52 2010 -0800 MIPS: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches To: Jiri Kosina Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/1772/ Signed-off-by: Ralf Baechle commit a1181caac965c660be2bd350a9deb763e6f4b738 Author: Joe Perches Date: Thu Nov 4 20:07:26 2010 -0700 MIPS: Sibyte: Use vzalloc in sbbus profiler Signed-off-by: Joe Perches To: Jiri Kosina Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/1756/ Signed-off-by: Ralf Baechle commit aa891f6b3f440402c6879ad1ecf332d318137422 Merge: a25cecc 84cd845 Author: Linus Torvalds Date: Tue Jan 18 10:00:50 2011 -0800 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: parisc: fix compile breakage caused by inlining maybe_mkwrite parisc : Remove broken line wrapping handling pdc_iodc_print() commit a25cecce88194b2edf38b8c3b1665e9318eb2d22 Merge: b7c15e4 658b368 Author: Linus Torvalds Date: Tue Jan 18 08:06:22 2011 -0800 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze * 'next' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix asm/pgtable.h microblaze: Fix missing pagemap.h commit b7c15e4a1cbf19be3d3063819b472806902fb525 Merge: 6a7f6ec 27de094 Author: Linus Torvalds Date: Tue Jan 18 08:05:50 2011 -0800 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 - Fix initialization for HP 2011 notebooks ALSA: hda - Add support for VMware controller ALSA: hda - consitify string arrays ALSA: hda - Add add multi-streaming playback for AD1988 ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code ASoC: WM8990: msleep() takes milliseconds not jiffies ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu ALSA: constify functions in ac97 ASoC: WL1273 FM radio: Fix breakage with MFD API changes ALSA: hda - More coverage for odd-number channels elimination for HDMI ALSA: hda - Store PCM parameters properly in HDMI open callback ALSA: hda - Rearrange fixup struct in patch_realtek.c ALSA: oxygen: Xonar DG: fix CS4245 register writes ALSA: hda - Suppress the odd number of channels for HDMI ALSA: hda - Add fixup-call in init callback ALSA: hda - Reorganize fixup structure for Realtek ALSA: hda - Apply Sony VAIO hweq fixup only once ALSA: hda - Apply mario fixup only once ALSA: hda - Remove unused fixup entry for ALC262 commit 6a7f6ec9512970874fa9fc883ea44d77d0f287c2 Merge: c6fa63c 4c65595 Author: Linus Torvalds Date: Tue Jan 18 08:05:20 2011 -0800 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: (25 commits) m68knommu: fix broken setting of irq_chip and handler m68knommu: switch to using -mcpu= flags for ColdFire targets m68knommu: arch/m68knommu/Kconfig whitespace cleanup m68knommu: create optimal separate instruction and data cache for ColdFire m68knommu: support ColdFire caches that do copyback and write-through m68knommu: support version 2 ColdFire split cache m68knommu: make cache push code ColdFire generic m68knommu: clean up ColdFire cache control code m68knommu: move inclusion of ColdFire v4 cache registers m68knommu: merge bit definitions for version 3 ColdFire cache controller m68knommu: create bit definitions for the version 2 ColdFire cache controller m68knommu: remove empty __iounmap() it is no used m68knommu: remove kernel_map() code, it is not used m68knommu: remove do_page_fault(), it is not used m68knommu: use user stack pointer hardware on some ColdFire cores m68knommu: remove command line printing DEBUG m68knommu: remove fasthandler interrupt code m68knommu: move UART addressing to part specific includes m68knommu: fix clock rate value reported for ColdFire 54xx parts m68knommu: move ColdFire CPU names into their headers ... commit c6fa63c659b3dd121f21afe7529f505505e79b23 Merge: 34c682a ad7f4e3 Author: Linus Torvalds Date: Tue Jan 18 08:04:30 2011 -0800 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 tools: Fix tracepoint id to string perf.data header table perf tools: Fix handling of wildcards in tracepoint event selectors powerpc: perf: Fix frequency calculation for overflowing counters commit 34c682adb30e9602e92f044056c142f69b4a6cfe Merge: 8dec000 fbcb44d Author: Linus Torvalds Date: Tue Jan 18 08:03:55 2011 -0800 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: S5PV310: Add missing virtual ASoC DMA device ARM: S5PV210: Add missing virtual ASoC DMA device ARM: S5P6450: Add missing virtual ASoC DMA device ARM: S5P6440: Add missing virtual ASoC DMA device ARM: S5P6442: Enable I2S device to work on SMDK6442 commit 8dec00059ef1db9f58719186366b71c8afbc4d1e Merge: e6f597a b89b12b Author: Linus Torvalds Date: Tue Jan 18 07:58:36 2011 -0800 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: autofs4: clean ->d_release() and autofs4_free_ino() up autofs4: split autofs4_init_ino() autofs4: mkdir and symlink always get a dentry that had passed lookup autofs4: autofs4_get_inode() doesn't need autofs_info * argument anymore autofs4: kill ->size in autofs_info autofs4: pass mode to autofs4_get_inode() explicitly autofs4: autofs4_mkroot() is not different from autofs4_init_ino() autofs4: keep symlink body in inode->i_private autofs4 - fix debug print in autofs4_lookup() vfs - fix dentry ref count in do_lookup() autofs4 - fix get_next_positive_dentry() commit c5ed5145591774bd9a2960ba4ca45a02fc70aad1 Author: Peter Zijlstra Date: Mon Jan 17 13:45:37 2011 +0100 perf: Fix contexted inheritance Linus reported that the RCU lockdep annotation bits triggered for this rcu_dereference() because we're not holding rcu_read_lock(). Going over the code I cannot convince myself its correct: - holding a ref on the parent_ctx, doesn't avoid it being uncloned concurrently (as the comment says), so we can race with a free. - holding parent_ctx->mutex doesn't avoid the above free from taking place either, it would at best avoid parent_ctx from being freed. I.e. the warning is correct. To fix the bug, serialize against the unclone_ctx() call by extending the reach of the parent_ctx->lock. Reported-by: Linus Torvalds Signed-off-by: Peter Zijlstra Cc: Paul Mackerras Cc: Paul E. McKenney LKML-Reference: Signed-off-by: Ingo Molnar commit 7b698ea377e10b074ceef0d79218e6622d618421 Author: Brian Gerst Date: Mon Jan 17 07:32:10 2011 -0500 x86: Clear irqstack thread_info Mathias Merz reported that v2.6.37 failed to boot on his system. Make sure that the thread_info part of the irqstack is initialized to zeroes. Reported-and-Tested-by: Matthias Merz Signed-off-by: Brian Gerst Acked-by: Pekka Enberg Cc: Arjan van de Ven Cc: Linus Torvalds LKML-Reference: Signed-off-by: Ingo Molnar commit 27de094f54a4d96bae2cd3121eb157bb8a34f729 Merge: 321051f 7322ce2 Author: Takashi Iwai Date: Tue Jan 18 14:05:44 2011 +0100 Merge branch 'fix/asoc' into for-linus commit 86b1e8dd83cbb0fcbf3d61d2b461df8be1f528cf Author: Shaohua Li Date: Tue Jan 18 08:57:49 2011 +0800 x86: Make relocatable kernel work with new binutils The CONFIG_RELOCATABLE=y option is broken with new binutils, which will make boot panic. According to Lu Hongjiu, the affected binutils are from 2.20.51.0.12 to 2.21.51.0.3, which are release since Oct 22 this year. At least ubuntu 10.10 is using such binutils. See: http://sourceware.org/bugzilla/show_bug.cgi?id=12327 The reason of the boot panic is that we have 'jiffies = jiffies_64;' in vmlinux.lds.S. The jiffies isn't in any section. In kernel build, there is warning saying jiffies is an absolute address and can't be relocatable. At runtime, jiffies will have virtual address 0. Signed-off-by: Shaohua Li Cc: Lu Hongjiu Cc: Huang Ying Cc: Sam Ravnborg LKML-Reference: <1295312269.1949.725.camel@sli10-conroe> Signed-off-by: Ingo Molnar commit 321051f5daf059e7290aa7d60af55482c8bb896a Merge: d9ab344 cbbf50b Author: Takashi Iwai Date: Tue Jan 18 07:44:55 2011 +0100 Merge branch 'fix/hda' into for-linus commit cbbf50b22f9693218f9f0d460432266b04fc960d Author: Vitaliy Kulikov Date: Fri Jan 14 17:21:13 2011 -0600 ALSA: hda - Fix initialization for HP 2011 notebooks Fixes for HP 2011 notebooks: enable dock ports and disable BTL initialization in the driver. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit 0f0714c5ed0a98fdeaa2287d3b159989bbe6d842 Author: Bankim Bhavsar Date: Mon Jan 17 15:23:21 2011 +0100 ALSA: hda - Add support for VMware controller Add the new PCI ID 0x15ad and device ID 0x1977 for VMware HDAudio Controller. [changed to use AZX_DRIVER_GENERIC by tiwai] Signed-off-by: Bankim Bhavsar Signed-off-by: Takashi Iwai commit ea73496324c1d990504e27f551e159388f891a4c Author: Takashi Iwai Date: Mon Jan 17 11:29:34 2011 +0100 ALSA: hda - consitify string arrays Signed-off-by: Takashi Iwai commit c66ddf32dda0d5bcf9db7b4cc42ef5da7baadd3e Author: Raymond Yau Date: Mon Jan 17 11:19:03 2011 +0100 ALSA: hda - Add add multi-streaming playback for AD1988 Attached a patch which add a new model to support multi-streaming playback for ad1988. playback another stereo stream through the front panel headphone on device 2 while playback through the speakers connected to rear panel on device 0 at the same time. Tested with ad1988a rev2 codec on asus P5B-V motherboard. Signed-off-by: Raymond Yau Signed-off-by: Takashi Iwai commit b89b12b46211d971d75e5ca8249817bc9e11c453 Author: Al Viro Date: Sun Jan 16 21:42:32 2011 -0500 autofs4: clean ->d_release() and autofs4_free_ino() up The latter is called only when both ino and dentry are about to be freed, so cleaning ->d_fsdata and ->dentry is pointless. Acked-by: Ian Kent Signed-off-by: Al Viro commit 26e6c910670171410577c7df2aebe94cef76e150 Author: Al Viro Date: Sun Jan 16 18:43:40 2011 -0500 autofs4: split autofs4_init_ino() split init_ino into new_ino and clean_ino; the former is what used to be init_ino(NULL, sbi), the latter is for cases where we passed non-NULL ino. Lose unused arguments. Acked-by: Ian Kent Signed-off-by: Al Viro commit 5a37db302e698a83209eff22ca8f3fd05eb1d84b Author: Al Viro Date: Sun Jan 16 18:29:35 2011 -0500 autofs4: mkdir and symlink always get a dentry that had passed lookup ... so ->d_fsdata will have been set up before we get there Acked-by: Ian Kent Signed-off-by: Al Viro commit 726a5e0688fd344110d8f2979d87f243a4ba1a48 Author: Al Viro Date: Sun Jan 16 17:43:52 2011 -0500 autofs4: autofs4_get_inode() doesn't need autofs_info * argument anymore Acked-by: Ian Kent Signed-off-by: Al Viro commit 0bf71d4d005176f6b6587ba64a377f9798213f21 Author: Al Viro Date: Sun Jan 16 17:39:15 2011 -0500 autofs4: kill ->size in autofs_info It's used only to pass the length of symlink body to autofs4_get_inode() in autofs4_dir_symlink(). We can bloody well set inode->i_size in autofs4_dir_symlink() directly and be done with that. Acked-by: Ian Kent Signed-off-by: Al Viro commit 09f12c03fa699ce7d030c47add60577138927d4f Author: Al Viro Date: Sun Jan 16 17:20:23 2011 -0500 autofs4: pass mode to autofs4_get_inode() explicitly In all cases we'd set inf->mode to know value just before passing it to autofs4_get_inode(). That kills the need to store it in autofs_info and pass it to autofs_init_ino() Acked-by: Ian Kent Signed-off-by: Al Viro commit 14a2f00bde7668fe18d1c8355d26c7c96961e1f7 Author: Al Viro Date: Sun Jan 16 17:13:33 2011 -0500 autofs4: autofs4_mkroot() is not different from autofs4_init_ino() Kill it. Mind you, it's been an obfuscated call of autofs4_init_ino() ever since 2.3.99pre6-4... Acked-by: Ian Kent Signed-off-by: Al Viro commit 292c5ee802e9b969b84ee671a5e3001d94230f5b Author: Al Viro Date: Mon Jan 17 00:47:38 2011 -0500 autofs4: keep symlink body in inode->i_private gets rid of all ->free()/->u.symlink machinery in autofs; we simply keep symlink bodies in inode->i_private and free them in ->evict_inode(). Acked-by: Ian Kent Signed-off-by: Al Viro commit c0bcc9d55252012805300ca01b9b7a143b4daf85 Author: Ian Kent Date: Tue Jan 18 12:06:15 2011 +0800 autofs4 - fix debug print in autofs4_lookup() oz_mode isn't defined any more, use autofs4_oz_mode(sbi) instead. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit 8931221411f9ff950de8fd686dc5ab881394cb9a Author: Ian Kent Date: Tue Jan 18 12:06:10 2011 +0800 vfs - fix dentry ref count in do_lookup() There is a ref count problem in fs/namei.c:do_lookup(). When walking in ref-walk mode, if follow_managed() returns a fail we need to drop dentry and possibly vfsmount. Clean up properly, as we do in the other caller of follow_managed(). Signed-off-by: Ian Kent Signed-off-by: Al Viro commit c14cc63a63e94d490ac6517a555113c30d420db4 Author: Ian Kent Date: Tue Jan 18 12:06:04 2011 +0800 autofs4 - fix get_next_positive_dentry() The initialization condition in fs/autofs4/expire.c:get_next_positive_dentry() appears to be incorrect. If prev == NULL I believe that root should be returned. Further down, at the current dentry check for it being simple_positive() it looks like the d_lock for dentry p should be dropped instead of dentry ret, otherwise when p is assinged to ret we end up with no lock on p and a lost lock on ret, which leads to a deadlock. Signed-off-by: Ian Kent Signed-off-by: Al Viro commit fbcb44dea89063d72a1242086f4a0c618e0d1e81 Author: Jassi Brar Date: Tue Jan 18 14:41:43 2011 +0900 ARM: S5PV310: Add missing virtual ASoC DMA device Signed-off-by: Jassi Brar Signed-off-by: Kukjin Kim commit b9368f324a839bc9e5c3f9d9d58c278bb9249de8 Author: Jassi Brar Date: Thu Dec 30 09:13:23 2010 +0900 ARM: S5PV210: Add missing virtual ASoC DMA device Signed-off-by: Jassi Brar Signed-off-by: Kukjin Kim commit be370adca08da850454f5317f00e0347af6d4e93 Author: Jassi Brar Date: Thu Dec 30 09:12:32 2010 +0900 ARM: S5P6450: Add missing virtual ASoC DMA device Signed-off-by: Jassi Brar Signed-off-by: Kukjin Kim commit 8418f8873acada40545182572f2e670e9d71d99a Author: Jassi Brar Date: Thu Dec 30 09:11:10 2010 +0900 ARM: S5P6440: Add missing virtual ASoC DMA device Signed-off-by: Jassi Brar Signed-off-by: Kukjin Kim commit 2fe4f0cb4b6b7f4c1e439ff32637950e3b38601b Author: Jassi Brar Date: Tue Dec 21 09:44:33 2010 +0900 ARM: S5P6442: Enable I2S device to work on SMDK6442 Add missing virtual ASoC DMA device. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit e6f597a1425b5af64917be3448b29e2d5a585ac8 Author: Andres Salomon Date: Mon Jan 17 16:11:12 2011 -0800 staging: fix build failure in bcm driver While building latest Linus git, I hit the following: CC [M] drivers/staging/bcm/Qos.o drivers/staging/bcm/Qos.c: In function ‘PruneQueue’: drivers/staging/bcm/Qos.c:367: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’ drivers/staging/bcm/Qos.c: In function ‘flush_all_queues’: drivers/staging/bcm/Qos.c:416: error: ‘struct netdev_queue’ has no member named ‘tx_dropped’ make[5]: *** [drivers/staging/bcm/Qos.o] Error 1 make[4]: *** [drivers/staging/bcm] Error 2 make[3]: *** [drivers/staging] Error 2 As well as: CC [M] drivers/staging/bcm/Transmit.o drivers/staging/bcm/Transmit.c: In function ‘SetupNextSend’: drivers/staging/bcm/Transmit.c:163: error: ‘struct netdev_queue’ has no member named ‘tx_bytes’ drivers/staging/bcm/Transmit.c:164: error: ‘struct netdev_queue’ has no member named ‘tx_packets’ make[2]: *** [drivers/staging/bcm/Transmit.o] Error 1 tx_dropped/tx_bytes_tx_packets were removed in commit 1ac9ad13. This patch converts bcm to use net_device_stats instead of netdev_queue. Acked-by: Stephen Hemminger Acked-by: Eric Dumazet Signed-off-by: Andres Salomon Signed-off-by: Linus Torvalds commit 6845a44a314c0c626549de373131bf108f9cc1f1 Merge: eee2a81 4790f4d Author: Linus Torvalds Date: Mon Jan 17 14:45:48 2011 -0800 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: Update workqueue usage RDMA/nes: Fix incorrect SFP+ link status detection on driver init RDMA/nes: Fix SFP+ link down detection issue with switch port disable RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events RDMA/nes: Fix bonding on iw_nes IB/srp: Test only once whether iu allocation succeeded IB/mlx4: Handle protocol field in multicast table RDMA: Use vzalloc() to replace vmalloc()+memset(0) mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long) IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long) commit eee2a817df7c5a6e569f353f8be78cc1b3604bb6 Merge: 83896fb acce952 Author: Linus Torvalds Date: Mon Jan 17 14:43:43 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (25 commits) Btrfs: forced readonly mounts on errors btrfs: Require CAP_SYS_ADMIN for filesystem rebalance Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_check btrfs: Fix memory leak in btrfs_read_fs_root_no_radix() btrfs: check NULL or not btrfs: Don't pass NULL ptr to func that may deref it. btrfs: mount failure return value fix btrfs: Mem leak in btrfs_get_acl() btrfs: fix wrong free space information of btrfs btrfs: make the chunk allocator utilize the devices better btrfs: restructure find_free_dev_extent() btrfs: fix wrong calculation of stripe size btrfs: try to reclaim some space when chunk allocation fails btrfs: fix wrong data space statistics fs/btrfs: Fix build of ctree Btrfs: fix off by one while setting block groups readonly Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls Btrfs: Add readonly snapshots support Btrfs: Refactor btrfs_ioctl_snap_create() btrfs: Extract duplicate decompress code ... commit 83896fb5e51594281720d145164f866ba769abd5 Author: Linus Torvalds Date: Mon Jan 17 14:42:34 2011 -0800 Revert "mm: simplify code of swap.c" This reverts commit d8505dee1a87b8d41b9c4ee1325cd72258226fbc. Chris Mason ended up chasing down some page allocation errors and pages stuck waiting on the IO scheduler, and was able to narrow it down to two commits: commit 744ed1442757 ("mm: batch activate_page() to reduce lock contention") and d8505dee1a87 ("mm: simplify code of swap.c"). This reverts the second one. Reported-and-debugged-by: Chris Mason Cc: Mel Gorman Cc: Andrew Morton Cc: Jens Axboe Cc: linux-mm Cc: KAMEZAWA Hiroyuki Cc: Andrea Arcangeli Cc: Shaohua Li Signed-off-by: Linus Torvalds commit 7a608572a282a74978e10fd6cd63090aebe29f5c Author: Linus Torvalds Date: Mon Jan 17 14:42:19 2011 -0800 Revert "mm: batch activate_page() to reduce lock contention" This reverts commit 744ed1442757767ffede5008bb13e0805085902e. Chris Mason ended up chasing down some page allocation errors and pages stuck waiting on the IO scheduler, and was able to narrow it down to two commits: commit 744ed1442757 ("mm: batch activate_page() to reduce lock contention") and d8505dee1a87 ("mm: simplify code of swap.c"). This reverts the first of them. Reported-and-debugged-by: Chris Mason Cc: Mel Gorman Cc: Andrew Morton Cc: Jens Axboe Cc: linux-mm Cc: KAMEZAWA Hiroyuki Cc: Andrea Arcangeli Cc: Shaohua Li Signed-off-by: Linus Torvalds commit 9e8a462a0141b12e22c4a2f0c12e0542770401f0 Merge: cf78859 2456248 Author: Linus Torvalds Date: Mon Jan 17 12:39:57 2011 -0800 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: remove unnecessary decrypt when extending a file ecryptfs: Fix ecryptfs_printk() size_t warnings fs/ecryptfs: Add printf format/argument verification and fix fallout ecryptfs: fixed testing of file descriptor flags ecryptfs: test lower_file pointer when lower_file_mutex is locked ecryptfs: missing initialization of the superblock 'magic' field ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h ecryptfs: fix truncation error in ecryptfs_read_update_atime commit cf78859f520f8275318f47d7864f4459d940cb6b Author: Geert Uytterhoeven Date: Mon Jan 17 21:21:14 2011 +0100 xfs: Do not name variables "panic" On platforms that call panic() inside their BUG() macro (m68k/sun3, and all platforms that don't set HAVE_ARCH_BUG), compilation fails with: | fs/xfs/support/debug.c: In function ‘xfs_cmn_err’: | fs/xfs/support/debug.c:92: error: called object ‘panic’ is not a function as the local variable "panic" conflicts with the "panic()" function. Rename the local variable to resolve this. Signed-off-by: Geert Uytterhoeven Reviewed-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit ad7f4e3f7b966ac09c8f98dbc5024813a1685775 Author: Arnaldo Carvalho de Melo Date: Mon Jan 17 18:28:13 2011 -0200 perf tools: Fix tracepoint id to string perf.data header table It was broken by f006d25 that passed just the event name, not the complete sys:event that it expected to open the /sys/.../sys/sys:event/id file to get the id. Fix it by moving it to after parse_events in cmd_record, as at that point we can just traverse the evsel_list and use evsel->attr.config + event_name(evsel) instead of re-opening the /id file. Reported-by: Franck Bui-Huu Cc: Franck Bui-Huu Cc: Frederic Weisbecker Cc: Han Pingtian Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: <20110117202801.GG2085@ghostprotocols.net> Signed-off-by: Arnaldo Carvalho de Melo commit acce952b0263825da32cf10489413dec78053347 Author: liubo Date: Thu Jan 6 19:30:25 2011 +0800 Btrfs: forced readonly mounts on errors This patch comes from "Forced readonly mounts on errors" ideas. As we know, this is the first step in being more fault tolerant of disk corruptions instead of just using BUG() statements. The major content: - add a framework for generating errors that should result in filesystems going readonly. - keep FS state in disk super block. - make sure that all of resource will be freed and released at umount time. - make sure that fter FS is forced readonly on error, there will be no more disk change before FS is corrected. For this, we should stop write operation. After this patch is applied, the conversion from BUG() to such a framework can happen incrementally. Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 8c34482c17d8fd07966328c7b1cfc35ee290bd1c Merge: 1a47f7a d95defa Author: Linus Torvalds Date: Mon Jan 17 11:18:40 2011 -0800 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: spi/spi_sh_msiof: fix a wrong free_irq() parameter dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch() commit 1a47f7a84ef386c1f7f55f669598bd9894ceb73a Merge: ab2020f bd76331 Author: Linus Torvalds Date: Mon Jan 17 11:17:51 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: add cruid= mount option cifs: cFYI the entire error code in map_smb_to_linux_error commit ab2020f2f11fc7fb81e6c71298b0830d85412011 Merge: 235646a 154bf89 Author: Linus Torvalds Date: Mon Jan 17 11:15:30 2011 -0800 Merge git://git.infradead.org/mtd-2.6 * git://git.infradead.org/mtd-2.6: (59 commits) mtd: mtdpart: disallow reading OOB past the end of the partition mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe UBI: use mtd->writebufsize to set minimal I/O unit size mtd: initialize writebufsize in the MTD object of a partition mtd: onenand: add mtd->writebufsize initialization mtd: nand: add mtd->writebufsize initialization mtd: cfi: add writebufsize initialization mtd: add writebufsize field to mtd_info struct mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use mtd: OneNAND: add enable / disable methods to onenand_chip mtd: m25p80: Fix JEDEC ID for AT26DF321 mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max) mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips mtd: nand: ams-delta: drop omap_read/write, use ioremap mtd: m25p80: add debugging trace in sst_write mtd: nand: ams-delta: select for built-in by default mtd: OneNAND: lighten scary initial bad block messages mtd: OneNAND: OMAP2/3: add support for command line partitioning mtd: nand: rearrange ONFI revision checking, add ONFI 2.3 ... Fix up trivial conflict in drivers/mtd/Kconfig as per DavidW. commit 24562486be76cf223b8d911f45e1d26eb3364b13 Author: Frank Swiderski Date: Mon Nov 15 10:43:22 2010 -0800 ecryptfs: remove unnecessary decrypt when extending a file Removes an unecessary page decrypt from ecryptfs_begin_write when the page is beyond the current file size. Previously, the call to ecryptfs_decrypt_page would result in a read of 0 bytes, but still attempt to decrypt an entire page. This patch detects that case and merely zeros the page before marking it up-to-date. Signed-off-by: Frank Swiderski Signed-off-by: Tyler Hicks commit f24b38874e1e37bb70291bbc4c5c3c13f5f9dac8 Author: Tyler Hicks Date: Mon Nov 15 17:36:38 2010 -0600 ecryptfs: Fix ecryptfs_printk() size_t warnings Commit cb55d21f6fa19d8c6c2680d90317ce88c1f57269 revealed a number of missing 'z' length modifiers in calls to ecryptfs_printk() when printing variables of type size_t. This patch fixes those compiler warnings. Signed-off-by: Tyler Hicks commit 888d57bbc91ebd031451d4ab1c669baee826a06c Author: Joe Perches Date: Wed Nov 10 15:46:16 2010 -0800 fs/ecryptfs: Add printf format/argument verification and fix fallout Add __attribute__((format... to __ecryptfs_printk Make formats and arguments match. Add casts to (unsigned long long) for %llu. Signed-off-by: Joe Perches [tyhicks: 80 columns cleanup and fixed typo] Signed-off-by: Tyler Hicks commit 235646a486d10891bd86af28d8eac75d9f22bd2d Merge: af575e2 ecf5632 Author: Linus Torvalds Date: Mon Jan 17 11:00:09 2011 -0800 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: fix address space warnings in ioctl_fiemap() aio: check return value of create_workqueue() hpfs_setattr error case avoids unlock_kernel compat: copy missing fields in compat_statfs64 to user compat: update comment of compat statfs syscalls compat: remove unnecessary assignment in compat_rw_copy_check_uvector() fs: FS_POSIX_ACL does not depend on BLOCK fs: Remove unlikely() from fget_light() fs: Remove unlikely() from fput_light() fallocate should be a file operation make the feature checks in ->fallocate future proof staging: smbfs building fix tidy up around finish_automount() don't drop newmnt on error in do_add_mount() Take the completion of automount into new helper commit af575e2d2e09517a8190f1b425453cc3e0102f6c Merge: 584ef2c f5de6ec Author: Linus Torvalds Date: Mon Jan 17 10:58:44 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: fix WARN_ON in __local_bh_enable() alpha: fix breakage caused by df9ee29270 alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig alpha/osf_sys: remove unused MAX_SELECT_SECONDS alpha: change to new Makefile flag variables alpha: kill off alpha_do_IRQ alpha: irq clean up alpha: use set_irq_chip and push down __do_IRQ to the machine types commit 584ef2cd70acb0e473ba51e1073c2c5c95a2d27a Merge: e1288cd 25b2ec5 Author: Linus Torvalds Date: Mon Jan 17 10:57:59 2011 -0800 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: balance asic_reset functions drm/radeon/kms: remove duplicate card_posted() functions drm/radeon/kms: add module option for pcie gen2 drm/radeon/kms: fix typo in evergreen safe reg drm/nouveau: fix gpu page faults triggered by plymouthd drm/nouveau: greatly simplify mm, killing some bugs in the process drm/nvc0: enable protection of system-use-only structures in vm drm/nv40: initialise 0x17xx on all chipsets that have it drm/nv40: make detection of 0x4097-ful chipsets available everywhere commit e1288cd72f54e7fc16ae9ebb4d0647537ef848d4 Merge: e78bf5e 94ae852 Author: Linus Torvalds Date: Mon Jan 17 10:54:41 2011 -0800 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: (63 commits) ARM: PL08x: cleanup comments Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c ARM: PL08x: fix a warning Fix dmaengine_submit() return type dmaengine: at_hdmac: fix race while monitoring channel status dmaengine: at_hdmac: flags located in first descriptor dmaengine: at_hdmac: use subsys_initcall instead of module_init dmaengine: at_hdmac: no need set ACK in new descriptor dmaengine: at_hdmac: trivial add precision to unmapping comment dmaengine: at_hdmac: use dma_address to program DMA hardware pch_dma: support new device ML7213 IOH ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels ARM: PL08x: allow dma_set_runtime_config() to return errors ARM: PL08x: fix locking between prepare function and submit function ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels ARM: PL08x: put txd's on the pending list in pl08x_tx_submit() ARM: PL08x: rename 'desc_list' as 'pend_list' ARM: PL08x: implement unmapping of memcpy buffers ARM: PL08x: store prep_* flags in async_tx structure ARM: PL08x: shrink srcbus/dstbus in txd structure ... commit dd9a9ad5e1e94894433110ccbf492ed60d75ffcb Author: Arnaldo Carvalho de Melo Date: Mon Jan 17 14:25:06 2011 -0200 perf tools: Fix handling of wildcards in tracepoint event selectors It wasn't accounting the ':' when consuming bytes in the the event selector string, so parse_events() would fail in this test: if (!(*str == 0 || *str == ',' || isspace(*str))) return -1; as *str would be pointing to '*', the last character in the '-e' arg in: $ perf record -q -a -D -e sched:sched_* | perf script -i - -s perf-script.py 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 0abe1169470571c473ee720c35fe5b3481c46c46 Author: Roberto Sassu Date: Wed Nov 3 11:11:34 2010 +0100 ecryptfs: fixed testing of file descriptor flags This patch replaces the check (lower_file->f_flags & O_RDONLY) with ((lower_file & O_ACCMODE) == O_RDONLY). Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 27992890b02d340198a3a22fc210d13684a41564 Author: Roberto Sassu Date: Wed Nov 3 11:11:28 2010 +0100 ecryptfs: test lower_file pointer when lower_file_mutex is locked This patch prevents the lower_file pointer in the 'ecryptfs_inode_info' structure to be checked when the mutex 'lower_file_mutex' is not locked. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 070baa51286e5cf59dde6be52fa23647ffb5d32d Author: Roberto Sassu Date: Wed Nov 3 11:11:22 2010 +0100 ecryptfs: missing initialization of the superblock 'magic' field This patch initializes the 'magic' field of ecryptfs filesystems to ECRYPTFS_SUPER_MAGIC. Signed-off-by: Roberto Sassu [tyhicks: merge with 66cb76666d69] Signed-off-by: Tyler Hicks commit d95defaca7994ffff1ceb52f3011eb644dfe3274 Author: Guennadi Liakhovetski Date: Mon Jan 17 17:01:07 2011 +0100 spi/spi_sh_msiof: fix a wrong free_irq() parameter Without this fix reloading of the driver is impossible. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Grant Likely commit 2a8652f4e0d11ee27b1d2870c600fd1300661a6e Author: Roberto Sassu Date: Wed Nov 3 11:11:15 2010 +0100 ecryptfs: moved ECRYPTFS_SUPER_MAGIC definition to linux/magic.h The definition of ECRYPTFS_SUPER_MAGIC has been moved to the include file 'linux/magic.h' to become available to other kernel subsystems. Signed-off-by: Roberto Sassu Signed-off-by: Tyler Hicks commit 38a708d7759476318d0eec64af174513032ec67a Author: Edward Shishkin Date: Sat Oct 30 00:11:50 2010 +0200 ecryptfs: fix truncation error in ecryptfs_read_update_atime This is similar to the bug found in direct-io not so long ago. Fix up truncation (ssize_t->int). This only matters with >2G reads/writes, which the kernel doesn't permit. Signed-off-by: Edward Shishkin Cc: Jeff Moyer Cc: Christoph Hellwig Cc: Eric Sandeen Signed-off-by: Tyler Hicks commit 154bf89f5e3e3dc59666926f27ca4a0866f39157 Author: Artem Bityutskiy Date: Sun Jan 16 17:50:54 2011 +0200 mtd: mtdpart: disallow reading OOB past the end of the partition This patch fixes the mtdpart bug which allows users reading OOB past the end of the partition. This happens because 'part_read_oob()' allows reading multiple OOB areas in one go, and mtdparts does not validate the OOB length in the request. Although there is such check in 'nand_do_read_oob()' in nand_base.c, but it checks that we do not read past the flash chip, not the partition, because in nand_base.c we work with the whole chip (e.g., mtd->size in nand_base.c is the size of the whole chip). So this check cannot be done correctly in nand_base.c and should be instead done in mtdparts.c. This problem was reported by Jason Liu and reproduced with nandsim: $ modprobe nandsim first_id_byte=0x20 second_id_byte=0xaa third_id_byte=0x00 \ fourth_id_byte=0x15 parts=0x400,0x400 $ modprobe nandsim mtd_oobtest.ko dev=0 $ dmesg = snip = mtd_oobtest: attempting to read past end of device mtd_oobtest: an error is expected... mtd_oobtest: error: read past end of device = snip = mtd_oobtest: finished with 2 errors Reported-by: Jason Liu Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 7322ce21cde92777a9b11e17429d61d1cda6d2c2 Author: Alexander Sverdlin Date: Sun Jan 16 15:48:05 2011 +0300 ASoC: EP93xx: fixed LRCLK rate and DMA oper. in I2S code Changelog: 1. I2S module of EP93xx should be feed by 32bit DMA transfers. This is hardware limitation and that's the way original Cirrus's driver worked. This will fix distorted sound playback and make capture actually work in present ep93xx drivers. I've found, that author of code, on which modern ep93xx-i2s.c and ep93xx-pcm.c are based, had faced this problem also in 2007: http://blog.gmane.org/gmane.linux.ports.arm.cirrus/month=20070101/page=3 Now SoC code uses his developments, but not overcomes the hardware issues. Some details from EP93xx users guide: Both I2S transmitter and receiver have similar 16x32bit FIFO, where they store 8 samples for both left and right channels. The FIFO is always 32bit wide and should be properly aligned if you use samples of other width. Transmitter and receiver have configuration registers for selection of I2S word length (16, 24, 32). They are I2STXWrdLen and I2SRXWrdLen. Yes, EP93xx DMA can do byte, word and quad-word transfers. The width for transfers to and from peripherals is selected by particular module configuration. Lucky AC97 module has such configuration: AC97RXCRx registers, bit CM (Compact mode enable) switches between 16 and 32 bit samples. AC97TXCRx registers have the same bits for transmitters. ep93xx-ac97.c enables this compact mode and so has all the rights to use S16_LE format. No one has found such a configuration in I2S module until now in any Cirrus manuals. I2S module always feeds it's 32bit wide FIFO with 32bit samples consecutively for left and right channels. You cannot use 32-bit DMA transfers to transfer two 16-bit samples. So we can use two formats for AC97, but should remove all but S32_LE for I2S. Always using 32 bit chunks is not a problem for I2S, the codec I use uses less bits too (24), it's permitted by I2S standard. In proposed patch formats list shortened to just S32_LE, this makes all the DMA transactions right, while ALSA will do all sample format translation for us. 2. Incorrect setting of LRCLK (2 times slower) in original ep93xx-i2s.c masks the first problem. DMA takes two 16 bit samples instead of one, overall sound speed seems to be normal, but you get actually 4000 sampling rate instead of requested 8000 and therefore some noise... This is also the reason why the capture function not worked at all in this driver... If we take a look into I2S specification, we will figure that LRCLK MUST be equal to sample rate, if we are talking about stereo (in mono too, but it's not our case at all). In proposed patch SCLK and LRCLK rates are corrected, assuming we always send 32 bits * 2 channels to codec. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7ebcf5d6021a696680ee77d9162a2edec2d671dd Author: Dimitris Papastamos Date: Fri Jan 14 15:59:13 2011 +0000 ASoC: WM8990: msleep() takes milliseconds not jiffies Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit ecf5632dd189ab4c366cef853d6e5fe7adfe52e5 Author: Namhyung Kim Date: Sun Jan 16 23:28:17 2011 +0900 fs: fix address space warnings in ioctl_fiemap() The fi_extents_start field of struct fiemap_extent_info is a user pointer but was not marked as __user. This makes sparse emit following warnings: CHECK fs/ioctl.c fs/ioctl.c:114:26: warning: incorrect type in argument 1 (different address spaces) fs/ioctl.c:114:26: expected void [noderef] *dst fs/ioctl.c:114:26: got struct fiemap_extent *[assigned] dest fs/ioctl.c:202:14: warning: incorrect type in argument 1 (different address spaces) fs/ioctl.c:202:14: expected void const volatile [noderef] * fs/ioctl.c:202:14: got struct fiemap_extent *[assigned] fi_extents_start fs/ioctl.c:212:27: warning: incorrect type in argument 1 (different address spaces) fs/ioctl.c:212:27: expected void [noderef] *dst fs/ioctl.c:212:27: got char * Also add 'ufiemap' variable to eliminate unnecessary casts. Signed-off-by: Namhyung Kim Signed-off-by: Al Viro commit 4bca770ede796a1ef7af9c983166d5608d9ccfaf Author: Anton Blanchard Date: Mon Jan 17 16:17:42 2011 +1100 powerpc: perf: Fix frequency calculation for overflowing counters When profiling a benchmark that is almost 100% userspace, I noticed some wildly inaccurate profiles that showed almost all time spent in the kernel. Closer examination shows we were programming a tiny number of cycles into the PMU after each overflow (about ~200 away from the next overflow). This gets us stuck in a loop which we eventually break out of by throttling the PMU (there are regular throttle/unthrottle events in the log). It looks like we aren't setting event->hw.last_period to something same and the frequency to period calculations in perf are going haywire. With the following patch we find the correct period after a few interrupts and stay there. I also see no more throttle events. Signed-off-by: Anton Blanchard Acked-by: Benjamin Herrenschmidt Cc: linuxppc-dev@lists.ozlabs.org Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo LKML-Reference: <20110117161742.5feb3761@kryten> Signed-off-by: Ingo Molnar commit 27eaa1c90c608aa907336c2743d5ecf35c469440 Author: Namhyung Kim Date: Tue Dec 14 00:06:25 2010 +0900 aio: check return value of create_workqueue() Signed-off-by: Namhyung Kim Signed-off-by: Al Viro commit 274052ef0bac011249925f6616d147b1491fc601 Author: Dr. David Alan Gilbert Date: Mon Dec 13 17:09:52 2010 +0000 hpfs_setattr error case avoids unlock_kernel This fixed a case that 'sparse' spotted where hpfs_setattr has an error return that didn't go through it's path that unlocks. This is against git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git version 6313e3c21743cc88bb5bd8aa72948ee1e83937b6. Build tested only, I don't have an hpfs file system to test. Dave Signed-off-by: Dr. David Alan Gilbert Signed-off-by: Al Viro commit d9ab344336f74c012f6643ed3d1ad8ca0136de3b Author: Raymond Yau Date: Sun Jan 16 10:55:54 2011 +0800 ALSA : au88x0 - Limit number of channels to fix Oops via OSS emu Fix playback/capture channels patch to change supported playback channels of au8830 to 1,2,4 and capture channels to 1,2. This prevent oops when oss emulation use SNDCTL_DSP_CHANNELS to set 3 Channels Signed-off-by: Raymond Yau Cc: Signed-off-by: Takashi Iwai commit e0bb6bda43e20aa1db5774c73a519cd52c463a55 Author: Namhyung Kim Date: Mon Dec 27 01:41:54 2010 +0900 compat: copy missing fields in compat_statfs64 to user f_flags and f_spare fields were not copied to userspace when compat_sys_[f]statfs64 called. Signed-off-by: Namhyung Kim Cc: Christoph Hellwig Signed-off-by: Al Viro commit 974d879e8070bbb132bd4e79ef314703853d0b82 Author: Namhyung Kim Date: Mon Dec 27 01:41:53 2010 +0900 compat: update comment of compat statfs syscalls The commit 7ed1ee6118ae ("Take statfs variants to fs/statfs.c") separates out statfs syscalls from fs/open.c. Thus the comment should be changed also. Signed-off-by: Namhyung Kim Cc: Jiri Kosina Signed-off-by: Al Viro commit 6a5640f10255a8941a3a57396dda20af7a5c9a9e Author: Namhyung Kim Date: Mon Dec 27 01:41:52 2010 +0900 compat: remove unnecessary assignment in compat_rw_copy_check_uvector() *@ret_pointer is initialized to @fast_pointer thus the assignment is redundant. Signed-off-by: Namhyung Kim Cc: Jeff Moyer Signed-off-by: Al Viro commit 16ebe911eba8afa88879213dc4388f2dd701561e Author: Randy Dunlap Date: Sun Jan 2 14:44:00 2011 -0800 fs: FS_POSIX_ACL does not depend on BLOCK - Fix a kconfig unmet dependency warning. - Remove the comment that identifies which filesystems use POSIX ACL utility routines. - Move the FS_POSIX_ACL symbol outside of the BLOCK symbol if/endif block because its functions do not depend on BLOCK and some of the filesystems that use it do not depend on BLOCK. warning: (GENERIC_ACL && JFFS2_FS_POSIX_ACL && NFSD_V4 && NFS_ACL_SUPPORT && 9P_FS_POSIX_ACL) selects FS_POSIX_ACL which has unmet direct dependencies (BLOCK) Signed-off-by: Randy Dunlap Cc: Al Viro Signed-off-by: Al Viro commit 3bc0ba4305fa99b32caac8c60df84a2f14fce228 Author: Steven Rostedt Date: Mon Dec 13 19:38:09 2010 -0500 fs: Remove unlikely() from fget_light() There's an unlikely() in fget_light() that assumes the file ref count will be 1. Running the annotate branch profiler on a desktop that is performing daily tasks (running firefox, evolution, xchat and is also part of a distcc farm), it shows that the ref count is not 1 that often. correct incorrect % Function File Line ------- --------- - -------- ---- ---- 1035099358 6209599193 85 fget_light file_table.c 315 Cc: Al Viro Cc: Christoph Hellwig Signed-off-by: Steven Rostedt Signed-off-by: Al Viro commit c2b3e74b78b24cb367289a75a2bd30e569e56e0e Author: Steven Rostedt Date: Mon Dec 13 19:38:08 2010 -0500 fs: Remove unlikely() from fput_light() In fput_light(), there's an unlikely(fput_needed), which running on my normal desktop doing firefox, xchat, evolution and part of my distcc farm, and running the annotate branch profiler shows that the unlikely is not very unlikely. correct incorrect % Function File Line ------- --------- - -------- ---- ---- 0 48 100 fput_light file.h 26 115828710 897415279 88 fput_light file.h 26 865271179 5286128445 85 fput_light file.h 26 19568539 8923664 31 fput_light file.h 26 12353677 3562279 22 fput_light file.h 26 267691 67062 20 fput_light file.h 26 15014853 348172 2 fput_light file.h 26 209258 205 0 fput_light file.h 26 1364164 0 0 fput_light file.h 26 Which gives 1032903812 times it was correct and 6203351846 times it was incorrect, or 85% incorrect. Cc: Andrew Morton Signed-off-by: Steven Rostedt Signed-off-by: Al Viro commit 2fe17c1075836b66678ed2a305fd09b6773883aa Author: Christoph Hellwig Date: Fri Jan 14 13:07:43 2011 +0100 fallocate should be a file operation Currently all filesystems except XFS implement fallocate asynchronously, while XFS forced a commit. Both of these are suboptimal - in case of O_SYNC I/O we really want our allocation on disk, especially for the !KEEP_SIZE case where we actually grow the file with user-visible zeroes. On the other hand always commiting the transaction is a bad idea for fast-path uses of fallocate like for example in recent Samba versions. Given that block allocation is a data plane operation anyway change it from an inode operation to a file operation so that we have the file structure available that lets us check for O_SYNC. This also includes moving the code around for a few of the filesystems, and remove the already unnedded S_ISDIR checks given that we only wire up fallocate for regular files. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 64c23e86873ee410554d6d1c76b60da47025e96f Author: Christoph Hellwig Date: Fri Jan 14 13:07:30 2011 +0100 make the feature checks in ->fallocate future proof Instead of various home grown checks that might need updates for new flags just check for any bit outside the mask of the features supported by the filesystem. This makes the check future proof for any newly added flag. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit eb745dbccce56f1bbe3f80b95ad2a325145171c2 Author: Yang Ruirui Date: Fri Jan 14 15:51:04 2011 +0800 staging: smbfs building fix Building error for smbfs: drivers/staging/smbfs/dir.c:286: error: static declaration of 'smbfs_dentry_operations' follows non-static declaration drivers/staging/smbfs/proto.h:42: error: previous declaration of 'smbfs_dentry_operations' was here drivers/staging/smbfs/dir.c:294: error: static declaration of 'smbfs_dentry_operations_case' follows non-static declaration drivers/staging/smbfs/proto.h:41: error: previous declaration of 'smbfs_dentry_operations_case' was here make[3]: *** [drivers/staging/smbfs/dir.o] Error 1 make[2]: *** [drivers/staging/smbfs] Error 2 make[1]: *** [drivers/staging] Error 2 make[1]: *** Waiting for unfinished jobs.... Fix it by removing static keywords Signed-off-by: Yang Ruirui Signed-off-by: Al Viro commit b1e75df45a3d8a490b8648e44632debc5eea04b1 Author: Al Viro Date: Mon Jan 17 01:47:59 2011 -0500 tidy up around finish_automount() do_add_mount() and mnt_clear_expiry() are not needed outside of namespace.c anymore, now that namei has finish_automount() to use. Signed-off-by: Al Viro commit 15f9a3f3e199647fe0cac19302c5033cf031372d Author: Al Viro Date: Mon Jan 17 01:41:58 2011 -0500 don't drop newmnt on error in do_add_mount() That gets rid of the kludge in finish_automount() - we need to keep refcount on the vfsmount as-is until we evict it from expiry list. Signed-off-by: Al Viro commit 19a167af7c97248ec646552ebc9140bc6aa3552a Author: Al Viro Date: Mon Jan 17 01:35:23 2011 -0500 Take the completion of automount into new helper ... and shift it from namei.c to namespace.c Signed-off-by: Al Viro commit 4790f4dc5f4326dab5d81ed8fb8c9473e620bdbb Merge: f062671 da995a8 eb4a7cb 843276a 695b834 Author: Roland Dreier Date: Sun Jan 16 21:22:41 2011 -0800 Merge branches 'misc', 'mlx4', 'mthca', 'nes' and 'srp' into for-next commit f06267104dd9112f11586830d22501d0e26245ea Author: Tejun Heo Date: Tue Oct 19 15:24:36 2010 +0000 RDMA: Update workqueue usage * ib_wq is added, which is used as the common workqueue for infiniband instead of the system workqueue. All system workqueue usages including flush_scheduled_work() callers are converted to use and flush ib_wq. * cancel_delayed_work() + flush_scheduled_work() converted to cancel_delayed_work_sync(). * qib_wq is removed and ib_wq is used instead. This is to prepare for deprecation of flush_scheduled_work(). Signed-off-by: Tejun Heo Signed-off-by: Roland Dreier commit f5de6ecc84b58ba0f394365eafc8681af7a4f73d Author: Ivan Kokshaysky Date: Wed Jan 12 22:02:24 2011 +0000 alpha: fix WARN_ON in __local_bh_enable() Interrupts ought to be disabled _before_ irq_enter(). Signed-off-by: Ivan Kokshaysky Signed-off-by: Matt Turner commit e2609f6aa2dce5d960ea1fe32f57524c315dede5 Author: Ivan Kokshaysky Date: Wed Jan 12 00:37:25 2011 -0500 alpha: fix breakage caused by df9ee29270 Commit df9ee29270 made arch_local_irq_save and arch_local_irq_restore static inline which with -Werror trips up on __set_hae() and _set_hae() which are extern inline. The naive solution is to make __set_hae() and set_hae() static inline but for reasons described in commit d559d4a24a3fe this breaks the generic kernel build. Instead, since this is architecture specific code, this patch hard wires in the architecture specific method f disabling and enabling interrupts. Tested-by: Michael Cree Signed-off-by: Ivan Kokshaysky Signed-off-by: Matt Turner commit 00649643b1f4e1644f644f612c6bb390e69196ad Author: Matt Turner Date: Fri Oct 29 16:22:00 2010 -0500 alpha: add GENERIC_HARDIRQS_NO__DO_IRQ to Kconfig Acked-by: Kyle McMartin Signed-off-by: Matt Turner commit da9c0212bc08fc697e0e78de0b89a9c8aed6c633 Author: Namhyung Kim Date: Thu Dec 9 04:07:21 2010 -0500 alpha/osf_sys: remove unused MAX_SELECT_SECONDS Remove the leftover from the commit 14e2acd86865 ("select: fix alpha OSF wrapper"). Signed-off-by: Namhyung Kim Cc: Arjan van de Ven Signed-off-by: Matt Turner commit 8a362cd6d60e2ae3b704df1b3f08db58a3924339 Author: matt mooney Date: Tue Jan 11 22:09:09 2011 -0500 alpha: change to new Makefile flag variables Signed-off-by: matt mooney Signed-off-by: Matt Turner commit 7d209c8110ecd49db46da786437485e8ef67f414 Author: Kyle McMartin Date: Thu Oct 14 22:31:34 2010 -0400 alpha: kill off alpha_do_IRQ Good riddance... Nuke a pile of redundant handlers that the generic code takes care of as well. Tested-by: Michael Cree Signed-off-by: Kyle McMartin Signed-off-by: Matt Turner commit a891b393dd7f6ed84ecee98c0eac4a808ff2cbbc Author: Kyle McMartin Date: Thu Oct 14 22:31:25 2010 -0400 alpha: irq clean up Stop touching irq_desc[irq] directly, instead use accessor functions provided. Use irq_has_action instead of directly testing the irq_desc. Tested-by: Michael Cree Signed-off-by: Kyle McMartin Signed-off-by: Matt Turner commit d5ccde0a64c3dbe954a8a13a6ba9fb3b6d7c6225 Author: Kyle McMartin Date: Thu Oct 14 22:31:11 2010 -0400 alpha: use set_irq_chip and push down __do_IRQ to the machine types Also kill superfluous IRQ_DISABLED initialization, since that's the default state of the irq_desc[i].status field. Tested-by: Michael Cree Signed-off-by: Kyle McMartin Signed-off-by: Matt Turner commit 25b2ec5b643c9ea784e5a51e5e9602cd536965f2 Author: Alex Deucher Date: Tue Jan 11 13:36:55 2011 -0500 drm/radeon/kms: balance asic_reset functions First, we were calling mc_stop() at the top of the function which turns off all MC (memory controller) clients, then checking if the GPU is idle. If it was idle we returned without re-enabling the MC clients which would lead to a blank screen, etc. This patch checks if the GPU is idle before calling mc_stop(). Second, if the reset failed, we were returning without re-enabling the MC clients. This patch re-enables the MC clients before returning regardless of whether the reset was successful or not. Signed-off-by: Alex Deucher Cc: Jerome Glisse Signed-off-by: Dave Airlie commit fd909c3718da3fb8c5c0530f93ae21d85dc31471 Author: Alex Deucher Date: Tue Jan 11 18:08:59 2011 -0500 drm/radeon/kms: remove duplicate card_posted() functions Use the common one for all asics. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d42dd579ac1498e23f29465225fa3eee4520f5e5 Author: Alex Deucher Date: Wed Jan 12 20:05:11 2011 -0500 drm/radeon/kms: add module option for pcie gen2 Switching to pcie gen2 causes problems on some boards. Add a module option to turn it on/off. There are gen2 compatability issues with some motherboards it seems. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=33027 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 394d83c17fac2b7bcf05cb99d1e945135767bb6b Author: Alex Deucher Date: Thu Jan 13 13:55:12 2011 -0500 drm/radeon/kms: fix typo in evergreen safe reg Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 51fda92223f5b668cccffd51bf3d7bedc93609ff Merge: e78bf5e f01a972 Author: Dave Airlie Date: Mon Jan 17 12:20:31 2011 +1000 Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-fixes * 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: drm/nouveau: fix gpu page faults triggered by plymouthd drm/nouveau: greatly simplify mm, killing some bugs in the process drm/nvc0: enable protection of system-use-only structures in vm drm/nv40: initialise 0x17xx on all chipsets that have it drm/nv40: make detection of 0x4097-ful chipsets available everywhere commit f01a9720cb149e76155dc6e0e051058450305f4f Author: Ben Skeggs Date: Mon Jan 17 11:22:38 2011 +1000 drm/nouveau: fix gpu page faults triggered by plymouthd The switch to separate BAR and channel address spaces made the fbcon memory address calculation incorrect on NV50+ boards, this commit fixes that. Signed-off-by: Ben Skeggs commit 8b464bfed674fc25d39d8a686010ebe509c8f62a Author: Ben Skeggs Date: Fri Jan 14 15:46:30 2011 +1000 drm/nouveau: greatly simplify mm, killing some bugs in the process Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit c906ca0fbf237b77ba2101a2fa9050317137fde8 Author: Ben Skeggs Date: Fri Jan 14 10:27:02 2011 +1000 drm/nvc0: enable protection of system-use-only structures in vm Somehow missed this in the original merge of the nvc0 code. Signed-off-by: Ben Skeggs commit 1380da4979728bdd6af0086a8c8e186da14ae673 Author: Ben Skeggs Date: Tue Jan 11 17:22:33 2011 +1000 drm/nv40: initialise 0x17xx on all chipsets that have it Signed-off-by: Ben Skeggs commit c693931d93facab671bafdcebf515520663c22fc Author: Ben Skeggs Date: Tue Jan 11 14:23:12 2011 +1000 drm/nv40: make detection of 0x4097-ful chipsets available everywhere Signed-off-by: Ben Skeggs commit e78bf5e6cbe837daa6ab628a5f679548742994d3 Author: Andrew Morton Date: Sun Jan 16 16:55:23 2011 -0800 drivers/nfc/pn544.c: fix min_t warnings Fix these: drivers/nfc/pn544.c: In function 'pn544_read': drivers/nfc/pn544.c:356: warning: comparison of distinct pointer types lacks a cast drivers/nfc/pn544.c:377: warning: comparison of distinct pointer types lacks a cast drivers/nfc/pn544.c: In function 'pn544_write': drivers/nfc/pn544.c:463: warning: comparison of distinct pointer types lacks a cast drivers/nfc/pn544.c:485: warning: comparison of distinct pointer types lacks a cast Cc: "Matti J. Aaltonen" Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94ae85220a07d357d4937086c490854f63344de4 Author: Russell King - ARM Linux Date: Sun Jan 16 20:18:05 2011 +0000 ARM: PL08x: cleanup comments Cleanup the formatting of comments, remove some which don't make sense anymore. Signed-off-by: Russell King [fix conflict with 96a608a4] Signed-off-by: Dan Williams commit 8a335bc631ac9c43675821580c26ebf95a3044ba Merge: 1153742 7b1fff7 Author: Linus Torvalds Date: Sun Jan 16 15:06:43 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/scsi-post-merge-2.6: ocfs2: Make OCFS2_FS depend on CONFIGFS_FS dlm: Make DLM depend on CONFIGFS_FS net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS configfs: change depends -> select SYSFS [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event [SCSI] sd: implement sd_check_events() commit 115374211961a503675730603e3d48d95d41736c Author: James Bottomley Date: Sun Jan 16 23:06:14 2011 +0100 parisc: fix compile breakage caused by inlining maybe_mkwrite On PARISC, we have an include of linux/mm.h inside our asm/pgtable.h, so this patch commit 14fd403f2146f740942d78af4e0ee59396ad8eab Author: Andrea Arcangeli Date: Thu Jan 13 15:46:37 2011 -0800 thp: export maybe_mkwrite causes us an unsatisfiable use of pte_mkwrite in linux/mm.h. The fix is to avoid including linux/mm.h in our pgtable.h, which unbreaks the build. Signed-off-by: Linus Torvalds commit b3697c0255d9d73eaaa4deb4512e3f0ff97b3b71 Author: Andrea Arcangeli Date: Sun Jan 16 13:10:39 2011 -0800 fix non-x86 build failure in pmdp_get_and_clear pmdp_get_and_clear/pmdp_clear_flush/pmdp_splitting_flush were trapped as BUG() and they were defined only to diminish the risk of build issues on not-x86 archs and to be consistent with the generic pte methods previously defined in include/asm-generic/pgtable.h. But they are causing more trouble than they were supposed to solve, so it's simpler not to define them when THP is off. This is also correcting the export of pmdp_splitting_flush which is currently unused (x86 isn't using the generic implementation in mm/pgtable-generic.c and no other arch needs that [yet]). Signed-off-by: Andrea Arcangeli Sam Ravnborg Cc: Stephen Rothwell Cc: "David S. Miller" Cc: Benjamin Herrenschmidt Cc: "Luck, Tony" Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e3d0eb0b028ed9e9384e6afcae2f22993bbdf25 Author: Al Viro Date: Sun Jan 16 16:32:11 2011 -0500 VFS: Fix UP compile error in fs/namespace.c mnt_longterm is there only on SMP Reported-and-tested-by: Joachim Eastwood Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 843276ad985cb59212ceb70d989474521ff516f6 Author: Maciej Sosnowski Date: Wed Nov 24 17:29:54 2010 +0000 RDMA/nes: Fix incorrect SFP+ link status detection on driver init During iw_nes initialization the link status for SFP+ PHY is always detected as "up" regardless of real state (cable either connected or disconnected). Add SFP+ PHY specific link status detection to the iw_nes initialization procedure. Use link status recheck for netdev_open to detect delayed state updates. Signed-off-by: Maciej Sosnowski Signed-off-by: Roland Dreier commit 5f61b2c6939bb6d26393df15765bc3cb260db063 Author: Maciej Sosnowski Date: Wed Nov 24 17:29:46 2010 +0000 RDMA/nes: Fix SFP+ link down detection issue with switch port disable In case of SFP+ PHY, link status check at interrupt processing can give false results. For proper link status change detection a delayed recheck is needed to give nes registers time to settle. Add a periodic link status recheck scheduled at interrupt to detect potential delayed registers state changes. Addresses: http://bugs.openfabrics.org/bugzilla/show_bug.cgi?id=2117 Signed-off-by: Maciej Sosnowski Signed-off-by: Roland Dreier commit ea623455b736d82f476460647e8b5fe5dc36f4f2 Author: Maciej Sosnowski Date: Wed Nov 24 17:29:38 2010 +0000 RDMA/nes: Generate IB_EVENT_PORT_ERR/PORT_ACTIVE events Depending on link state change, IB_EVENT_PORT_ERR or IB_EVENT_PORT_ACTIVE should be generated when handling MAC interrupts. Plugging in a cable happens to result in series of interrupts changing driver's link state a number of times before finally staying at link up (e.g. link up, link down, link up, link down, ..., link up). To prevent sending series of redundant IB_EVENT_PORT_ACTIVE and IB_EVENT_PORT_ERR events, we use a timer to debounce them in nes_port_ibevent(). Signed-off-by: Maciej Sosnowski Signed-off-by: Roland Dreier commit 2a4c97ead4b375a64063523210939b87ad225b85 Author: Maciej Sosnowski Date: Wed Nov 24 17:29:30 2010 +0000 RDMA/nes: Fix bonding on iw_nes Enable configuring bonds on nes devices by adding missing support for master net_device to the driver. Signed-off-by: Maciej Sosnowski Signed-off-by: Roland Dreier commit 7b1fff7e4fdf2805fce7afd6247912588d72d604 Author: Nicholas Bellinger Date: Sun Jan 16 21:16:07 2011 +0000 ocfs2: Make OCFS2_FS depend on CONFIGFS_FS This patch fixes the following kconfig error after changing CONFIGFS_FS -> select SYSFS: fs/sysfs/Kconfig:1:error: recursive dependency detected! fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by OCFS2_FS fs/ocfs2/Kconfig:1: symbol OCFS2_FS depends on SYSFS Signed-off-by: Nicholas A. Bellinger Cc: Joel Becker Cc: Randy Dunlap Cc: Stephen Rothwell Cc: James Bottomley commit 86c747d2a4f028fe2fdf091c3a81d0e187827682 Author: Nicholas Bellinger Date: Sun Jan 16 21:14:52 2011 +0000 dlm: Make DLM depend on CONFIGFS_FS This patch fixes the following kconfig error after changing CONFIGFS_FS -> select SYSFS: fs/sysfs/Kconfig:1:error: recursive dependency detected! fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by DLM fs/dlm/Kconfig:1: symbol DLM depends on SYSFS Signed-off-by: Nicholas A. Bellinger Cc: Joel Becker Cc: Randy Dunlap Cc: Stephen Rothwell Cc: James Bottomley commit d9f9ab51e55e36379773752ffeaac677b080d469 Author: Nicholas Bellinger Date: Sun Jan 16 21:13:59 2011 +0000 net: Make NETCONSOLE_DYNAMIC depend on CONFIGFS_FS This patch fixes the following kconfig error after changing CONFIGFS_FS -> select SYSFS: fs/sysfs/Kconfig:1:error: recursive dependency detected! fs/sysfs/Kconfig:1: symbol SYSFS is selected by CONFIGFS_FS fs/configfs/Kconfig:1: symbol CONFIGFS_FS is selected by NETCONSOLE_DYNAMIC drivers/net/Kconfig:3390: symbol NETCONSOLE_DYNAMIC depends on SYSFS Signed-off-by: Nicholas A. Bellinger Cc: Joel Becker Cc: Randy Dunlap Cc: Stephen Rothwell Cc: James Bottomley commit e205117285d6035af135c9d6c34a30ee6b8d1f2e Author: Nicholas Bellinger Date: Sun Jan 16 21:11:25 2011 +0000 configfs: change depends -> select SYSFS This patch changes configfs to select SYSFS to fix the following: warning: (TARGET_CORE && GFS2_FS) selects CONFIGFS_FS which has unmet direct dependencies (SYSFS) Reported-by: Randy Dunlap Signed-off-by: Nicholas A. Bellinger Acked-by: Joel Becker commit f652f6c5b7cfdf139f4155d78f397e99ae1c4acc Merge: 140e300 c66ac9d Author: Nicholas Bellinger Date: Sun Jan 16 21:21:04 2011 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus commit f8b18087fd3277e424a24e13ce0edf30abe97ce0 Author: Stefan Schmidt Date: Wed Jan 12 10:30:42 2011 +0100 fs/btrfs: Fix build of ctree Fix the build failure in some configurations: CC [M] fs/btrfs/ctree.o In file included from fs/btrfs/ctree.c:21:0: fs/btrfs/ctree.h:1003:17: error: field 'super_kobj' has incomplete type fs/btrfs/ctree.h:1074:17: error: field 'root_kobj' has incomplete type make[2]: *** [fs/btrfs/ctree.o] Error 1 make[1]: *** [fs/btrfs] Error 2 make: *** [fs] Error 2 caused by commit 57cc7215b708 ("headers: kobject.h redux") We need to include kobject.h here. Reported-by: Jeff Garzik Fix-suggested-by: Li Zefan Signed-off-by: Stefan Schmidt Signed-off-by: Linus Torvalds commit 5520ebd308927a3beba599a2b68fa8c52f41f43b Merge: d3072e6 01a678c Author: Linus Torvalds Date: Sun Jan 16 12:11:13 2011 -0800 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: simplify CONFIG_SQUASHFS_LZO handling Squashfs: move squashfs_i() definition from squashfs.h Squashfs: get rid of default n in Kconfig Squashfs: add missing check in zlib_wrapper Squashfs: remove unnecessary variable in zlib_wrapper Squashfs: Add XZ compression configuration option Squashfs: add XZ compression support commit d3072e6a7e9bf7aca200370317f8e297be360b17 Author: Rafael J. Wysocki Date: Sun Jan 16 20:44:22 2011 +0100 ACPI: Fix boot problem related to APEI with acpi_disabled set Commit 415e12b23792 ("PCI/ACPI: Request _OSC control once for each root bridge (v3)") put the acpi_hest_init() call in acpi_pci_root_init() into a wrong place, presumably because the author confused acpi_pci_disabled with acpi_disabled. Bring the code ordering in acpi_pci_root_init() back to sanity. Additionally, make sure that hest_disable is set when acpi_disabled is set, which is going to prevent acpi_hest_parse(), that still may be executed for acpi_disabled=1 through aer_acpi_firmware_first(), from crashing because of uninitialized hest_tab. Reported-and-tested-by: Andres Salomon Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit fc8fe1e992ae0326a88edbe4d6793e840bbdd4ff Author: Rafael J. Wysocki Date: Sun Jan 16 20:42:43 2011 +0100 PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset After commit 415e12b23792 ("PCI/ACPI: Request _OSC control once for each root bridge (v3)") include/linux/pci-acpi.h is included by drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and unnecessary alternative definition of acpi_find_root_bridge_handle() causes a build error to occur. Remove the offending piece of garbage. Reported-and-tested-by: Stephen Rothwell Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit f8206b925fb0eba3a11839419be118b09105d7b1 Merge: 1b59be2 f03c659 Author: Linus Torvalds Date: Sun Jan 16 11:31:50 2011 -0800 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: (23 commits) sanitize vfsmount refcounting changes fix old umount_tree() breakage autofs4: Merge the remaining dentry ops tables Unexport do_add_mount() and add in follow_automount(), not ->d_automount() Allow d_manage() to be used in RCU-walk mode Remove a further kludge from __do_follow_link() autofs4: Bump version autofs4: Add v4 pseudo direct mount support autofs4: Fix wait validation autofs4: Clean up autofs4_free_ino() autofs4: Clean up dentry operations autofs4: Clean up inode operations autofs4: Remove unused code autofs4: Add d_manage() dentry operation autofs4: Add d_automount() dentry operation Remove the automount through follow_link() kludge code from pathwalk CIFS: Use d_automount() rather than abusing follow_link() NFS: Use d_automount() rather than abusing follow_link() AFS: Use d_automount() rather than abusing follow_link() Add an AT_NO_AUTOMOUNT flag to suppress terminal automount ... commit f03c65993b98eeb909a4012ce7833c5857d74755 Author: Al Viro Date: Fri Jan 14 22:30:21 2011 -0500 sanitize vfsmount refcounting changes Instead of splitting refcount between (per-cpu) mnt_count and (SMP-only) mnt_longrefs, make all references contribute to mnt_count again and keep track of how many are longterm ones. Accounting rules for longterm count: * 1 for each fs_struct.root.mnt * 1 for each fs_struct.pwd.mnt * 1 for having non-NULL ->mnt_ns * decrement to 0 happens only under vfsmount lock exclusive That allows nice common case for mntput() - since we can't drop the final reference until after mnt_longterm has reached 0 due to the rules above, mntput() can grab vfsmount lock shared and check mnt_longterm. If it turns out to be non-zero (which is the common case), we know that this is not the final mntput() and can just blindly decrement percpu mnt_count. Otherwise we grab vfsmount lock exclusive and do usual decrement-and-check of percpu mnt_count. For fs_struct.c we have mnt_make_longterm() and mnt_make_shortterm(); namespace.c uses the latter in places where we don't already hold vfsmount lock exclusive and opencodes a few remaining spots where we need to manipulate mnt_longterm. Note that we mostly revert the code outside of fs/namespace.c back to what we used to have; in particular, normal code doesn't need to care about two kinds of references, etc. And we get to keep the optimization Nick's variant had bought us... Signed-off-by: Al Viro commit 7b8a53fd815deb39542085897743fa0063f9fe06 Author: Al Viro Date: Sat Jan 15 20:08:44 2011 -0500 fix old umount_tree() breakage Expiry-related code calls umount_tree() several times with the same list to collect vfsmounts to. Which is fine, except that umount_tree() implicitly assumed that the list would be empty on each call - it moves the victims over there and then iterates through the list kicking them out. It's *almost* idempotent, so everything nearly worked. However, mnt->ghosts handling (and thus expirability checks) had been broken - that part was not idempotent... The fix is trivial - use local temporary list, splice it to the the collector list when we are through. Signed-off-by: Al Viro commit 6f88a4403def422bd8e276ddf6863d6ac71435d2 Author: Ben Hutchings Date: Wed Dec 29 14:55:03 2010 +0000 btrfs: Require CAP_SYS_ADMIN for filesystem rebalance Filesystem rebalancing (BTRFS_IOC_BALANCE) affects the entire filesystem and may run uninterruptibly for a long time. This does not seem to be something that an unprivileged user should be able to do. Reported-by: Aron Xu Signed-off-by: Ben Hutchings Signed-off-by: Chris Mason commit f690efb1aa2a961dd6655529c1797fcac60ad6d9 Author: Josef Bacik Date: Wed Jan 12 21:04:22 2011 +0000 Btrfs: don't warn if we get ENOSPC in btrfs_block_rsv_check If we run low on space we could get a bunch of warnings out of btrfs_block_rsv_check, but this is mostly just called via the transaction code to see if we need to end the transaction, it expects to see failures, so let's not WARN and freak everybody out for no reason. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 5e540f7715b8cd83b8e60beaaa525b125cc122de Author: Tsutomu Itoh Date: Mon Dec 27 06:53:10 2010 +0000 btrfs: Fix memory leak in btrfs_read_fs_root_no_radix() In btrfs_read_fs_root_no_radix(), 'root' is not freed if btrfs_search_slot() returns error. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit 91ca338d776e0cefb255bf2979b6448febd880f5 Author: Tsutomu Itoh Date: Wed Jan 5 02:32:22 2011 +0000 btrfs: check NULL or not Should check if functions returns NULL or not. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit ff175d57f057f77d2d3031d674c2af9167a4af02 Author: Jesper Juhl Date: Sat Dec 25 21:22:30 2010 +0000 btrfs: Don't pass NULL ptr to func that may deref it. Hi, In fs/btrfs/inode.c::fixup_tree_root_location() we have this code: ... if (!path) { err = -ENOMEM; goto out; } ... out: btrfs_free_path(path); return err; btrfs_free_path() passes its argument on to other functions and some of them end up dereferencing the pointer. In the code above that pointer is clearly NULL, so btrfs_free_path() will eventually cause a NULL dereference. There are many ways to cut this cake (fix the bug). The one I chose was to make btrfs_free_path() deal gracefully with NULL pointers. If you disagree, feel free to come up with an alternative patch. Signed-off-by: Jesper Juhl Signed-off-by: Chris Mason commit 20b450773d17e325190c158e10bfdb25dc21d2d6 Author: Dave Young Date: Sat Jan 8 10:09:13 2011 +0000 btrfs: mount failure return value fix I happened to pass swap partition as root partition in cmdline, then kernel panic and tell me about "Cannot open root device". It is not correct, in fact it is a fs type mismatch instead of 'no device'. Eventually I found btrfs mounting failed with -EIO, it should be -EINVAL. The logic in init/do_mounts.c: for (p = fs_names; *p; p += strlen(p)+1) { int err = do_mount_root(name, p, flags, root_mount_data); switch (err) { case 0: goto out; case -EACCES: flags |= MS_RDONLY; goto retry; case -EINVAL: continue; } print "Cannot open root device" panic } SO fs type after btrfs will have no chance to mount Here fix the return value as -EINVAL Signed-off-by: Dave Young Signed-off-by: Chris Mason commit 42838bb265b9cff3de9587fcacc398b5112dc2d9 Author: Jesper Juhl Date: Thu Jan 6 21:45:21 2011 +0000 btrfs: Mem leak in btrfs_get_acl() It seems to me that we leak the memory allocated to 'value' in btrfs_get_acl() if the call to posix_acl_from_xattr() fails. Here's a patch that attempts to correct that problem. Signed-off-by: Jesper Juhl Signed-off-by: Chris Mason commit 6d07bcec969af335d4e35b3921131b7929bd634e Author: Miao Xie Date: Wed Jan 5 10:07:31 2011 +0000 btrfs: fix wrong free space information of btrfs When we store data by raid profile in btrfs with two or more different size disks, df command shows there is some free space in the filesystem, but the user can not write any data in fact, df command shows the wrong free space information of btrfs. # mkfs.btrfs -d raid1 /dev/sda9 /dev/sda10 # btrfs-show Label: none uuid: a95cd49e-6e33-45b8-8741-a36153ce4b64 Total devices 2 FS bytes used 28.00KB devid 1 size 5.01GB used 2.03GB path /dev/sda9 devid 2 size 10.00GB used 2.01GB path /dev/sda10 # btrfs device scan /dev/sda9 /dev/sda10 # mount /dev/sda9 /mnt # dd if=/dev/zero of=tmpfile0 bs=4K count=9999999999 (fill the filesystem) # sync # df -TH Filesystem Type Size Used Avail Use% Mounted on /dev/sda9 btrfs 17G 8.6G 5.4G 62% /mnt # btrfs-show Label: none uuid: a95cd49e-6e33-45b8-8741-a36153ce4b64 Total devices 2 FS bytes used 3.99GB devid 1 size 5.01GB used 5.01GB path /dev/sda9 devid 2 size 10.00GB used 4.99GB path /dev/sda10 It is because btrfs cannot allocate chunks when one of the pairing disks has no space, the free space on the other disks can not be used for ever, and should be subtracted from the total space, but btrfs doesn't subtract this space from the total. It is strange to the user. This patch fixes it by calcing the free space that can be used to allocate chunks. Implementation: 1. get all the devices free space, and align them by stripe length. 2. sort the devices by the free space. 3. check the free space of the devices, 3.1. if it is not zero, and then check the number of the devices that has more free space than this device, if the number of the devices is beyond the min stripe number, the free space can be used, and add into total free space. if the number of the devices is below the min stripe number, we can not use the free space, the check ends. 3.2. if the free space is zero, check the next devices, goto 3.1 This implementation is just likely fake chunk allocation. After appling this patch, df can show correct space information: # df -TH Filesystem Type Size Used Avail Use% Mounted on /dev/sda9 btrfs 17G 8.6G 0 100% /mnt Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit b2117a39fa96cf4814e7cab8c11494149ba6f29d Author: Miao Xie Date: Wed Jan 5 10:07:28 2011 +0000 btrfs: make the chunk allocator utilize the devices better With this patch, we change the handling method when we can not get enough free extents with default size. Implementation: 1. Look up the suitable free extent on each device and keep the search result. If not find a suitable free extent, keep the max free extent 2. If we get enough suitable free extents with default size, chunk allocation succeeds. 3. If we can not get enough free extents, but the number of the extent with default size is >= min_stripes, we just change the mapping information (reduce the number of stripes in the extent map), and chunk allocation succeeds. 4. If the number of the extent with default size is < min_stripes, sort the devices by its max free extent's size descending 5. Use the size of the max free extent on the (num_stripes - 1)th device as the stripe size to allocate the device space By this way, the chunk allocator can allocate chunks as large as possible when the devices' space is not enough and make full use of the devices. Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 7bfc837df935d850fe996dfe92ef48975cd4170a Author: Miao Xie Date: Wed Jan 5 10:07:26 2011 +0000 btrfs: restructure find_free_dev_extent() - make it return the start position and length of the max free space when it can not find a suitable free space. - make it more readability Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 1974a3b42d8cf7a9c74f1e0310c593023617037a Author: Miao Xie Date: Wed Jan 5 10:07:24 2011 +0000 btrfs: fix wrong calculation of stripe size There are two tiny problem: - One is When we check the chunk size is greater than the max chunk size or not, we should take mirrors into account, but the original code didn't. - The other is btrfs shouldn't use the size of the residual free space as the length of of a dup chunk when doing chunk allocation. It is because the device space that a dup chunk needs is twice as large as the chunk size, if we use the size of the residual free space as the length of a dup chunk, we can not get enough free space. Fix it. Signed-off-by: Miao Xie Reviewed-by: Josef Bacik Signed-off-by: Chris Mason commit d52a5b5f1fa40804f681cf9868d4a8f90661bdf3 Author: Miao Xie Date: Wed Jan 5 10:07:18 2011 +0000 btrfs: try to reclaim some space when chunk allocation fails We cannot write data into files when when there is tiny space in the filesystem. Reproduce steps: # mkfs.btrfs /dev/sda1 # mount /dev/sda1 /mnt # dd if=/dev/zero of=/mnt/tmpfile0 bs=4K count=1 # dd if=/dev/zero of=/mnt/tmpfile1 bs=4K count=99999999999999 (fill the filesystem) # umount /mnt # mount /dev/sda1 /mnt # rm -f /mnt/tmpfile0 # dd if=/dev/zero of=/mnt/tmpfile0 bs=4K count=1 (failed with nospec) But if we do the last step again, we can write data successfully. The reason of the problem is that btrfs didn't try to commit the current transaction and reclaim some space when chunk allocation failed. This patch fixes it by committing the current transaction to reclaim some space when chunk allocation fails. Signed-off-by: Miao Xie Reviewed-by: Josef Bacik Signed-off-by: Chris Mason commit 299a08b1c34f9397797946a0fa215c5fd145c5cf Author: Miao Xie Date: Wed Jan 5 10:07:15 2011 +0000 btrfs: fix wrong data space statistics Josef has implemented mixed data/metadata chunks, we must add those chunks' space just like data chunks. Signed-off-by: Miao Xie Reviewed-by: Josef Bacik Signed-off-by: Chris Mason commit f580eb0931fbcb6dc3916f094f471671facd1daa Author: Stefan Schmidt Date: Wed Jan 12 09:30:42 2011 +0000 fs/btrfs: Fix build of ctree CC [M] fs/btrfs/ctree.o In file included from fs/btrfs/ctree.c:21:0: fs/btrfs/ctree.h:1003:17: error: field <91>super_kobj<92> has incomplete type fs/btrfs/ctree.h:1074:17: error: field <91>root_kobj<92> has incomplete type make[2]: *** [fs/btrfs/ctree.o] Error 1 make[1]: *** [fs/btrfs] Error 2 make: *** [fs] Error 2 We need to include kobject.h here. Reported-by: Jeff Garzik Fix-suggested-by: Li Zefan Signed-off-by: Stefan Schmidt Signed-off-by: Chris Mason commit f892436eb2c3223fecda614a64d51f36f6ec2245 Merge: 26c79f6 3a39c18 Author: Chris Mason Date: Sun Jan 16 11:25:54 2011 -0500 Merge branch 'lzo-support' of git://repo.or.cz/linux-btrfs-devel into btrfs-38 commit 26c79f6ba0ccdc4bbc8ef8721406d37e9178e30b Merge: 65e5341 0caa102 Author: Chris Mason Date: Sun Jan 16 11:24:45 2011 -0500 Merge branch 'readonly-snapshots' of git://repo.or.cz/linux-btrfs-devel into btrfs-38 commit 658b368da198a1436c7d6a0f1f4029d3c6e30b20 Author: Michal Simek Date: Sun Jan 16 13:56:53 2011 +0100 microblaze: Fix asm/pgtable.h Function ptep_test_and_clear_young have had wrong the first argument. It is also necessary to add __HAVE macros for ptep_test_and_clear_young and ptep_get_and_clear functions. Error log: In file included from linux/arch/microblaze/include/asm/pgtable.h:570, from arch/microblaze/mm/pgtable.c:35: include/asm-generic/pgtable.h:23: error: conflicting types for 'ptep_test_and_clear_young' linux/arch/microblaze/include/asm/pgtable.h:449: error: previous definition of 'ptep_test_and_clear_young' was here include/asm-generic/pgtable.h:73: error: redefinition of 'ptep_get_and_clear' linux/arch/microblaze/include/asm/pgtable.h:462: error: previous definition of 'ptep_get_and_clear' was here Signed-off-by: Michal Simek commit 1947fc1d51fa7c21e9c253d37d076ef6f4d73130 Author: Michal Simek Date: Sun Jan 16 13:50:17 2011 +0100 microblaze: Fix missing pagemap.h Add missing linux/pagemap.h to solve compilation error. Error log: In file included from linux/arch/microblaze/include/asm/tlb.h:17, from mm/pgtable-generic.c:9: include/asm-generic/tlb.h: In function 'tlb_flush_mmu': include/asm-generic/tlb.h:76: error: implicit declaration of function 'release_pages' include/asm-generic/tlb.h: In function 'tlb_remove_page': include/asm-generic/tlb.h:105: error: implicit declaration of function 'page_cache_release' Signed-off-by: Michal Simek commit 672c54466d24994eb9633f993862c89539504a42 Author: Grant Likely Date: Thu Jan 13 15:36:09 2011 -0700 dt/flattree: Return virtual address from early_init_dt_alloc_memory_arch() The physical address is never used by the device tree code when allocating memory for unflattening. Change the architecture's alloc hook to return the virutal address instead. Signed-off-by: Grant Likely commit b650c858c26bd9ba29ebc82d30f09355845a294a Author: David Howells Date: Sat Jan 15 10:51:57 2011 +0000 autofs4: Merge the remaining dentry ops tables Merge the remaining autofs4 dentry ops tables. It doesn't matter if d_automount and d_manage are present on something that's not mountable or holdable as these ops are only used if the appropriate flags are set in dentry->d_flags. [AV] switch to ->s_d_op, since now _everything_ on autofs4 is using the same dentry_operations. Signed-off-by: David Howells Signed-off-by: Al Viro commit ea5b778a8b98c85a87d66bf844904f9c3802b869 Author: David Howells Date: Fri Jan 14 19:10:03 2011 +0000 Unexport do_add_mount() and add in follow_automount(), not ->d_automount() Unexport do_add_mount() and make ->d_automount() return the vfsmount to be added rather than calling do_add_mount() itself. follow_automount() will then do the addition. This slightly complicates things as ->d_automount() normally wants to add the new vfsmount to an expiration list and start an expiration timer. The problem with that is that the vfsmount will be deleted if it has a refcount of 1 and the timer will not repeat if the expiration list is empty. To this end, we require the vfsmount to be returned from d_automount() with a refcount of (at least) 2. One of these refs will be dropped unconditionally. In addition, follow_automount() must get a 3rd ref around the call to do_add_mount() lest it eat a ref and return an error, leaving the mount we have open to being expired as we would otherwise have only 1 ref on it. d_automount() should also add the the vfsmount to the expiration list (by calling mnt_set_expiry()) and start the expiration timer before returning, if this mechanism is to be used. The vfsmount will be unlinked from the expiration list by follow_automount() if do_add_mount() fails. This patch also fixes the call to do_add_mount() for AFS to propagate the mount flags from the parent vfsmount. Signed-off-by: David Howells Signed-off-by: Al Viro commit ab90911ff90cdab59b31c045c3f0ae480d14f29d Author: David Howells Date: Fri Jan 14 18:46:51 2011 +0000 Allow d_manage() to be used in RCU-walk mode Allow d_manage() to be called from pathwalk when it is in RCU-walk mode as well as when it is in Ref-walk mode. This permits __follow_mount_rcu() to call d_manage() directly. d_manage() needs a parameter to indicate that it is in RCU-walk mode as it isn't allowed to sleep if in that mode (but should return -ECHILD instead). autofs4_d_manage() can then be set to retain RCU-walk mode if the daemon accesses it and otherwise request dropping back to ref-walk mode. Signed-off-by: David Howells Signed-off-by: Al Viro commit 87556ef19926e97464e0163a7840140527ae6615 Author: David Howells Date: Fri Jan 14 18:46:46 2011 +0000 Remove a further kludge from __do_follow_link() Remove a further kludge from __do_follow_link() as it's no longer required with the automount code. This reverts the non-helper-function parts of 051d381259eb57d6074d02a6ba6e90e744f1a29f, which breaks union mounts. Reported-by: vaurora@redhat.com Signed-off-by: David Howells Signed-off-by: Al Viro commit 1972580bb4edea3ed6fe273b2ca72f44f10f8c86 Author: Ian Kent Date: Fri Jan 14 18:46:40 2011 +0000 autofs4: Bump version Increase the autofs module sub-version so we can tell what kernel implementation is being used from user space debug logging. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit dd89f90d2deb9aa5bc8e1b15d726ff5c0bb2b623 Author: Ian Kent Date: Fri Jan 14 18:46:35 2011 +0000 autofs4: Add v4 pseudo direct mount support Version 4 of autofs provides a pseudo direct mount implementation that relies on directories at the leaves of a directory tree under an indirect mount to trigger mounts. This patch adds support for that functionality. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit 9e3fea16ba386fa549a0b2de8a203e5d412997a0 Author: Ian Kent Date: Fri Jan 14 18:46:30 2011 +0000 autofs4: Fix wait validation It is possible for the check in wait.c:validate_request() to return an incorrect result if the dentry that was mounted upon has changed during the callback. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit 6651149371b842715906311b4631b8489cebf7e8 Author: Ian Kent Date: Fri Jan 14 18:46:24 2011 +0000 autofs4: Clean up autofs4_free_ino() When this function is called the local reference count does't need to be updated since the dentry is going away and dput definitely must not be called here. Also the autofs info struct field inode isn't used so remove it. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit 71e469db242c2eeb00faf9caf7d9e00150c00a6e Author: Ian Kent Date: Fri Jan 14 18:46:19 2011 +0000 autofs4: Clean up dentry operations There are now two distinct dentry operations uses. One for dentrys that trigger mounts and one for dentrys that do not. Rationalize the use of these dentry operations and rename them to reflect their function. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit e61da20a50d21725ff27571a6dff9468e4fb7146 Author: Ian Kent Date: Fri Jan 14 18:46:14 2011 +0000 autofs4: Clean up inode operations Since the use of ->follow_link() has been eliminated there is no need to separate the indirect and direct inode operations. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit 8c13a676d5a56495c350f3141824a5ef6c6b4606 Author: Ian Kent Date: Fri Jan 14 18:46:08 2011 +0000 autofs4: Remove unused code Remove code that is not used due to the use of ->d_automount() and ->d_manage(). Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit b5b801779d59165c4ecf1009009109545bd1f642 Author: Ian Kent Date: Fri Jan 14 18:46:03 2011 +0000 autofs4: Add d_manage() dentry operation This patch required a previous patch to add the ->d_automount() dentry operation. Add a function to use the newly defined ->d_manage() dentry operation for blocking during mount and expire. Whether the VFS calls the dentry operations d_automount() and d_manage() is controled by the DMANAGED_AUTOMOUNT and DMANAGED_TRANSIT flags. autofs uses the d_automount() operation to callback to user space to request mount operations and the d_manage() operation to block walks into mounts that are under construction or destruction. In order to prevent these functions from being called unnecessarily the DMANAGED_* flags are cleared for cases which would cause this. In the common case the DMANAGED_AUTOMOUNT and DMANAGED_TRANSIT flags are both set for dentrys waiting to be mounted. The DMANAGED_TRANSIT flag is cleared upon successful mount request completion and set during expire runs, both during the dentry expire check, and if selected for expire, is left set until a subsequent successful mount request completes. The exception to this is the so-called rootless multi-mount which has no actual mount at its base. In this case the DMANAGED_AUTOMOUNT flag is cleared upon successful mount request completion as well and set again after a successful expire. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit 10584211e48036182212b598cc53331776406d60 Author: Ian Kent Date: Fri Jan 14 18:45:58 2011 +0000 autofs4: Add d_automount() dentry operation Add a function to use the newly defined ->d_automount() dentry operation for triggering mounts instead of doing the user space callback in ->lookup() and ->d_revalidate(). Note, to be useful the subsequent patch to add the ->d_manage() dentry operation is also needed so the discussion of functionality is deferred to that patch. Signed-off-by: Ian Kent Signed-off-by: David Howells Signed-off-by: Al Viro commit db3729153e82ba3ada89681f26c4f1b6d6807a80 Author: David Howells Date: Fri Jan 14 18:45:53 2011 +0000 Remove the automount through follow_link() kludge code from pathwalk Remove the automount through follow_link() kludge code from pathwalk in favour of using d_automount(). Signed-off-by: David Howells Acked-by: Ian Kent Signed-off-by: Al Viro commit 01c64feac45cea1317263eabc4f7ee1b240f297f Author: David Howells Date: Fri Jan 14 18:45:47 2011 +0000 CIFS: Use d_automount() rather than abusing follow_link() Make CIFS use the new d_automount() dentry operation rather than abusing follow_link() on directories. [NOTE: THIS IS UNTESTED!] Signed-off-by: David Howells Cc: Steve French Signed-off-by: Al Viro commit 36d43a43761b004ad1879ac21471d8fc5f3157ec Author: David Howells Date: Fri Jan 14 18:45:42 2011 +0000 NFS: Use d_automount() rather than abusing follow_link() Make NFS use the new d_automount() dentry operation rather than abusing follow_link() on directories. Signed-off-by: David Howells Acked-by: Trond Myklebust Acked-by: Ian Kent Signed-off-by: Al Viro commit d18610b0ce9eb48c60649d8fcbf68374c84349d3 Author: David Howells Date: Fri Jan 14 19:04:05 2011 +0000 AFS: Use d_automount() rather than abusing follow_link() Make AFS use the new d_automount() dentry operation rather than abusing follow_link() on directories. Signed-off-by: David Howells Signed-off-by: Al Viro commit 6f45b65672c8017d5e210e338bb5858a938ef445 Author: David Howells Date: Fri Jan 14 18:45:31 2011 +0000 Add an AT_NO_AUTOMOUNT flag to suppress terminal automount Add an AT_NO_AUTOMOUNT flag to suppress terminal automounting of automount point directories. This can be used by fstatat() users to permit the gathering of attributes on an automount point and also prevent mass-automounting of a directory of automount points by ls. Signed-off-by: David Howells Acked-by: Ian Kent Signed-off-by: Al Viro commit cc53ce53c86924bfe98a12ea20b7465038a08792 Author: David Howells Date: Fri Jan 14 18:45:26 2011 +0000 Add a dentry op to allow processes to be held during pathwalk transit Add a dentry op (d_manage) to permit a filesystem to hold a process and make it sleep when it tries to transit away from one of that filesystem's directories during a pathwalk. The operation is keyed off a new dentry flag (DCACHE_MANAGE_TRANSIT). The filesystem is allowed to be selective about which processes it holds and which it permits to continue on or prohibits from transiting from each flagged directory. This will allow autofs to hold up client processes whilst letting its userspace daemon through to maintain the directory or the stuff behind it or mounted upon it. The ->d_manage() dentry operation: int (*d_manage)(struct path *path, bool mounting_here); takes a pointer to the directory about to be transited away from and a flag indicating whether the transit is undertaken by do_add_mount() or do_move_mount() skipping through a pile of filesystems mounted on a mountpoint. It should return 0 if successful and to let the process continue on its way; -EISDIR to prohibit the caller from skipping to overmounted filesystems or automounting, and to use this directory; or some other error code to return to the user. ->d_manage() is called with namespace_sem writelocked if mounting_here is true and no other locks held, so it may sleep. However, if mounting_here is true, it may not initiate or wait for a mount or unmount upon the parameter directory, even if the act is actually performed by userspace. Within fs/namei.c, follow_managed() is extended to check with d_manage() first on each managed directory, before transiting away from it or attempting to automount upon it. follow_down() is renamed follow_down_one() and should only be used where the filesystem deliberately intends to avoid management steps (e.g. autofs). A new follow_down() is added that incorporates the loop done by all other callers of follow_down() (do_add/move_mount(), autofs and NFSD; whilst AFS, NFS and CIFS do use it, their use is removed by converting them to use d_automount()). The new follow_down() calls d_manage() as appropriate. It also takes an extra parameter to indicate if it is being called from mount code (with namespace_sem writelocked) which it passes to d_manage(). follow_down() ignores automount points so that it can be used to mount on them. __follow_mount_rcu() is made to abort rcu-walk mode if it hits a directory with DCACHE_MANAGE_TRANSIT set on the basis that we're probably going to have to sleep. It would be possible to enter d_manage() in rcu-walk mode too, and have that determine whether to abort or not itself. That would allow the autofs daemon to continue on in rcu-walk mode. Note that DCACHE_MANAGE_TRANSIT on a directory should be cleared when it isn't required as every tranist from that directory will cause d_manage() to be invoked. It can always be set again when necessary. ========================== WHAT THIS MEANS FOR AUTOFS ========================== Autofs currently uses the lookup() inode op and the d_revalidate() dentry op to trigger the automounting of indirect mounts, and both of these can be called with i_mutex held. autofs knows that the i_mutex will be held by the caller in lookup(), and so can drop it before invoking the daemon - but this isn't so for d_revalidate(), since the lock is only held on _some_ of the code paths that call it. This means that autofs can't risk dropping i_mutex from its d_revalidate() function before it calls the daemon. The bug could manifest itself as, for example, a process that's trying to validate an automount dentry that gets made to wait because that dentry is expired and needs cleaning up: mkdir S ffffffff8014e05a 0 32580 24956 Call Trace: [] :autofs4:autofs4_wait+0x674/0x897 [] avc_has_perm+0x46/0x58 [] autoremove_wake_function+0x0/0x2e [] :autofs4:autofs4_expire_wait+0x41/0x6b [] :autofs4:autofs4_revalidate+0x91/0x149 [] __lookup_hash+0xa0/0x12f [] lookup_create+0x46/0x80 [] sys_mkdirat+0x56/0xe4 versus the automount daemon which wants to remove that dentry, but can't because the normal process is holding the i_mutex lock: automount D ffffffff8014e05a 0 32581 1 32561 Call Trace: [] __mutex_lock_slowpath+0x60/0x9b [] do_path_lookup+0x2ca/0x2f1 [] .text.lock.mutex+0xf/0x14 [] do_rmdir+0x77/0xde [] tracesys+0x71/0xe0 [] tracesys+0xd5/0xe0 which means that the system is deadlocked. This patch allows autofs to hold up normal processes whilst the daemon goes ahead and does things to the dentry tree behind the automouter point without risking a deadlock as almost no locks are held in d_manage() and none in d_automount(). Signed-off-by: David Howells Was-Acked-by: Ian Kent Signed-off-by: Al Viro commit 9875cf806403fae66b2410a3c2cc820d97731e04 Author: David Howells Date: Fri Jan 14 18:45:21 2011 +0000 Add a dentry op to handle automounting rather than abusing follow_link() Add a dentry op (d_automount) to handle automounting directories rather than abusing the follow_link() inode operation. The operation is keyed off a new dentry flag (DCACHE_NEED_AUTOMOUNT). This also makes it easier to add an AT_ flag to suppress terminal segment automount during pathwalk and removes the need for the kludge code in the pathwalk algorithm to handle directories with follow_link() semantics. The ->d_automount() dentry operation: struct vfsmount *(*d_automount)(struct path *mountpoint); takes a pointer to the directory to be mounted upon, which is expected to provide sufficient data to determine what should be mounted. If successful, it should return the vfsmount struct it creates (which it should also have added to the namespace using do_add_mount() or similar). If there's a collision with another automount attempt, NULL should be returned. If the directory specified by the parameter should be used directly rather than being mounted upon, -EISDIR should be returned. In any other case, an error code should be returned. The ->d_automount() operation is called with no locks held and may sleep. At this point the pathwalk algorithm will be in ref-walk mode. Within fs/namei.c itself, a new pathwalk subroutine (follow_automount()) is added to handle mountpoints. It will return -EREMOTE if the automount flag was set, but no d_automount() op was supplied, -ELOOP if we've encountered too many symlinks or mountpoints, -EISDIR if the walk point should be used without mounting and 0 if successful. The path will be updated to point to the mounted filesystem if a successful automount took place. __follow_mount() is replaced by follow_managed() which is more generic (especially with the patch that adds ->d_manage()). This handles transits from directories during pathwalk, including automounting and skipping over mountpoints (and holding processes with the next patch). __follow_mount_rcu() will jump out of RCU-walk mode if it encounters an automount point with nothing mounted on it. follow_dotdot*() does not handle automounts as you don't want to trigger them whilst following "..". I've also extracted the mount/don't-mount logic from autofs4 and included it here. It makes the mount go ahead anyway if someone calls open() or creat(), tries to traverse the directory, tries to chdir/chroot/etc. into the directory, or sticks a '/' on the end of the pathname. If they do a stat(), however, they'll only trigger the automount if they didn't also say O_NOFOLLOW. I've also added an inode flag (S_AUTOMOUNT) so that filesystems can mark their inodes as automount points. This flag is automatically propagated to the dentry as DCACHE_NEED_AUTOMOUNT by __d_instantiate(). This saves NFS and could save AFS a private flag bit apiece, but is not strictly necessary. It would be preferable to do the propagation in d_set_d_op(), but that doesn't normally have access to the inode. [AV: fixed breakage in case if __follow_mount_rcu() fails and nameidata_drop_rcu() succeeds in RCU case of do_lookup(); we need to fall through to non-RCU case after that, rather than just returning with ungrabbed *path] Signed-off-by: David Howells Was-Acked-by: Ian Kent Signed-off-by: Al Viro commit 1a8edf40e7c3eee955e0dd0316a7c9d85e36f597 Author: Al Viro Date: Sat Jan 15 13:12:53 2011 -0500 do_lookup() fix do_lookup() has a path leading from LOOKUP_RCU case to non-RCU crossing of mountpoints, which breaks things badly. If we hit need_revalidate: and do nothing in there, we need to come back into LOOKUP_RCU half of things, not to done: in non-RCU one. Signed-off-by: Al Viro commit 1b59be2a6cdcb5a12e18d8315c07c94a624de48f Merge: f9ee7f6 2ed1c52 Author: Linus Torvalds Date: Sat Jan 15 13:01:14 2011 -0800 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: Update Pekka's email address in MAINTAINERS mm/slab.c: make local symbols static slub: Avoid use of slub_lock in show_slab_objects() memory hotplug: one more lock on memory hotplug commit f9ee7f60d6f37ae0184812b4c59b3869f875768b Merge: 16c1020 1161ec9 76d1f7b afa14e7 7c46d8d Author: Linus Torvalds Date: Sat Jan 15 12:45:00 2011 -0800 Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-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: rcu: avoid pointless blocked-task warnings rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status rtmutex: Fix comment about why new_owner can be NULL in wake_futex_pi() * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, olpc: Add missing Kconfig dependencies x86, mrst: Set correct APB timer IRQ affinity for secondary cpu x86: tsc: Fix calibration refinement conditionals to avoid divide by zero x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timekeeping: Make local variables static time: Rename misnamed minsec argument of clocks_calc_mult_shift() * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Remove syscall_exit_fields tracing: Only process module tracepoints once perf record: Add "nodelay" mode, disabled by default perf sched: Fix list of events, dropping unsupported ':r' modifier Revert "perf tools: Emit clearer message for sys_perf_event_open ENOENT return" perf top: Fix annotate segv perf evsel: Fix order of event list deletion commit 16c1020362083b320868c0deef492249089c3cd3 Merge: 65e5d00 bbba756 Author: Linus Torvalds Date: Sat Jan 15 12:33:40 2011 -0800 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: (161 commits) ARM: pxa: fix building issue of missing physmap.h ARM: mmp: PXA910 drive strength FAST using wrong value ARM: mmp: MMP2 drive strength FAST using wrong value ARM: pxa: fix recursive calls in pxa_low_gpio_chip AT91: Support for gsia18s board AT91: Acme Systems FOX Board G20 board files AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h ARM: pxa: fix suspend/resume array index miscalculation ARM: pxa: use cpu_has_ipr() consistently in irq.c ARM: pxa: remove unused variable in clock-pxa3xx.c ARM: pxa: fix warning in zeus.c ARM: sa1111: fix typo in sa1111_retrigger_lowirq() ARM mxs: clkdev related compile fixes ARM i.MX mx31_3ds: Fix MC13783 regulator names ARM: plat-stmp3xxx: irq_data conversion. ARM: plat-spear: irq_data conversion. ARM: plat-orion: irq_data conversion. ARM: plat-omap: irq_data conversion. ARM: plat-nomadik: irq_data conversion. ARM: plat-mxc: irq_data conversion. ... Fix up trivial conflict in arch/arm/plat-omap/gpio.c (Lennert Buytenhek's irq_data conversion clashing with some omap irq updates) commit 65e5d002b5ad220db2bf9557f53de5a98f7dab86 Merge: 3856733 cb4d3ea Author: Linus Torvalds Date: Sat Jan 15 12:29:50 2011 -0800 Merge branch 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm * 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: fix missing branch in __error_a ARM: fix /proc/$PID/stack on SMP ARM: Fix build regression on SA11x0, PXA, and H720x targets ARM: 6625/1: use memblock memory regions for "System RAM" I/O resources ARM: fix wrongly patched constants ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S ARM: 6622/1: fix dma_unmap_sg() documentation ARM: 6621/1: bitops: remove condition code clobber for CLZ ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero ARM: sched_clock: allow init_sched_clock() to be called early ARM: integrator: fix compile warning in cpu.c ARM: 6616/1: Fix ep93xx-fb init/exit annotations ARM: twd: fix display of twd frequency ARM: udelay: prevent math rounding resulting in short udelays commit 84cd8453f30787504305a1a1f8dd5af7a92aa485 Author: James Bottomley Date: Fri Jan 14 16:21:47 2011 -0600 parisc: fix compile breakage caused by inlining maybe_mkwrite on Parisc, we have an include of linux/mm.h inside our asm/pgtable.h, so this patch commit 14fd403f2146f740942d78af4e0ee59396ad8eab Author: Andrea Arcangeli Date: Thu Jan 13 15:46:37 2011 -0800 thp: export maybe_mkwrite Causes us an unsatisfiable use of pte_mkwrite in linux/mm.h The fix is obviously not to include linux/mm.h in our pgtable.h, which unbreaks the build. Signed-off-by: James Bottomley commit fbea668498e93bb38ac9226c7af9120a25957375 Author: Guy Martin Date: Mon Dec 6 16:48:04 2010 +0100 parisc : Remove broken line wrapping handling pdc_iodc_print() Remove the broken line wrapping handling in pdc_iodc_print(). It is broken in 3 ways : - It doesn't keep track of the current screen position, it just assumes that the new buffer will be printed at the begining of the screen. - It doesn't take in account that non printable characters won't increase the current position on the screen. - And last but not least, it triggers a kernel panic if a backspace is the first char in the provided buffer : Backtrace: [<0000000040128ec4>] pdc_console_write+0x44/0x78 [<0000000040128f18>] pdc_console_tty_write+0x20/0x38 [<000000004032f1ac>] n_tty_write+0x2a4/0x550 [<000000004032b158>] tty_write+0x1e0/0x2d8 [<00000000401bb420>] vfs_write+0xb8/0x188 [<00000000401bb630>] sys_write+0x68/0xb8 [<0000000040104eb8>] syscall_exit+0x0/0x14 Most terminals handle the line wrapping just fine. I've confirmed that it works correctly on a C8000 with both vga and serial output. Signed-off-by: Guy Martin Cc: Stable Tree Signed-off-by: James Bottomley commit 7c46d8da09df22361d1d43465c4f1b06cecaf25f Merge: acac03f 7f85803 Author: Ingo Molnar Date: Sat Jan 15 15:23:27 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 bbba75606963c82febf7bd2761ea848ac5d1a1bb Merge: 0731544 ccbc876 Author: Russell King Date: Sat Jan 15 13:24:02 2011 +0000 Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable commit 073154459b80a43f7e4f088b11c93c8e9cb07f14 Merge: c76d292 ea0c4f3 Author: Russell King Date: Sat Jan 15 12:39:04 2011 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit 2ed1c5257b5d669df2a64bd53e61dc19c7d936cd Author: Pekka Enberg Date: Sat Jan 15 13:30:04 2011 +0200 Update Pekka's email address in MAINTAINERS Signed-off-by: Pekka Enberg commit 68a1b1955957e222d890f550d2a44ae598db3de9 Author: H Hartley Sweeten Date: Tue Jan 11 17:49:32 2011 -0600 mm/slab.c: make local symbols static Local symbols should be static. Signed-off-by: H Hartley Sweeten Cc: Christoph Lameter Cc: Pekka Enberg Cc: Matt Mackall Signed-off-by: Pekka Enberg commit 597fb188cbee2d371246e1669bbc6051bb666aa9 Merge: 3856733 04d9487 Author: Pekka Enberg Date: Sat Jan 15 13:28:17 2011 +0200 Merge branch 'slub/hotplug' into slab/urgent commit cb4d3eaebb96616085f5a46a7d7e004ddd955b09 Author: Russell King Date: Sat Jan 15 11:19:19 2011 +0000 ARM: fix missing branch in __error_a When DEBUG_LL is not set, we don't want __error_a re-entering __lookup_machine_type - we want it to go to the error function. This used to be the case before we reorganized the layout for hotplug cpu, as we used to fall through to __error. With the changed layout, we need an explicit branch here instead. Signed-off-by: Russell King commit ea0c4f3ca8a55e7e3138c2c4b3e9f7fe34d3ecab Author: Eric Miao Date: Fri Jan 14 11:01:00 2011 -0600 ARM: pxa: fix building issue of missing physmap.h Signed-off-by: Eric Miao commit 33e739973defbe6b88a2375f174571bf7e72d8fd Author: Philip Rakity Date: Fri Jan 7 11:27:46 2011 -0800 ARM: mmp: PXA910 drive strength FAST using wrong value Drive strength for PXA910 is a 2 bit value but because of the mapping in plat-pxa/mfp.h needs to be shifted up one bit to handle real location in mfp registers. (MMP2 and PXA910 drive strength start at bit 11 while PXA168 starts at bit 10). Values 0, 1, 2, and 3 effectively need to be 0, 2, 4, and 6 to fit into register. 8 does not work. Signed-off-by: Philip Rakity Signed-off-by: Eric Miao commit ee309d3d6e60e19e93cde22e49b87c434dc826ba Author: Philip Rakity Date: Fri Jan 7 11:26:52 2011 -0800 ARM: mmp: MMP2 drive strength FAST using wrong value Drive strength for MMP2 is a 2 bit value but because of the mapping in plat-pxa/mfp.h needs to be shifted up one bit to handle real location in mfp registers. (MMP2 and PXA910 drive strength start at bit 11 while PXA168 starts at bit 10). Values 0, 1, 2, and 3 effectively need to be 0, 2, 4, and 6 to fit into register. 8 does not work. Signed-off-by: Philip Rakity Tested-by: John Watlington Signed-off-by: Eric Miao commit a1015a159530391fc498482656bab6c99dcd3c70 Author: Eric Miao Date: Wed Jan 12 16:42:24 2011 -0600 ARM: pxa: fix recursive calls in pxa_low_gpio_chip Signed-off-by: Eric Miao Tested-by: Marek Vasut commit d5996b2ff0e26cf7ed4c103084a2d6fc569e7216 Author: Russell King Date: Sat Jan 15 09:27:04 2011 +0000 ARM: fix /proc/$PID/stack on SMP Rabin Vincent reports: | On SMP, this BUG() in save_stack_trace_tsk() can be easily triggered | from user space by reading /proc/$PID/stack, where $PID is any pid but | the current process: | | if (tsk != current) { | #ifdef CONFIG_SMP | /* | * What guarantees do we have here that 'tsk' | * is not running on another CPU? | */ | BUG(); | #else Fix this by replacing the BUG() with an entry to terminate the stack trace, returning an empty trace - I'd rather not expose the dwarf unwinder to a volatile stack of a running thread. Reported-by: Rabin Vincent Tested-by: Rabin Vincent Signed-off-by: Russell King commit 0261f7416362f6affc2d4fe7fea9320a6bdaaee6 Author: Wei Yongquan Date: Wed Dec 29 20:30:55 2010 +0800 Update CONFIG_MD_RAID6_PQ to CONFIG_RAID6_PQ in drivers/dma/iop-adma.c Commit f5e70d0fe3ea990cfb3fc8d7f76a719adcb1e0b5 renamed MD_RAID6_PQ to RAID6_PQ, but iop-adma.c didn't update synchronously. Signed-off-by: Wei Yongquan Signed-off-by: Dan Williams commit 96a608a4bfd8468c21881b3f92024923886eb015 Author: Dan Williams Date: Fri Jan 14 17:51:11 2011 -0800 ARM: PL08x: fix a warning drivers/dma/amba-pl08x.c: In function 'pl08x_start_txd': drivers/dma/amba-pl08x.c:205: warning: dereferencing 'void *' pointer We never dereference llis_va aside from assigning it to a struct pl08x_lli pointer or calculating the address of array element 0. Signed-off-by: Dan Williams commit 98d530fe246b65fbd3cdeeeca319a80c46cb4793 Author: Russell King - ARM Linux Date: Sat Jan 1 23:00:23 2011 +0000 Fix dmaengine_submit() return type desc->tx_submit's return type is dma_cookie_t, not int. Therefore, dmaengine_submit() should match this return type as it's just wrapping this detail. Signed-off-by: Russell King Signed-off-by: Dan Williams commit dda36f9821321edf65d69da5c0807df7e73d26fc Author: Nicolas Ferre Date: Wed Jan 12 15:39:10 2011 +0100 dmaengine: at_hdmac: fix race while monitoring channel status We were reading channel status then taking a lock. This lead to a race because this lock may delay us and then make this channel not idle anymore. Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit 568f7f0c2e597671d3e646e0b85c95c4a5756fef Author: Nicolas Ferre Date: Wed Jan 12 15:39:09 2011 +0100 dmaengine: at_hdmac: flags located in first descriptor Place flags on first descriptor of chain instead of last. This is the one used by atc_chain_complete() function while unmapping. Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit 93d0bec2be4b0f036a27da207ecab97fc3d3bbbe Author: Eric Xu Date: Wed Jan 12 15:39:08 2011 +0100 dmaengine: at_hdmac: use subsys_initcall instead of module_init Use subsys_initcall instead of module_init in order to keep DMA engine rolling before other peripheral drivers. Signed-off-by: Eric Xu Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit 58344f25cf5f3453bfcf4b845ea9ec71153e45c3 Author: Nicolas Ferre Date: Wed Jan 12 15:39:07 2011 +0100 dmaengine: at_hdmac: no need set ACK in new descriptor Following descriptor flow in at_hdmac driver, descriptor comming from atc_desc_get() as already DMA_CTRL_ACK flag set. No need to set it again. Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit ebcf9b80f9657f44fcb60ee17abe14eadebf3386 Author: Nicolas Ferre Date: Wed Jan 12 15:39:06 2011 +0100 dmaengine: at_hdmac: trivial add precision to unmapping comment Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit 38567333a6dabd0f2b4150e9fb6dd8e3ba2985e5 Merge: de23be5 c66ac9d Author: Linus Torvalds Date: Fri Jan 14 16:29:49 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6: [SCSI] target: Add LIO target core v4.0.0-rc6 [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event [SCSI] sd: implement sd_check_events() commit 0f70e8cea3ac6a765289811c590a16934bf47711 Author: Nicolas Ferre Date: Wed Dec 15 18:50:16 2010 +0100 dmaengine: at_hdmac: use dma_address to program DMA hardware In atc_prep_slave_sg() function we use dma_address field of scatterlist with sg_dma_address() macro instead of sg_phys(). DMA address is already computed by dma_map_sg() or another mapping function in calling driver. Signed-off-by: Nicolas Ferre Signed-off-by: Dan Williams commit 2cdf2455a660ea860272ef3f833f0e5c4cc80205 Author: Tomoya MORINAGA Date: Wed Jan 5 17:43:52 2011 +0900 pch_dma: support new device ML7213 IOH Support new device OKI SEMICONDUCTOR's ML7213 IOH(Input/Output Hub) which is for IVI(In-Vehicle Infotainment) use. The ML7213 is companion chip for Intel Atom E6xx series. The ML7213 is completely compatible for Intel EG20T PCH. Signed-off-by: Tomoya MORINAGA Signed-off-by: Dan Williams commit 671289c2872cfc050954ac1dd3131429fca30aad Author: Russell King Date: Sat Jan 15 00:14:25 2011 +0000 ARM: Fix build regression on SA11x0, PXA, and H720x targets Build errors similar this appeared in todays kautobuild for the above targets: In file included from arch/arm/include/asm/pgtable.h:461, from arch/arm/mach-pxa/generic.c:26: include/asm-generic/pgtable.h: In function 'ptep_test_and_clear_young': include/asm-generic/pgtable.h:29: error: dereferencing pointer to incomplete type None of the .c files including asm/pgtable.h with this error is using this header, so simply remove the include. Signed-off-by: Russell King commit de23be5f3580f7b9b52cad6633bb3a3cd13abafe Author: Stephen Rothwell Date: Sat Jan 15 10:36:26 2011 +1100 xen: export arbitrary_virt_to_machine Fixes this build error: ERROR: "arbitrary_virt_to_machine" [drivers/xen/xen-gntdev.ko] undefined! Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3632ef8909118db9584e1bed9538dc180adb32f8 Author: Dave Airlie Date: Sat Jan 15 09:27:00 2011 +1000 Revert "drm: Update fbdev fb_fix_screeninfo" This reverts commit dfe63bb0ad9810db13aab0058caba97866e0a681. This commit was causing nouveau not to work properly, for -rc1 I'd prefer it worked and we can look if this is useful for 2.6.39. Cc: James Simmons Signed-off-by: Dave Airlie Signed-off-by: Linus Torvalds commit 8473dbb43db92fa8de7c24d1973aaf1e0276a89f Merge: 7cb3920 94a1b6d Author: Linus Torvalds Date: Fri Jan 14 15:24:37 2011 -0800 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: spi/amba-pl022: fixing compilation warning. spi: Enable SPI driver for S5P6440 and S5P6450 mmc: sdhci-of: fix build on non-powerpc platforms spi/imx: Add i.MX53 support spi/dw_spi: don't treat NULL clk as an error spi: tegra: don't treat NULL clk as an error commit 7cb3920a6529df7f54487abe973b903b8239e901 Merge: ad56cbf 73efe4a Author: Linus Torvalds Date: Fri Jan 14 15:24:17 2011 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: prevent NMI timeouts in cmn_err xfs: Add log level to assertion printk xfs: fix an assignment within an ASSERT() xfs: fix error handling for synchronous writes xfs: add FITRIM support xfs: ensure log covering transactions are synchronous xfs: serialise unaligned direct IOs xfs: factor common write setup code xfs: split buffered IO write path from xfs_file_aio_write xfs: split direct IO write path from xfs_file_aio_write xfs: introduce xfs_rw_lock() helpers for locking the inode xfs: factor post-write newsize updates xfs: factor common post-write isize handling code xfs: ensure sync write errors are returned commit ad56cbf0fa6c09350c738ec59a3361f2e4ab4bc7 Merge: ab0724f f4e8db3 Author: Linus Torvalds Date: Fri Jan 14 15:23:53 2011 -0800 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: Encourage move to dev_pm_ops by warning on use of legacy methods i2c: Factor out runtime suspend checks from PM operations i2c: Unregister dummy devices last on adapter removal commit ab0724ffee24409a7f81afb539b2ac29090bff3e Author: Markus Trippelsdorf Date: Sat Jan 15 00:07:22 2011 +0100 PCI / ACPI: Fix build issue in pci_root.c for !CONFIG_PCIEPORTBUS The compilation of drivers/acpi/pci_root.c fails if CONFIG_PCIEPORTBUS is unset. Fix the problem. Signed-off-by: Rafael J. Wysocki Signed-off-by: Linus Torvalds commit 9a1fe2f27f71dd275caf2be5be2fa59bd2a3f8d4 Author: Rafael J. Wysocki Date: Fri Jan 14 23:25:57 2011 +0100 ACPI / ACPICA: Initialize the global lock spinlock as appropriate Commit 9cd0314 (ACPI / ACPICA: Fix global lock acquisition) forgot to initialize the spinlock it added. Fix that. Reported-and-tested-by: Sergey Senozhatsky Signed-off-by: Rafael J. Wysocki Tested-by: Linus Torvalds Signed-off-by: Linus Torvalds commit 7f85803a26f304e698c673838aab06cc6d4d6e59 Author: Lai Jiangshan Date: Fri Jan 14 17:49:02 2011 +0800 tracing: Remove syscall_exit_fields There is no need for syscall_exit_fields as the syscall exit event class can already host the fields in its structure, like most other trace events do by default. Use that default behavior instead. Following this scheme, we don't need anymore to override the get_fields() callback of the syscall exit event class either. Hence both syscall_exit_fields and syscall_get_exit_fields() can be removed. Also changed some indentation to keep the following under 80 characters: ".fields = LIST_HEAD_INIT(event_class_syscall_exit.fields)," Acked-by: Frederic Weisbecker Signed-off-by: Lai Jiangshan LKML-Reference: <4D301C0E.8090408@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 94a1b6d8eb903818773ad24fe48529b0d295052d Author: Viresh Kumar Date: Thu Jan 13 17:24:22 2011 +0530 spi/amba-pl022: fixing compilation warning. clk_freq is used uninitialized in pl022_setup routine. This patch fix compilation warning for using uninitialized variable Signed-off-by: Viresh Kumar Acked-by: Linus Walleij Signed-off-by: Grant Likely commit c76d292db9869ae73fd401e9a3fc728ed5caf0a7 Merge: 0a831ce fcdc2ea Author: Russell King Date: Fri Jan 14 22:17:32 2011 +0000 Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable commit 11b9369cbb0a13cabb581aec3e6812a171cf2fd7 Author: Dima Zavin Date: Fri Jan 14 23:05:14 2011 +0100 ARM: 6625/1: use memblock memory regions for "System RAM" I/O resources Do not use memory bank info to request the "system ram" resources as they do not track holes created by memblock_remove inside machine's reserve callback. If the removed memory is passed as platform_device's ioresource, then drivers that call request_mem_region would fail due to a conflict with the incorrectly configured system ram resource. Instead, iterate through the regions of memblock.memory and add those as "System RAM" resources. Signed-off-by: Dima Zavin Signed-off-by: Russell King commit 6ab82196492a0b6968a654a06aae923b28afef0d Merge: 6f7f7ca 49731ba Author: Linus Torvalds Date: Fri Jan 14 13:32:07 2011 -0800 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: restore multiple bd_link_disk_holder() support block cfq: compensate preempted queue even if it has no slice assigned block cfq: make queue preempt work for queues from different workload commit 6f7f7caab259026234277b659485d22c1dcb1ab4 Author: Linus Torvalds Date: Fri Jan 14 13:26:18 2011 -0800 Turn d_set_d_op() BUG_ON() into WARN_ON_ONCE() It's indicative of a real problem, and it actually triggers with autofs4, but the BUG_ON() is excessive. The autofs4 case is being fixed (to only set d_op in the ->lookup method) but not merged yet. In the meantime this gets the code limping along. Reported-by: Alex Elder Cc: Ian Kent Cc: Nick Piggin Cc: Al Viro Signed-off-by: Linus Torvalds commit d018b6f4f1539f3679fbdc2d02d58d09e76be84a Merge: 18bce37 0f73f2c Author: Linus Torvalds Date: Fri Jan 14 13:25:30 2011 -0800 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: (47 commits) GRETH: resolve SMP issues and other problems GRETH: handle frame error interrupts GRETH: avoid writing bad speed/duplex when setting transfer mode GRETH: fixed skb buffer memory leak on frame errors GRETH: GBit transmit descriptor handling optimization GRETH: fix opening/closing GRETH: added raw AMBA vendor/device number to match against. cassini: Fix build bustage on x86. e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs e1000e: update Copyright for 2011 e1000: Avoid unhandled IRQ r8169: keep firmware in memory. netdev: tilepro: Use is_unicast_ether_addr helper etherdevice.h: Add is_unicast_ether_addr function ks8695net: Use default implementation of ethtool_ops::get_link ks8695net: Disable non-working ethtool operations USB CDC NCM: Don't deref NULL in cdc_ncm_rx_fixup() and don't use uninitialized variable. vxge: Remember to release firmware after upgrading firmware netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr ipsec: update MAX_AH_AUTH_LEN to support sha512 ... commit 18bce371ae09af6c20ee62c1092a4d1d0e84dd49 Merge: ec08bdb a8f2800 Author: Linus Torvalds Date: Fri Jan 14 13:17:26 2011 -0800 Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux * 'for-2.6.38' of git://linux-nfs.org/~bfields/linux: (62 commits) nfsd4: fix callback restarting nfsd: break lease on unlink, link, and rename nfsd4: break lease on nfsd setattr nfsd: don't support msnfs export option nfsd4: initialize cb_per_client nfsd4: allow restarting callbacks nfsd4: simplify nfsd4_cb_prepare nfsd4: give out delegations more quickly in 4.1 case nfsd4: add helper function to run callbacks nfsd4: make sure sequence flags are set after destroy_session nfsd4: re-probe callback on connection loss nfsd4: set sequence flag when backchannel is down nfsd4: keep finer-grained callback status rpc: allow xprt_class->setup to return a preexisting xprt rpc: keep backchannel xprt as long as server connection rpc: move sk_bc_xprt to svc_xprt nfsd4: allow backchannel recovery nfsd4: support BIND_CONN_TO_SESSION nfsd4: modify session list under cl_lock Documentation: fl_mylease no longer exists ... Fix up conflicts in fs/nfsd/vfs.c with the vfs-scale work. The vfs-scale work touched some msnfs cases, and this merge removes support for that entirely, so the conflict was trivial to resolve. commit ec08bdb148767f1193f5f3028749ed865ac27181 Merge: 9cefa17 7d4ca85 Author: Linus Torvalds Date: Fri Jan 14 13:13:07 2011 -0800 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: (27 commits) omap4: Fix ULPI PHY init for ES1.0 SDP omap3: beaglexm: fix power on of DVI omap3: igep3: Add omap_reserve functionality omap3: beaglexm: fix DVI reset GPIO omap3: beaglexm: fix EHCI power up GPIO dir omap3: igep2: Add keypad support omap3: igep3: Fix IGEP module second MMC channel power supply omap3: igep3: Add USB EHCI support for IGEP module omap3: clocks: Fix build error 'CK_3430ES2' undeclared here arm: omap4: pandaboard: turn on PHY reference clock at init omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg' omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared omap2plus: voltage: Trivial linking fix 'undefined reference' omap2plus: voltage: Trivial warning fix 'no return statement' omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask arm: omap: gpio: don't access irq_desc array directly omap2+: pm_bus: make functions used as pointers as static OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+ OMAP2+: TWL: include pm header for init protos OMAP2+: TWL: make conversion routines static ... Fix up conflicts in arch/arm/mach-omap2/board-omap3beagle.c ("DVI reset GPIO" vs "use generic DPI panel driver") commit 9cefa17e196beab300d4faf09d242de77e5900d5 Merge: 891cc22 6ce1f81 Author: Linus Torvalds Date: Fri Jan 14 13:06:44 2011 -0800 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] fix ia64 build failure in pmdp_get_and_clear commit f4e8db31a83ad019e9ae06edb9c2f89de66bc7b7 Author: Mark Brown Date: Fri Jan 14 22:03:50 2011 +0100 i2c: Encourage move to dev_pm_ops by warning on use of legacy methods Since the PM core wishes to transition away from the legacy suspend and resume methods and since removing them makes using PM core features like runtime PM much easier start warning when a driver is registered using the legacy methods. Signed-off-by: Mark Brown Signed-off-by: Jean Delvare commit d529de2994880d345d7588f92d5a426f63089ba3 Author: Mark Brown Date: Fri Jan 14 22:03:49 2011 +0100 i2c: Factor out runtime suspend checks from PM operations When devices use dev_pm_ops the I2C API is implementing standard functionality for integration with runtime PM and for checking for the presence of a per device op. The PM core provides pm_generic_ functions implementing this behaviour - use them to reduce coupling with future PM updates. Signed-off-by: Mark Brown Signed-off-by: Jean Delvare commit 5219bf884b6e2b54e734ca1799b6f0014bb2b4b7 Author: Jean Delvare Date: Fri Jan 14 22:03:49 2011 +0100 i2c: Unregister dummy devices last on adapter removal Remove real devices first and dummy devices last. This gives device driver which instantiated dummy devices themselves a chance to clean them up before we do. Signed-off-by: Jean Delvare Tested-by: Hans Verkuil Cc: stable@kernel.org commit 0f73f2c5a3ebb957ee66718c903c17ed71a4fc2e Author: Daniel Hellstrom Date: Fri Jan 14 03:02:43 2011 +0000 GRETH: resolve SMP issues and other problems Fixes the following: 1. POLL should not enable IRQ when work is not completed 2. No locking between TX descriptor cleaning and XMIT descriptor handling 3. No locking between RX POLL and XMIT modifying control register 4. Since TX cleaning (called from POLL) is running in parallel with XMIT unnecessary locking is needed. 5. IRQ handler looks at RX frame status solely, this is wrong when IRQ is temporarily disabled (in POLL), and when IRQ is shared. 6. IRQ handler clears IRQ status, which is unnecessary 7. TX queue was stopped in preventing cause when not MAX_SKB_FRAGS+1 descriptors were available after a SKB been scheduled by XMIT. Instead the TX queue is stopped first when not enough descriptors are available upon entering XMIT. It was hard to split up this patch in smaller pieces since all are tied together somehow. Note the RX flag used in the interrupt handler does not signal that interrupt was asserted, but that a frame was received. Same goes for TX. Also, IRQ is not asserted when the RX flag is set before enabling IRQ enable until a new frame is received. So extra care must be taken to avoid enabling IRQ and all descriptors are already used, hence dead lock will upon us. See new POLL implementation that enableds IRQ then look at the RX flag to determine if one or more IRQs may have been missed. TX/RX flags are cleared before handling previously enabled descriptors, this ensures that the RX/TX flags are valid when determining if IRQ should be turned on again. By moving TX cleaning from POLL to XMIT in the standard case, removes some locking trouble. Enabling TX cleaning from poll only when not enough TX descriptors are available is safe because the TX queue is at the same time stopped, thus XMIT will not be called. The TX queue is woken up again when enough descriptrs are available. TX Frames are always enabled with IRQ, however the TX IRQ Enable flag will not be enabled until XMIT must wait for free descriptors. Locking RX and XMIT parts of the driver from each other is needed because the RX/TX enable bits share the same register. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 1ca23434dd0001bd2bfff31b8251436b34aa9066 Author: Daniel Hellstrom Date: Fri Jan 14 03:02:42 2011 +0000 GRETH: handle frame error interrupts Frame error interrupts must also be handled since the RX flag only indicates successful reception, it is unlikely but the old code may lead to dead lock if 128 error frames are recieved in a row. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 2436af8ca7a6c4679cf7da7e3867f1d5cd8528b7 Author: Daniel Hellstrom Date: Fri Jan 14 03:02:41 2011 +0000 GRETH: avoid writing bad speed/duplex when setting transfer mode Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit b669e7f0580f3c0058f1b32c276ef6da8f05c138 Author: Daniel Hellstrom Date: Fri Jan 14 03:02:40 2011 +0000 GRETH: fixed skb buffer memory leak on frame errors A new SKB buffer should not be allocated when the old SKB is reused. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 2a2bc012b98729ce9a39386faed28d11ee021683 Author: Daniel Hellstrom Date: Fri Jan 14 03:02:39 2011 +0000 GRETH: GBit transmit descriptor handling optimization It is safe to enable all fragments before enabling the first descriptor, this way all descriptors don't have to be processed twice, added extra memory barrier. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit bbe9e637330abe55442aebe799425e224086959f Author: Daniel Hellstrom Date: Fri Jan 14 03:02:38 2011 +0000 GRETH: fix opening/closing When NAPI is disabled there is no point in having IRQs enabled, TX/RX should be off before clearing the TX/RX descriptor rings. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit ad4650a89ac47bd153cbb76c3fd6eb1fa6f315b7 Author: Daniel Hellstrom Date: Fri Jan 14 03:02:37 2011 +0000 GRETH: added raw AMBA vendor/device number to match against. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 3b8f5945a24c78c77a88bd747812f7e07e075c7c Merge: 886d7f4 af667a2 Author: David S. Miller Date: Fri Jan 14 12:43:10 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-2.6 commit 886d7f444cbf72d5a424ea5fee4e34a0219d4af1 Merge: b7e2041 5b874e2 Author: David S. Miller Date: Fri Jan 14 12:42:38 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-2.6 commit b7e2041e2a184e3221970eaacf56724369e56bd9 Merge: 92d76e8 0174b0c Author: David S. Miller Date: Fri Jan 14 12:41:47 2011 -0800 Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit 92d76e81b9df5f33b0c9e2091e892560a437a15f Author: David S. Miller Date: Fri Jan 14 12:39:59 2011 -0800 cassini: Fix build bustage on x86. Unfortunately, not all CONFIG_OF platforms provide pci_device_to_OF_node(). Change the test to CONFIG_SPARC for now to deal with the build regressions. Signed-off-by: David S. Miller commit 76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9 Author: H. Peter Anvin Date: Fri Jan 14 11:57:06 2011 -0800 x86, olpc: Add missing Kconfig dependencies OLPC uses select for OLPC_OPENFIRMWARE, which means OLPC has to enforce the dependencies for OLPC_OPENFIRMWARE. Make sure it does so. Signed-off-by: H. Peter Anvin Cc: Daniel Drake Cc: Andres Salomon Cc: Grant Likely LKML-Reference: <20100923162846.D8D409D401B@zog.reactivated.net> Cc: 2.6.37 commit 6550904ddbc3c286798a87edf95eeebcc62bc58a Author: Jacob Pan Date: Thu Jan 13 16:06:44 2011 -0800 x86, mrst: Set correct APB timer IRQ affinity for secondary cpu Offlining the secondary CPU causes the timer irq affinity to be set to CPU 0. When the secondary CPU is back online again, the wrong irq affinity will be used. This patch ensures secondary per CPU timer always has the correct IRQ affinity when enabled. Signed-off-by: Jacob Pan LKML-Reference: <1294963604-18111-1-git-send-email-jacob.jun.pan@linux.intel.com> Signed-off-by: H. Peter Anvin Cc: 2.6.37 commit a8f2800b4f7b76cecb7209cb6a7d2b14904fc711 Author: J. Bruce Fields Date: Fri Jan 14 14:25:48 2011 -0500 nfsd4: fix callback restarting Ensure a new callback is added to the client's list of callbacks at most once. Signed-off-by: J. Bruce Fields commit 42a9fa9957e369240936891c9a521ab671eed4e7 Merge: 5f35765 c289ef4 Author: Grant Likely Date: Fri Jan 14 12:09:49 2011 -0700 Merge branch 'devicetree/next' into spi/next commit 6ce1f81f51c7b22f539012e446c01e8c75d20fd9 Author: Andrea Arcangeli Date: Fri Jan 14 10:56:38 2011 -0800 [IA64] fix ia64 build failure in pmdp_get_and_clear Implement __pmd macro for ia64 too. Signed-off-by: Andrea Arcangeli Signed-off-by: Tony Luck commit bd7633195581c7665ce9dd80c665ec93466d1b64 Author: Jeff Layton Date: Tue Jan 11 10:33:24 2011 -0500 cifs: add cruid= mount option In commit 3e4b3e1f we separated the "uid" mount option such that it no longer determined the owner of the credential cache by default. When we did this, we added a new option to cifs.upcall (--legacy-uid) to try to make it so that it would behave the same was as it did before. This ignored a rather important point -- the kernel has no way to know what options are being passed to cifs.upcall, so it doesn't know what uid it should use to determine whether to match an existing krb5 session. The simplest solution is to simply add a new "cruid=" mount option that only governs the uid owner of the credential cache for the mount. Unfortunately, this means that the --legacy-uid option in cifs.upcall was ill-considered and is now useless, but I don't see a better way to deal with this. A patch for the mount.cifs manpage will follow once this patch has been accepted. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 56c24305d1494a7e345c75669dc60e8b231b735b Author: Jeff Layton Date: Tue Jan 11 07:24:25 2011 -0500 cifs: cFYI the entire error code in map_smb_to_linux_error We currently only print the DOS error part. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit fcdc2ea76d266e06fc95a364d0e547ca44e3890b Author: Igor Plyatov Date: Fri Jan 14 19:01:13 2011 +0100 AT91: Support for gsia18s board The GS_IA18_S (GMS) is a carrier board from GeoSIG Ltd used with the Stamp9G20 SoM from Taskit company. It operate as an internet accelerometer. Signed-off-by: Igor Plyatov [nicolas.ferre@atmel.com: rm Kconfig, whitespace fixes, change machine name] Signed-off-by: Nicolas Ferre commit 0fb55d3bb73c7d20b39658e65debd7331c223035 Author: Sergio Tanzilli Date: Thu Oct 14 02:06:26 2010 +0200 AT91: Acme Systems FOX Board G20 board files Signed-off-by: Sergio Tanzilli [nicolas.ferre@atmel.com: whitespace fixes, change machine name] Signed-off-by: Nicolas Ferre commit ad6ef7fa03aab125660a77cd22c99ee6e0fb093d Author: Jesper Juhl Date: Mon Jan 10 22:29:32 2011 +0100 AT91: board-sam9m10g45ek.c: Remove duplicate inclusion of mach/hardware.h Signed-off-by: Jesper Juhl Signed-off-by: Nicolas Ferre commit 891cc2283216bf76f387546f0e220caf8ce9fbf9 Merge: d73b388 22ab70d Author: Linus Torvalds Date: Fri Jan 14 10:30:09 2011 -0800 Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS agp/intel: Fix device names of i845 and 845G drm/i915: Disable GPU semaphores on SandyBridge mobile drm/i915/execbuffer: Clear domains before beginning reloc processing drm/i915/execbuffer: Reorder relocations to match new object order drm/i915: Fix error handler to capture the first batch after the seqno drm/i915: Add a module option to override the use of SSC drm/i915/panel: The backlight is enabled if the current value is non-zero drm/i915/debugfs: Correct format after changing type of err object 'size' commit 3e8b3b90fecedcf20d895c4e6ad01a379fe252bf Author: Hanno Boeck Date: Fri Jan 14 19:14:47 2011 +0100 ALSA: constify functions in ac97 Signed-off-by: Hanno Boeck Signed-off-by: Takashi Iwai commit 49731baa41df404c2c3f44555869ab387363af43 Author: Tejun Heo Date: Fri Jan 14 18:43:57 2011 +0100 block: restore multiple bd_link_disk_holder() support Commit e09b457b (block: simplify holder symlink handling) incorrectly assumed that there is only one link at maximum. dm may use multiple links and expects block layer to track reference count for each link, which is different from and unrelated to the exclusive device holder identified by @holder when the device is opened. Remove the single holder assumption and automatic removal of the link and revive the per-link reference count tracking. The code essentially behaves the same as before commit e09b457b sans the unnecessary kobject reference count dancing. While at it, note that this facility should not be used by anyone else than the current ones. Sysfs symlinks shouldn't be abused like this and the whole thing doesn't belong in the block layer at all. Signed-off-by: Tejun Heo Reported-by: Milan Broz Cc: Jun'ichi Nomura Cc: Neil Brown Cc: linux-raid@vger.kernel.org Cc: Kay Sievers Signed-off-by: Jens Axboe commit d73b388459b1ee2e80f8ff9c1916d75640d7d920 Merge: 5957e33 0f953bf Author: Linus Torvalds Date: Fri Jan 14 09:29:05 2011 -0800 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/PM: Report wakeup events before resuming devices PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events PCI: sysfs: Update ROM to include default owner write access x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available PCI/ACPI: Request _OSC control once for each root bridge (v3) PCI: enable pci=bfsort by default on future Dell systems PCI/PCIe: Clear Root PME Status bits early during system resume PCI: pci-stub: ignore zero-length id parameters x86/PCI: irq and pci_ids patch for Intel Patsburg PCI: Skip id checking if no id is passed PCI: fix __pci_device_probe kernel-doc warning PCI: make pci_restore_state return void PCI: Disable ASPM if BIOS asks us to PCI: Add mask bit definition for MSI-X table PCI: MSI: Move MSI-X entry definition to pci_regs.h Fix up trivial conflicts in drivers/net/{skge.c,sky2.c} that had in the meantime been converted to not use legacy PCI power management, and thus no longer use pci_restore_state() at all (and that caused trivial conflicts with the "make pci_restore_state return void" patch) commit 62627bec8a601c5679bf3d20a2096a1206d61b71 Author: John Stultz Date: Fri Jan 14 09:06:28 2011 -0800 x86: tsc: Fix calibration refinement conditionals to avoid divide by zero Konrad Wilk reported that the new delayed calibration crashes with a divide by zero on Xen. The reason is that Xen sets the pmtimer address, but reading from it returns 0xffffff. That results in the ref_start and ref_stop value being the same, so the delta is zero which causes the divide by zero later in the calculation. The conditional (!hpet && !ref_start && !ref_stop) which sanity checks the calibration reference values doesn't really make sense. If the refs are null, but hpet is on, we still want to break out. The div by zero would be possible to trigger by chance if both reads from the hardware provided the exact same value (due to hardware wrapping). So checking if both the ref values are the same should handle if we don't have hardware (both null) or if they are the same value (either by invalid hardware, or by chance), avoiding the div by zero issue. [ tglx: Applied the same fix to native_calibrate_tsc() where this check was copied from ] Reported-by: Konrad Rzeszutek Wilk Tested-by: Konrad Rzeszutek Wilk Signed-off-by: John Stultz LKML-Reference: <1295024788-15619-1-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner commit 5957e33d6aec266659a71cfabcf7cf2c593ad0d2 Merge: 0ad53ee 359ab9f Author: Linus Torvalds Date: Fri Jan 14 09:25:59 2011 -0800 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: (21 commits) power_supply: Add MAX17042 Fuel Gauge Driver olpc_battery: Fix up XO-1.5 properties list olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW olpc_battery: Add support for CHARGE_NOW olpc_battery: Add support for CHARGE_FULL_DESIGN olpc_battery: Ambient temperature is not available on XO-1.5 jz4740-battery: Should include linux/io.h s3c_adc_battery: Add gpio_inverted field to pdata power_supply: Don't use flush_scheduled_work() power_supply: Fix use after free and memory leak gpio-charger: Fix potential race between irq handler and probe/remove gpio-charger: Provide default name for the power_supply gpio-charger: Check result of kzalloc jz4740-battery: Check if platform_data is supplied isp1704_charger: Detect charger after probe isp1704_charger: Set isp->dev before anything needs it isp1704_charger: Detect HUB/Host chargers isp1704_charger: Correct length for storing model power_supply: Add gpio charger driver jz4740-battery: Protect against concurrent battery readings ... commit 0ad53eeefcbb2620b6a71ffdaad4add20b450b8b Author: Tejun Heo Date: Fri Jan 14 15:56:37 2011 +0000 afs: add afs_wq and use it instead of the system workqueue flush_scheduled_work() is going away. afs needs to make sure all the works it has queued have finished before being unloaded and there can be arbitrary number of pending works. Add afs_wq and use it as the flush domain instead of the system workqueue. Also, convert cancel_delayed_work() + flush_scheduled_work() to cancel_delayed_work_sync() in afs_mntpt_kill_timer(). Signed-off-by: Tejun Heo Signed-off-by: David Howells Cc: linux-afs@lists.infradead.org Signed-off-by: Linus Torvalds commit e1fcc7e2a719d139322fab3f47cfbd4340cf3d82 Author: Tejun Heo Date: Fri Jan 14 15:56:31 2011 +0000 rxrpc: rxrpc_workqueue isn't used during memory reclaim rxrpc_workqueue isn't depended upon while reclaiming memory. Convert to alloc_workqueue() without WQ_MEM_RECLAIM. Signed-off-by: Tejun Heo Signed-off-by: David Howells Cc: linux-afs@lists.infradead.org Signed-off-by: Linus Torvalds commit ba28b93a5227cc69ec811507f7d85ac25fa20fe2 Author: Akshat Aranya Date: Fri Jan 14 16:00:47 2011 +0000 FS-Cache: Fix operation handling fscache_submit_exclusive_op() adds an operation to the pending list if other operations are pending. Fix the check for pending ops as n_ops must be greater than 0 at the point it is checked as it is incremented immediately before under lock. Signed-off-by: Akshat Aranya Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit acda4721ae876dedab3fef04bbd8020bfa67ff0a Merge: 822e521 32385c7 Author: Linus Torvalds Date: Fri Jan 14 09:08:29 2011 -0800 Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin * 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: kernel: fix hlist_bl again cgroups: Fix a lockdep warning at cgroup removal fs: namei fix ->put_link on wrong inode in do_filp_open commit 822e5215f9eef86c1dd56d5696bf55a212b0e3f0 Merge: c1e0d97 92d50a4 Author: Linus Torvalds Date: Fri Jan 14 09:08:00 2011 -0800 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: (59 commits) mfd: ab8500-core chip version cut 2.0 support mfd: Flag WM831x /IRQ as a wake source mfd: Convert WM831x away from legacy I2C PM operations regulator: Support MAX8998/LP3974 DVS-GPIO mfd: Support LP3974 RTC i2c: Convert SCx200 driver from using raw PCI to platform device x86: OLPC: convert olpc-xo1 driver from pci device to platform device mfd: MAX8998/LP3974 hibernation support mfd/ab8500: remove spi support mfd: Remove ARCH_U8500 dependency from AB8500 misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage mfd: Add __devexit annotation for vx855_remove mfd: twl6030 irq_data conversion. gpio: Fix cs5535 printk warnings misc: Fix cs5535 printk warnings mfd: Convert Wolfson MFD drivers to use irq_data accessor function mfd: Convert TWL4030 to new irq_ APIs mfd: Convert tps6586x driver to new irq_ API mfd: Convert tc6393xb driver to new irq_ APIs mfd: Convert t7166xb driver to new irq_ API ... commit 0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed Author: Rafael J. Wysocki Date: Wed Dec 29 13:22:08 2010 +0100 PCI/PM: Report wakeup events before resuming devices Make wakeup events be reported by the PCI subsystem before attempting to resume devices or queuing up runtime resume requests for them, because wakeup events should be reported as soon as they have been detected. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit b6e335aeeb114dccb07eaa09e8b62ff9510cf745 Author: Rafael J. Wysocki Date: Wed Dec 29 13:21:23 2010 +0100 PCI/PM: Use pm_wakeup_event() directly for reporting wakeup events After recent changes related to wakeup events pm_wakeup_event() automatically checks if the given device is configured to signal wakeup, so pci_wakeup_event() may be a static inline function calling pm_wakeup_event() directly. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit ff29530e651a3449aea6b0ef4c7048db9e22ef27 Author: Alex Williamson Date: Wed Jan 5 10:26:41 2011 -0700 PCI: sysfs: Update ROM to include default owner write access The PCI sysfs ROM interface requires an enabling write to access the ROM image, but the default file mode is 0400. The original proposed patch adding sysfs ROM support was a true read-only interface, with the enabling bit coming in as a feature request. I suspect it was simply an oversight that the file mode didn't get updated to match the API. Acked-by: Chris Wright Signed-off-by: Alex Williamson Signed-off-by: Jesse Barnes commit 64a5fed6663edcf7e3864ed5534e42e2b9f340c7 Author: Bjorn Helgaas Date: Thu Jan 6 10:12:30 2011 -0700 x86/PCI: make Broadcom CNB20LE driver EMBEDDED and EXPERIMENTAL This functionality is known to be incomplete, so discourage its use in general-purpose kernels. The only reason to use this driver is to support PCI hotplug on CNB20LE- based machines that don't have ACPI, and there are very few such systems. Reference: https://bugzilla.redhat.com/show_bug.cgi?id=665109 Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 30e664afb5cb597dd6f7651e6d116e10b9741084 Author: Bjorn Helgaas Date: Thu Jan 6 10:12:24 2011 -0700 x86/PCI: don't use native Broadcom CNB20LE driver when ACPI is available The broadcom_bus.c quirk was written (without benefit of documentation) to support PCI hotplug on an old system that doesn't have ACPI. As such, we should only use it when the system doesn't have ACPI. If the system does have ACPI and we need the host bridge description, we should get it from the ACPI _CRS method. On machines older than 2008, we currently ignore _CRS, but that doesn't mean we should use broadcom_bus.c. It means we should either (a) do what we've done in the past and assume everything in the PCI gap is routed to bus 0 (so hotplug may not work), or (b) arrange to use _CRS. This patch does (a). Reference: https://bugzilla.redhat.com/show_bug.cgi?id=665109 Acked-by: Ira W. Snyder Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes commit 415e12b2379239973feab91850b0dce985c6058a Author: Rafael J. Wysocki Date: Fri Jan 7 00:55:09 2011 +0100 PCI/ACPI: Request _OSC control once for each root bridge (v3) Move the evaluation of acpi_pci_osc_control_set() (to request control of PCI Express native features) into acpi_pci_root_add() to avoid calling it many times for the same root complex with the same arguments. Additionally, check if all of the requisite _OSC support bits are set before calling acpi_pci_osc_control_set() for a given root complex. References: https://bugzilla.kernel.org/show_bug.cgi?id=20232 Reported-by: Ozan Caglayan Tested-by: Ozan Caglayan Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 6e8af08dfa40b747002207d3ce8e8b43a050d99f Author: Narendra_K@Dell.com Date: Tue Dec 14 09:57:12 2010 -0800 PCI: enable pci=bfsort by default on future Dell systems This patch enables pci=bfsort by default on future Dell systems. It reads SMBIOS type 0xB1 vendor specific record and sets pci=bfsort accordingly. Offset Name Length Value Description 04 Flags0 Word Varies Bits 9-10 - 10:9 = 00 Unknown - 10:9 = 01 Breadth First - 10:9 = 10 Depth First - 10:9 = 11 Reserved 1. Any time pci=bfsort has to be enabled on a system, we need to add the model number of the system to the white list. With this patch, that is not required. 2. Typically, model number has to be added to the white list when the system is under development. With this change, that is not required. Signed-off-by: Jordan Hargrave Signed-off-by: Narendra K Signed-off-by: Jesse Barnes commit c1e0d97d3d63d5173baf8c39a13dc5c25b031bd4 Merge: 7f5db6a 51120c2 Author: Linus Torvalds Date: Fri Jan 14 08:47:26 2011 -0800 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] MAINTAINERS: Update zcrypt driver entry [S390] Randomize PIEs [S390] Randomise the brk region [S390] Add is_32bit_task() helper function [S390] Randomize lower bits of stack address [S390] Randomize mmap start address [S390] Rearrange mmap.c [S390] Enable flexible mmap layout for 64 bit processes [S390] vdso: dont map at mmap_base [S390] reduce miminum gap between stack and mmap_base [S390] mmap: consider stack address randomization [S390] Update default configuration [S390] cio: path_event overindication after resume commit 22ab70d3262ddb6e69b3c246a34e2967ba5eb1e8 Author: Knut Petersen Date: Fri Jan 14 15:38:10 2011 +0000 drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS Signed-off-by: Knut Petersen Signed-off-by: Chris Wilson Cc: stable@kernel.org commit 53371edaef692bef7eee8070bd680401ccf65706 Author: Oswald Buddenhagen Date: Sat Jun 19 23:08:37 2010 +0200 agp/intel: Fix device names of i845 and 845G They got mixed up when the switch was converted to a table in 2007. Signed-off-by: Oswald Buddenhagen [ickle: minor changes for 2.6.37+] Signed-off-by: Chris Wilson commit c94fbe1d9e1e9b1a1f82eb0b53b1cf53bcf9712b Author: Steven Rostedt Date: Fri Jan 14 11:25:58 2011 -0500 tracing: Only process module tracepoints once The commit: 9f987b3141f086de27832514aad9f50a53f754 tracing: Include module.h in define_trace.h only solved half the problem. If the trace/events/module.h header is included at the time of define_trace.h (or in ftrace.h within it), the module.h TRACE_SYSTEM will override the current TRACE_SYSTEM macro. Since define_trace.h is included when CREATE_TRACE_POINTS is set, and the first thing it does is to #undef CREATE_TRACE_POINTS, by placing the module.h TRACE_SYSTEM inside a #ifdef CREATE_TRACE_POINTS we can prevent it from overriding the TRACE_SYSTEM that is being processed, and still process the module.h tracepoints when the module code defines CREATE_TRACE_POINTS and includes the trace/events/module.h header. As with commit 9f987b3141, this is only an issue if module.h is not included before the trace/events/.h file is included, which (luckily) has not happened yet. Reported-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit 1b624fb64c2de44c00576cc9695680983f05c1ce Author: Marek Vasut Date: Mon Jan 10 23:53:12 2011 +0100 ARM: pxa: fix suspend/resume array index miscalculation Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 57879b8c40d4c254f1feba3adbeb69614fe5e4c9 Author: Marek Vasut Date: Mon Jan 10 00:29:04 2011 +0100 ARM: pxa: use cpu_has_ipr() consistently in irq.c Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit b6aec3a5d6d8e898baef3ed0d1b2911ee5e718a3 Author: Marek Vasut Date: Mon Jan 10 00:29:03 2011 +0100 ARM: pxa: remove unused variable in clock-pxa3xx.c Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit bc3e55c69c404158ef3c5b1a6515f5e9f1294403 Author: Marek Vasut Date: Mon Jan 10 00:29:02 2011 +0100 ARM: pxa: fix warning in zeus.c Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit cae399880f82fdc6b0afccf42224fc2a759aa6b3 Author: Pavel Machek Date: Mon Jan 10 16:35:34 2011 -0600 ARM: sa1111: fix typo in sa1111_retrigger_lowirq() Signed-off-by: Pavel Machek Signed-off-by: Eric Miao commit 7f5db6a8022e8d4bb92b3d638068d2c2a9c9b59b Author: Lennert Buytenhek Date: Fri Jan 14 09:44:19 2011 +0100 gpio: timbgpio: Fix up irq_data conversion breakage. Commit a1f5f22adc3206c47e70652c12671666c65b579f ("gpio: timbgpio: irq_data conversion") was slightly too enthusiastic in converting timbgpio_irq() over to take an irq_data * argument instead of an unsigned int irq argument, as it is a flow handler, which still take IRQ numbers for now. (And on top of that, it was using the wrong accessors.) This fixes it up, and seems to build without warnings. Signed-off-by: Lennert Buytenhek Cc: Andrew Morton Cc: Richard Röjfors Signed-off-by: Linus Torvalds commit c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 Author: Nicholas Bellinger Date: Fri Dec 17 11:11:26 2010 -0800 [SCSI] target: Add LIO target core v4.0.0-rc6 LIO target is a full featured in-kernel target framework with the following feature set: High-performance, non-blocking, multithreaded architecture with SIMD support. Advanced SCSI feature set: * Persistent Reservations (PRs) * Asymmetric Logical Unit Assignment (ALUA) * Protocol and intra-nexus multiplexing, load-balancing and failover (MC/S) * Full Error Recovery (ERL=0,1,2) * Active/active task migration and session continuation (ERL=2) * Thin LUN provisioning (UNMAP and WRITE_SAMExx) Multiprotocol target plugins Storage media independence: * Virtualization of all storage media; transparent mapping of IO to LUNs * No hard limits on number of LUNs per Target; maximum LUN size ~750 TB * Backstores: SATA, SAS, SCSI, BluRay, DVD, FLASH, USB, ramdisk, etc. Standards compliance: * Full compliance with IETF (RFC 3720) * Full implementation of SPC-4 PRs and ALUA Significant code cleanups done by Christoph Hellwig. [jejb: fix up for new block bdev exclusive interface. Minor fixes from Randy Dunlap and Dan Carpenter.] Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit c72a04e34735ec3f19f4788b7f95017310b5e1eb Author: Al Viro Date: Fri Jan 14 05:31:45 2011 +0000 cgroup_fs: fix cgroup use of simple_lookup() cgroup can't use simple_lookup(), since that'd override its desired ->d_op. Tested-by: Li Zefan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 323b7fe8f8f6d5ac6214382cf30e8b3a80b265c9 Author: Wolfram Sang Date: Fri Jan 14 09:34:29 2011 +0100 include/gpio.h: remove remaining __must_check-annotiations Commit 5f829e405ec4e96f711165a4a7b55c271d4363e2 (gpiolib: add missing functions to generic fallback) also introduced two. Signed-off-by: Wolfram Sang Cc: Greg KH Cc: Andrew Morton Signed-off-by: Linus Torvalds commit 836cb711ad7960e52625b24195d6e70b79ab0816 Author: KAMEZAWA Hiroyuki Date: Fri Jan 14 14:56:53 2011 +0900 Revert update for dirty_ratio for memcg. The flags added by commit db16d5ec1f87f17511599bc77857dd1662b5a22f has no user now. We believe we'll use it soon but considering patch reviewing, the change itself should be folded into incoming set of "dirty ratio for memcg" patches. So, it's better to drop this change from current mainline tree. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Greg Thelen Signed-off-by: Linus Torvalds commit 11ff26c884ec957bed87b49e3a38908f37d0d3e4 Author: KAMEZAWA Hiroyuki Date: Fri Jan 14 15:04:21 2011 +0900 revert documentaion update for memcg's dirty ratio. Subjct: Revert memory cgroup dirty_ratio Documentation. The commit ece72400c2a27a3d726cb0854449f991d9fcd2da adds documentation for memcg's dirty ratio. But the function is not implemented yet. Remove the documentation for avoiding confusing users. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Greg Thelen Signed-off-by: Linus Torvalds commit f4013c3879d1bbd9f3ab8351185decd049502368 Author: Tejun Heo Date: Tue Dec 28 16:20:47 2010 +0100 [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event SDEV_MEDIA_CHANGE event was first added by commit a341cd0f (SCSI: add asynchronous event notification API) for SATA AN support and then extended to cover generic media change events by commit 285e9670 ([SCSI] sr,sd: send media state change modification events). This event was mapped to block device in userland with all properties stripped to simulate CHANGE event on the block device, which, in turn, was used to trigger further userspace action on media change. The recent addition of disk event framework kept this event for backward compatibility but it turns out to be unnecessary and causes erratic and inefficient behavior. The new disk event generates proper events on the block devices and the compat events are mapped to block device with all properties stripped, so the block device ends up generating multiple duplicate events for single actual event. This patch removes the compat event generation from both sr and sd as suggested by Kay Sievers. Both existing and newer versions of udev and the associated tools will behave better with the removal of these events as they from the beginning were expecting events on the block devices. Signed-off-by: Tejun Heo Acked-by: Kay Sievers Signed-off-by: James Bottomley commit 2bae0093cab4ee0a7a8728fdfc35b74569350863 Author: Tejun Heo Date: Sat Dec 18 18:42:23 2010 +0100 [SCSI] sd: implement sd_check_events() Replace sd_media_change() with sd_check_events(). * Move media removed logic into set_media_not_present() and media_not_present() and set sdev->changed iff an existing media is removed or the device indicates UNIT_ATTENTION. * Make sd_check_events() sets sdev->changed if previously missing media becomes present. * Event is reported only if sdev->changed is set. This makes media presence event reported if scsi_disk->media_present actually changed or the device indicated UNIT_ATTENTION. For backward compatibility, SDEV_EVT_MEDIA_CHANGE is generated each time sd_check_events() detects media change event. [jejb: fix boot failure] Signed-off-by: Tejun Heo Acked-by: Jens Axboe Signed-off-by: James Bottomley commit 359ab9f5b154cbd807a11e22792235f0f36b0cd5 Author: MyungJoo Ham Date: Fri Jan 14 14:46:11 2011 +0900 power_supply: Add MAX17042 Fuel Gauge Driver The MAX17042 is a fuel gauge with an I2C interface for lithium-ion betteries. Unlike its predecessor MAX17040, MAX17042 uses 16bit registers. Besides, MAX17042 has much more features than MAX17040; e.g., a thermistor, current and current accumulation measurement, battery internal resistance estimate, average values of measurement, and others. This patch implements a driver for MAX17042. In this initial release, we have implemented the most basic features of a fuel gauge: measure the battery capacity and voltage. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Signed-off-by: Anton Vorontsov commit 1161ec944916069ceec21c487e30247d9ff22857 Merge: f123c98 b24efdf Author: Ingo Molnar Date: Fri Jan 14 15:30:16 2011 +0100 Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent commit 32385c7cf60a78375b63afc4f02001df84dfd1a0 Author: Russell King Date: Fri Jan 14 13:12:45 2011 +0000 kernel: fix hlist_bl again __d_rehash is dereferencing an almost-NULL pointer on my ARM926. CONFIG_SMP=n and CONFIG_DEBUG_SPINLOCK=y. The faulting instruction is: strne r3, [r2, #4] and as can be seen from the register dump below, r2 is 0x00000001, hence the faulting 0x00000005 address. __d_rehash is essentially: spin_lock_bucket(b); entry->d_flags &= ~DCACHE_UNHASHED; hlist_bl_add_head_rcu(&entry->d_hash, &b->head); spin_unlock_bucket(b); which is: bit_spin_lock(0, (unsigned long *)&b->head.first); entry->d_flags &= ~DCACHE_UNHASHED; hlist_bl_add_head_rcu(&entry->d_hash, &b->head); __bit_spin_unlock(0, (unsigned long *)&b->head.first); bit_spin_lock(0, ptr) sets bit 0 of *ptr, in this case b->head.first if CONFIG_SMP or CONFIG_DEBUG_SPINLOCK is set: #if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK) while (unlikely(test_and_set_bit_lock(bitnum, addr))) { while (test_bit(bitnum, addr)) { preempt_enable(); cpu_relax(); preempt_disable(); } } #endif So, b->head.first starts off NULL, and becomes a non-NULL (address 1). hlist_bl_add_head_rcu() does this: static inline void hlist_bl_add_head_rcu(struct hlist_bl_node *n, struct hlist_bl_head *h) { first = hlist_bl_first(h); n->next = first; if (first) first->pprev = &n->next; It is the store to first->pprev which is faulting. hlist_bl_first(): static inline struct hlist_bl_node *hlist_bl_first(struct hlist_bl_head *h) { return (struct hlist_bl_node *) ((unsigned long)h->first & ~LIST_BL_LOCKMASK); } but: #if defined(CONFIG_SMP) #define LIST_BL_LOCKMASK 1UL #else #define LIST_BL_LOCKMASK 0UL #endif So, we have one piece of code which sets bit 0 of addresses, and another bit of code which doesn't clear it before dereferencing the pointer if !CONFIG_SMP && CONFIG_DEBUG_SPINLOCK. With the patch below, I can again sucessfully boot the kernel on my Versatile PB/926 platform. Signed-off-by: Russell King commit b24efdfdf679cf9b05947c531971905fc727dd40 Author: Paul E. McKenney Date: Wed Jan 12 14:18:11 2011 -0800 rcu: avoid pointless blocked-task warnings If the RCU callback-processing kthread has nothing to do, it parks in a wait_event(). If RCU remains idle for more than two minutes, the kernel complains about this. This commit changes from wait_event() to wait_event_interruptible() to prevent the kernel from complaining just because RCU is idle. Reported-by: Russell King Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney Tested-by: Thomas Weber Tested-by: Russell King commit c072a388d59a1d48e36864d0e66f42d71745be1c Author: Paul E. McKenney Date: Fri Jan 7 02:33:47 2011 -0800 rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status Because the adaptive synchronize_srcu_expedited() approach has worked very well in testing, remove the kernel parameter and replace it by a C-preprocessor macro. If someone finds problems with this approach, a more complex and aggressively adaptive approach might be required. Longer term, SRCU will be merged with the other RCU implementations, at which point synchronize_srcu_expedited() will be event driven, just as synchronize_sched_expedited() currently is. At that point, there will be no need for this adaptive approach. Reported-by: Linus Torvalds Signed-off-by: Paul E. McKenney commit 228dd545147a07c5e81e4732ad0e829d19ce5daa Author: Matti J. Aaltonen Date: Thu Jan 13 15:22:45 2011 +0200 ASoC: WL1273 FM radio: Fix breakage with MFD API changes 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. Signed-off-by: Matti J. Aaltonen Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2 Merge: 5b88128 b9214b9 Author: Russell King Date: Fri Jan 14 12:12:42 2011 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit 30b99d07b7e08d0e6bcc2f0b924828c03e67f881 Author: Russell King Date: Fri Jan 14 12:06:26 2011 +0000 ARM: fix wrongly patched constants e3d9c625 (ARM: CPU hotplug: fix hard-coded control register constants) changed the wrong constants in the hotplug assembly code. Fix this. Reported-by: viresh kumar Signed-off-by: Russell King commit 92d50a4132977b932ed830fa58c05deeb5c524f0 Author: Mattias Wallin Date: Tue Dec 7 11:20:47 2010 +0100 mfd: ab8500-core chip version cut 2.0 support This patch adds support for chip version 2.0 or cut 2.0. One new interrupt latch register - latch 12 - is introduced. Signed-off-by: Mattias Wallin Acked-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 180e4f5f20ef2b03ce2b38634274dde5ccbd8951 Author: Mark Brown Date: Wed Jan 5 17:56:01 2011 +0000 mfd: Flag WM831x /IRQ as a wake source The WM831x can generate wake events, some unconditionally, so flag the primary IRQ as a wake source in order to help the CPU treat the /IRQ signal appropriately. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit c538ddbe4fc70ef97af02d57abad34b246b19082 Author: Mark Brown Date: Wed Jan 5 15:12:39 2011 +0000 mfd: Convert WM831x away from legacy I2C PM operations Since the legacy bus PM operations are deprecated move the suspend method over to dev_pm_ops. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 735a3d9efdc5aeebe201008e6655b235c7f02aeb Author: MyungJoo Ham Date: Tue Jan 11 12:20:05 2011 +0100 regulator: Support MAX8998/LP3974 DVS-GPIO The previous driver did not support BUCK1-DVS3, BUCK1-DVS4, and BUCK2-DVS2 modes. This patch adds such modes and an option to block setting buck1/2 voltages out of the preset values. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 337ce5d1c5759644cea6c47220ce7e84f0398362 Author: MyungJoo Ham Date: Tue Jan 4 14:17:39 2011 +0900 mfd: Support LP3974 RTC The first releases of LP3974 have a large delay in RTC registers, which requires 2 seconds of delay after writing to a rtc register (recommended by National Semiconductor's engineers) before reading it. If "rtc_delay" field of the platform data is true, the rtc driver assumes that such delays are required. Although we have not seen LP3974s without requiring such delays, we assume that such LP3974s will be released soon (or they have done so already) and they are supported by "lp3974" without setting "rtc_delay" at the platform data. This patch adds delays with msleep when writing values to RTC registers if the platform data has rtc_delay set. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Reviewed-by: Mark Brown Signed-off-by: Samuel Ortiz commit de8255ccd219267cfd34139022b197c1ef8f032f Author: Andres Salomon Date: Thu Dec 30 20:27:33 2010 -0800 i2c: Convert SCx200 driver from using raw PCI to platform device The SCx200 ACB driver supports ISA hardware as well as PCI. The PCI hardware is CS5535/CS5536 based, and the device that it grabs is handled by the cs5535-mfd driver. This converts the SCx200 driver to use a platform_driver rather than the previous PCI hackery. The driver used to manually track the iface list (via linked list); now it only does this for ISA devices. PCI ifaces are handled through standard driver model lists. It's unclear what happens in case of errors in the old ISA code; rather than pretending the code actually cares, I've dropped the (implicit) ignorance of return values and marked it with a comment. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 419cdc54ea597d307fade607a65e4885634eb8c8 Author: Andres Salomon Date: Mon Nov 29 15:45:06 2010 -0800 x86: OLPC: convert olpc-xo1 driver from pci device to platform device The cs5535-mfd driver now takes care of the PCI BAR handling; this means the olpc-xo1 driver shouldn't be touching the PCI device at all. This patch uses both cs5535-acpi and cs5535-pms platform devices rather than a single platform device because the cs5535-mfd driver may be used by other CS5535 platform-specific drivers; OLPC doesn't get to dictate that ACPI and PMS will always be used together. Signed-off-by: Andres Salomon Acked-by: H. Peter Anvin Signed-off-by: Samuel Ortiz commit cdd137c9c86c201ddb7f42ec978d2da45e7b7a17 Author: MyungJoo Ham Date: Thu Dec 23 17:53:36 2010 +0900 mfd: MAX8998/LP3974 hibernation support This patch makes the driver to save and restore register values for hibernation. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Signed-off-by: Samuel Ortiz commit 6680d940b80dbb0617226c5b76b071a3977feb1c Author: Sundar Iyer Date: Fri Dec 24 11:52:08 2010 +0100 mfd/ab8500: remove spi support Since the Ab8500 v1.0, the SPI support is deprecated on the HW. Signed-off-by: Sundar Iyer Signed-off-by: Samuel Ortiz commit 1d83864cab272f764beb381bbd3837f91fc0abed Author: Mark Brown Date: Sat Dec 11 13:07:49 2010 +0000 mfd: Remove ARCH_U8500 dependency from AB8500 While it is vanishingly unlikely that the device will be deployed on other architectures removing the dependency facilitates build testing when doing generic work on both the MFD core for the device and the subsystem drivers. There appears to be no actual code dependency. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit b14375800751da9fcd63ec11d39a86077f214dc2 Author: Mark Brown Date: Mon Dec 20 12:28:11 2010 +0000 misc: Make AB8500_PWM driver depend on U8500 due to PWM breakage Since we don't have a PWM API every PWM driver ends up exporting its own version and we need to limit the platforms we try to build them on in order to avoid multiple definitions. As the AB8500 is normally a companion chip for the U8500 CPU depend on that architecture. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3ec33012dc07ab7e12fdd3f7f927c09264dcb5ec Author: Axel Lin Date: Mon Dec 20 10:02:06 2010 +0800 mfd: Add __devexit annotation for vx855_remove Signed-off-by: Axel Lin Acked-by: Harald Welte Signed-off-by: Samuel Ortiz commit c45c685c1a582e27787b5aa85844f2ee6986018c Author: Lennert Buytenhek Date: Mon Dec 13 13:31:18 2010 +0100 mfd: twl6030 irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Santosh Shilimkar Signed-off-by: Samuel Ortiz commit 1db0b427eec6f18477fa95aab8edf6176dffcea4 Author: Joe Perches Date: Mon Dec 20 11:28:40 2010 +0100 gpio: Fix cs5535 printk warnings drivers/gpio/cs5535-gpio.c: In function 'cs5535_gpio_probe': drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t' drivers/gpio/cs5535-gpio.c:269: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t' Use vsprintf extension %pR to format resource. Original-patch-by: Randy Dunlap Signed-off-by: Joe Perches Signed-off-by: Samuel Ortiz commit 7eb19812eead8d0faf30682b69970b36dc02e570 Author: Joe Perches Date: Mon Dec 20 11:26:19 2010 +0100 misc: Fix cs5535 printk warnings drivers/misc/cs5535-mfgpt.c: In function 'cs5535_mfgpt_probe': drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'resource_size_t' drivers/misc/cs5535-mfgpt.c:320: warning: format '%x' expects type 'unsigned int', but argument 4 has type 'resource_size_t' Use vsprintf extension %pR to format resource. Original-patch-by: Randy Dunlap Signed-off-by: Joe Perches Signed-off-by: Samuel Ortiz commit 25a947f805b4132b69f2561589e17a0fe45552b6 Author: Mark Brown Date: Sat Dec 11 13:21:21 2010 +0000 mfd: Convert Wolfson MFD drivers to use irq_data accessor function Actually makes the code larger rathe rthan smaller but does provide some isolation against core API changes. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 845aeab5f1e0ef1a85b618a1bf917520a62a9c02 Author: Mark Brown Date: Sun Dec 12 12:51:39 2010 +0000 mfd: Convert TWL4030 to new irq_ APIs The genirq core is being updated to pass struct irq_data to irq_chip operations. Update the TWL4030 driver to the new APIs. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 96e824bdf3349a7e581004286274be6c0df6c710 Author: Mark Brown Date: Sun Dec 12 12:39:28 2010 +0000 mfd: Convert tps6586x driver to new irq_ API The genirq core is being updated to supply struct irq_data to irq_chip operations rather than an irq number. Update the tps6586x driver to the new APIs. Signed-off-by: Mark Brown Acked-by: Mike Rapoport Signed-off-by: Samuel Ortiz commit 01af22eb15e46488cf3de67f6d2222c2eed5f763 Author: Mark Brown Date: Sun Dec 12 12:34:04 2010 +0000 mfd: Convert tc6393xb driver to new irq_ APIs The genirq core is being update to pass struct irq_data to irq_chip rather than an irq number to operations. Update tc6393 to the new API. Signed-off-by: Mark Brown Acked-by: Ian Molton Signed-off-by: Samuel Ortiz commit a4e7feadcc2aa5754f5ebfe67b9f07b5fddede51 Author: Mark Brown Date: Sun Dec 12 12:18:58 2010 +0000 mfd: Convert t7166xb driver to new irq_ API The genirq core is being updated to pass struct irq_data rather than an irq number to irq_chip operations. Update the t7166xb driver to the new APIs. Signed-off-by: Mark Brown Acked-by: Ian Molton Signed-off-by: Samuel Ortiz commit 43b8c08402de2fb85cd18ebc746b598ce2473664 Author: Mark Brown Date: Sun Dec 12 12:01:08 2010 +0000 mfd: Convert SMTPE driver to new irq_ APIs The genirq core is being updated to supply struct irq_data to irq_chip operations rather than an irq number. Update the SMTPE driver to the new APIs. Signed-off-by: Mark Brown Acked-by: Rabin Vincent Signed-off-by: Samuel Ortiz commit 2898577e160c7d60d2b11cb3b1c3b55d0e1468db Author: Mark Brown Date: Sat Dec 11 18:31:03 2010 +0000 mfd: Convert MAX8998 driver to irq_ API The genirq core is being updated to pass struct irq_data to interrupt operations, update the MAX8998 driver to the new API. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 98d9bc13cd19e544e8ea15b97f5cfef166cc9294 Author: Mark Brown Date: Sat Dec 11 18:20:55 2010 +0000 mfd: Convert max8925 to new irq_ API The genirq infrastructure is being converted to pass struct irq_data rather than an irq number to irq_chip operations, update max8925 to the new APIs. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 5af3bde8b264e78565b6d1963ba86bbf6c6b10f6 Author: Mark Brown Date: Sun Dec 12 20:08:30 2010 +0100 mfd: Convert jz4740-adc to new irq_ methods Convert the jz4740-adc driver to use the recently introduced IRQ API variants which are passed struct irq_data rather than an IRQ number. Signed-off-by: Mark Brown Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit e6a4c4a48a80ddfaa5abf59146e0beb5faa86fba Author: Mark Brown Date: Sat Dec 11 16:44:11 2010 +0000 mfd: Convert HTC I2C CPLD driver to irq_ API The genirq core is being converted to pass a struct irq_data to interrupt operations rather than an IRQ number. Signed-off-by: Mark Brown Acked-by: Cory Maccarrone Signed-off-by: Samuel Ortiz commit 949b9decaed059f25ed9639d3dbfe839972cf01b Author: Mark Brown Date: Sat Dec 11 16:43:59 2010 +0000 mfd: Convert HTC EGPIO driver to irq_ API The genirq core is being converted to pass a struct irq_data to interrupt operations rather than an IRQ number. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit c232f22fc6aac1797d0ca9beddddf0fea4beb7f3 Author: Lennert Buytenhek Date: Mon Dec 13 13:30:09 2010 +0100 mfd: Convert ezx-pcap to new irq_ methods Signed-off-by: Lennert Buytenhek Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 9505a0a0ac6160480eaab8d592dce6161e67e05d Author: Mark Brown Date: Sat Dec 11 13:16:08 2010 +0000 mfd: Convert AB8500 to new irq_ methods The genirq core is being converted to supply struct irq_data to chips rather than the interrupt number. Signed-off-by: Mark Brown Acked-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit c91ad349d084f8c034ff60fb56d41a9667f71ae4 Author: Mark Brown Date: Sat Dec 11 13:14:12 2010 +0000 mfd: Convert AB3500 to new irq_ APIs The genirq core is being updated to pass struct irq_data rather than irq numbers into chip drivers. As part of the update assignments to NULL for unused operations are removed, these are not needed and the genirq docs should be good enough. Signed-off-by: Mark Brown Acked-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit 0f76aaebe8015d6a850cb03622382bacb7860398 Author: Mark Brown Date: Sat Dec 11 13:08:57 2010 +0000 mfd: Convert ASIC3 to new irq_ APIs The interrupt controller APIs are being updated to pass a struct irq_data rather than the interrupt number. Signed-off-by: Mark Brown Acked-by: Ian Molton Signed-off-by: Samuel Ortiz commit 49f89d9acb6cba6475923e42a3d13540a70a926e Author: Mark Brown Date: Sat Dec 11 12:31:31 2010 +0000 mfd: Convert 88PM860x driver to new irq_ APIs The interrupt controller APIs are being updated to pass a struct irq_data rather than the interrupt number. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 8d2d3a3a329ebf20f733ac1499ebc565f497f051 Author: Mark Brown Date: Sat Dec 11 16:44:49 2010 +0000 mfd: Staticise internal functions in HTC I2CCPLD driver Most of these are GPIO operations, though a couple are just internal only functions. Signed-off-by: Mark Brown Acked-by: Cory Maccarrone Signed-off-by: Samuel Ortiz commit 87fff232cb76828b44312843d96854704f71ed19 Author: Mark Brown Date: Mon Dec 13 14:06:47 2010 +0000 mfd: Use NULL to initialise NULL pointers in ab8500-debugfs Partly for coding style reasons, but mostly because sparse warns on it. Signed-off-by: Mark Brown Acked-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit fe421425d78176f4a3509ce11b8d683cf1604e3a Author: Mark Brown Date: Sat Dec 11 13:00:34 2010 +0000 mfd: Correct ASIC3 IRQ_OWM resource setup We should specify both a start and an end for the IRQ range rather than initialise the start twice. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 59f2ad2e0ee13bbb4cfb399e08df8c54b264dd39 Author: Mark Brown Date: Sat Dec 11 12:59:35 2010 +0000 mfd: Staticise unexported symbols in ASIC3 There's no use of either of these outside of the driver so they can be declared static. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4d1cdbf696501c0a942c5b71f3fab9434a4465c4 Author: Stephen Warren Date: Thu Dec 9 10:30:11 2010 -0700 mfd: Remove tps6586x device ID check ... and convert it to a dev_info print at probe time. There are many variants of this chip with different values of VERSIONCRC. The set of values is large, and not useful to enumerate. All are SW compatible. The difference lies in default settings of the various power rails, and other similar differences. The driver, or clients of the driver, shouldn't be affected by this, since all rails should be programmed into the desired state in all cases for correct operation. Derived-from-code-by: Andrew Chew Signed-off-by: Stephen Warren Signed-off-by: Samuel Ortiz commit 5b9cecd68f3ef72ab9e586b0c2995a40a2f1e630 Author: Bryan Wu Date: Wed Dec 8 10:42:04 2010 +0800 mfd: Fix twl_probe section mismatch warning in mfd/twl-core.c Fix the following section mismatch warning when building omap2plus_defconfig: WARNING: vmlinux.o(.data+0x47d7c): Section mismatch in reference from the variable twl_driver to the function .init.text:twl_probe() Signed-off-by: Bryan Wu Signed-off-by: Paul Walmsley Signed-off-by: Samuel Ortiz commit e098aded79f24e2024139e82f778ff9db6dc142a Author: Mattias Wallin Date: Thu Dec 2 15:40:31 2010 +0100 mfd: ab8500-core ioresources irq for subdrivers added This patch adds the ioresources used by subdrivers to retrieve their interrupt. Signed-off-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit 4f079985b2caacfda5103dd85fb028a2848c84ab Author: Mattias Wallin Date: Thu Dec 2 15:10:27 2010 +0100 mfd: ab8500-core wake up from suspend This patch makes the system wake up from suspend when an ab8500 interrupt occur. This can for example be USB cable insert or an RTC alarm. Signed-off-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit cca69b67b3ba954ed8642583295b51933f902227 Author: Mattias Wallin Date: Thu Dec 2 15:09:36 2010 +0100 mfd: Export ab8500 chip id to sysfs This patch adds a file into sysfs for reading out chip id. It has been requested for modem silent reboot. Signed-off-by: Mattias Wallin Signed-off-by: Ludovic Barre Signed-off-by: Samuel Ortiz commit 6bce7bf1a1f8a79a57ff69910c115e1d2ed8913d Author: Mattias Wallin Date: Thu Dec 2 15:08:32 2010 +0100 mfd: ab8500-core improved error handling in get_chip_id We check for dev before dereferencing it. Signed-off-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit ec9d0cf578007fa3f86fa34d77d9ccba82f03b29 Author: Andres Salomon Date: Wed Dec 1 19:55:10 2010 -0800 gpio/misc: Add MODULE_ALIAS entries for CS5535 functions This adds MODULE_ALIAS entries to the various cs5535 subdevice modules; this allows the modules to automatically be loaded when cs5535-mfd loads. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 69bc6def395ebfdb137898179d7e559ba4c779d8 Author: Andres Salomon Date: Sat Oct 23 00:41:14 2010 -0700 misc: Convert cs5535-mfgpt from pci device to platform device The cs5535-mfd driver now takes care of the PCI BAR handling; this simplifies the mfgpt driver a bunch. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit df96669401cb8bac216f911f5bf92910357b29d3 Author: Andres Salomon Date: Sat Oct 23 00:41:09 2010 -0700 gpio: Convert cs5535 from pci device to platform device The cs5535-mfd driver now takes care of the PCI BAR handling; this simplifies the gpio driver a lot. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit 816b4580cef948c7d9ac9e3e63fb1b663012f057 Author: Andres Salomon Date: Tue Nov 30 13:54:39 2010 -0800 mfd: Fix cs5535 warning on x86-64 ARRAY_SIZE() returns size_t; use %zu instead of %d so that we don't get warnings on x86-64. Signed-off-by: Andres Salomon Acked-by: Randy Dunlap Signed-off-by: Samuel Ortiz commit d450f19eea0c3f64d60dc37655bae03b2455e5bb Author: Mark Brown Date: Fri Nov 26 17:19:35 2010 +0000 mfd: Implement runtime PM for WM8994 core driver Allow the WM8994 to completely power off, including disabling the LDOs if they are software controlled, when it goes idle. The CODEC subdevice controls activity for the MFD as a whole. If the GPIOs need to be used while the device is active runtime PM should be disabled for the device by machine specific code. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4c90aa94f6b3e33f57faaf19ef9819195dff61d3 Author: Mark Brown Date: Fri Nov 26 17:19:34 2010 +0000 mfd: Provide pm_runtime_no_callbacks flag in cell data Allow MFD cells to have pm_runtime_no_callbacks() called on them during registration. This causes the runtime PM framework to ignore them, allowing use of runtime PM to suspend the device as a whole even if not all drivers for the MFD can usefully implement runtime PM. For example, RTCs are likely to run continuously regardless of the power state of the system. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit d7b9f3220fd97522559316cdd72778f42ac4de04 Author: Mattias Wallin Date: Fri Nov 26 13:06:39 2010 +0100 mfd: Fix ab8500-debug indentation errors Replace spaces with proper tabs. Signed-off-by: Mattias Wallin Signed-off-by: Samuel Ortiz commit baa3f63b88c9138bb923a29a3d5fddc204d1f5e6 Author: Mark Brown Date: Wed Nov 24 18:01:44 2010 +0000 mfd: Convert WM8994 to new irq_ interrupt methods Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit fdcc475b968f4715ce7a214c061c97a95c77fd21 Author: Mark Brown Date: Wed Nov 24 18:01:43 2010 +0000 mfd: Convert WM835x to new irq_ interrupt methods Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit ba81cd393348b504ecc80d5fc363857f49410d5e Author: Mark Brown Date: Wed Nov 24 18:01:42 2010 +0000 mfd: Convert WM831x to new irq_ interrupt methods Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Convert over to these as they will become mandatory in future. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 412dc11d3fd01f96fdf4a8cbfbc5584a17dab7c8 Author: Mark Brown Date: Wed Nov 24 18:01:41 2010 +0000 mfd: Add WM8326 support The WM8326 is a high performance variant of the WM832x series with no software visible differences. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 798e6e321f807c46d81be1572118e031577ea9ab Author: Mark Brown Date: Wed Nov 24 18:01:40 2010 +0000 mfd: Simplify WM832x subdevice instantiation All the current WM832x devices have the same set of subdevices so can just use multiple case statements with a single body. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3f3d4310bdb083b9331239e1a1bb09e19f763115 Author: Joe Perches Date: Fri Nov 12 13:37:56 2010 -0800 mfd: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Samuel Ortiz commit f71e1afdd588ec60fd799b1e5a6f0b2e6cf9605e Author: Andres Salomon Date: Fri Nov 26 11:52:35 2010 +0100 mfd: Add cs5535-mfd driver for AMD Geode's CS5535/CS5536 support Add an MFD driver to handle the ISA device on CS5535 and CS5536 southbridges. This ISA bridge is actually multiple devices: GPIOs, MFGPTs, etc. Signed-off-by: Andres Salomon Signed-off-by: Samuel Ortiz commit e1b88eb0e08335d2f6c00b35b67b4ffc78fd46d6 Author: Uwe Kleine-König Date: Thu Nov 11 16:47:50 2010 +0100 mfd: Don't open-code mc13xxx_unlock Signed-off-by: Uwe Kleine-König Signed-off-by: Samuel Ortiz commit 77b22897da093e80c40f03e8d83bf23e756b9fba Author: Axel Lin Date: Wed Nov 10 15:49:41 2010 +0800 mfd: Include instead of As warned by checkpatch.pl, use #include instead of . Signed-off-by: Axel Lin Signed-off-by: Samuel Ortiz commit f77401d4da8180211b5fb5b7903ec8d8b22762ab Author: Axel Lin Date: Wed Nov 10 15:47:51 2010 +0800 mfd: Include instead of As warned by checkpatch.pl, use #include instead of Signed-off-by: Axel Lin Acked-by: Ben Dooks Signed-off-by: Samuel Ortiz commit e0084aa9e0ce157a5f53d9d39657a00d24dc6a66 Author: Joe Perches Date: Sat Oct 30 14:08:32 2010 -0700 mfd: Update WARN uses Remove KERN_. Signed-off-by: Joe Perches Signed-off-by: Samuel Ortiz commit af667a29dd3dfc0464f83bac30cc3c63fe5d0206 Author: Bruce Allan Date: Fri Dec 31 06:10:01 2010 +0000 e1000e: consistent use of Rx/Tx vs. RX/TX/rx/tx in comments/logs Some minor comment errors and whitespace issues discovered while looking into this are also addressed. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 0d6057e48b9d2004024e97252da83dce0661b131 Author: Bruce Allan Date: Tue Jan 4 01:16:44 2011 +0000 e1000e: update Copyright for 2011 Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 4c11b8adbc48bd21885fbc671df2f8ac04a75473 Author: Jesse Brandeburg Date: Thu Jan 13 07:48:13 2011 +0000 e1000: Avoid unhandled IRQ If hardware asserted an interrupt and driver is down, then there is nothing to do so return IRQ_HANDLED instead of IRQ_NONE. Returning IRQ_NONE in above situation causes screaming IRQ on virtual machines. CC: Andy Gospodarek Signed-off-by: Tushar Dave Signed-off-by: Jesse Brandeburg Tested-by: Signed-off-by: Jeff Kirsher commit 1591192d3a17adeebd03be0ce5888b88bddfaf89 Author: Chris Wilson Date: Fri Jan 14 09:46:38 2011 +0000 drm/i915: Disable GPU semaphores on SandyBridge mobile Hopefully, this is a temporary measure whilst the root cause is understood. At the moment, we experience a hard hang whilst looping urbanterror that has been identified as a result of the use of semaphores, but so far only on SNB mobile. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32752 Tested-by: mengmeng.meng@intel.com Signed-off-by: Chris Wilson commit 4fe2ca14678174d9df254ae3ba2b79bacc19e2ee Author: Takashi Iwai Date: Fri Jan 14 10:33:26 2011 +0100 ALSA: hda - More coverage for odd-number channels elimination for HDMI The commit ad09fc9d2156f3d37537b34418a6b79309013d33 didn't cover the case for Intel and Nvidia HDMIs, where hdmi_pcm_open() is called. Put the hw_constraint there, too. Signed-off-by: Takashi Iwai commit 639cef0eb6df05d5516520aa89b0c9fe62ee2d3b Author: Takashi Iwai Date: Fri Jan 14 10:30:46 2011 +0100 ALSA: hda - Store PCM parameters properly in HDMI open callback In hdmi_pcm_open(), the evaluated PCM hw parameters are stored in hinfo, but these aren't properly set back to the current runtime record since these have been set beforehand in azx_pcm_open(). This patch fixes the behavior. Signed-off-by: Takashi Iwai commit b9214b9780d6897a6892e7c8cc903168d6fef097 Author: Sascha Hauer Date: Thu Jan 13 16:59:25 2011 +0100 ARM mxs: clkdev related compile fixes Since commit 6d803ba (ARM: 6483/1: arm & sh: factorised duplicated clkdev.c) platforms need to select CLKDEV_LOOKUP instead of COMMON_CLKDEV and need to include . Cc: Shawn Guo Cc: Lothar Waßmann Signed-off-by: Uwe Kleine-König Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer commit 4d2692a736c95240100755ba98b2403e11f12e06 Author: Nicolas Pitre Date: Fri Jan 14 07:33:24 2011 +0100 ARM: 6624/1: fix dependency for CONFIG_SMP_ON_UP This depends on !XIP_KERNEL and not !XIP. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 874d5d3ccc04c0659b76b05ee0c761f568062cb1 Author: Dave Martin Date: Fri Jan 14 00:43:01 2011 +0100 ARM: 6623/1: Thumb-2: Fix out-of-range offset for Thumb-2 in proc-v7.S Commit d30e45e (ARM: pgtable: switch order of Linux vs hardware page tables) introduced a pre-increment addressing offset which is out of range for Thumb-2. Thumb-2 only permits offsets <256. So split the intruction in two for Thumb-2. Signed-off-by: Dave Martin Signed-off-by: Russell King commit 361fe6e90888af83d5bfdfc152d737018cbede43 Author: Takashi Iwai Date: Fri Jan 14 09:55:32 2011 +0100 ALSA: hda - Rearrange fixup struct in patch_realtek.c Signed-off-by: Takashi Iwai commit f8fe80e4383bf5f542beb80bf2abe9fc1505c366 Author: Clemens Ladisch Date: Fri Jan 14 08:07:50 2011 +0100 ALSA: oxygen: Xonar DG: fix CS4245 register writes Accidentally exchanging register addresses and register values leads to many strange errors ... Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit c97b73939a3ed8618ad1baf3be4c8f5d11426de6 Author: Sascha Hauer Date: Fri Jan 14 09:44:02 2011 +0100 ARM i.MX mx31_3ds: Fix MC13783 regulator names Signed-off-by: Sascha Hauer commit 3ec762ad8be364c2fadfe0d6b2cc6d4d3b5e1b54 Author: Li Zefan Date: Fri Jan 14 11:34:34 2011 +0800 cgroups: Fix a lockdep warning at cgroup removal Commit 2fd6b7f5 ("fs: dcache scale subdirs") forgot to annotate a dentry lock, which caused a lockdep warning. Reported-by: Valdis Kletnieks Signed-off-by: Li Zefan commit 7b9337aaf98f9941d0927a75217d3ff31afec609 Author: Nick Piggin Date: Fri Jan 14 08:42:43 2011 +0000 fs: namei fix ->put_link on wrong inode in do_filp_open J. R. Okajima noticed that ->put_link is being attempted on the wrong inode, and suggested the way to fix it. I changed it a bit according to Al's suggestion to keep an explicit link path around. Signed-off-by: Nick Piggin commit ad09fc9d2156f3d37537b34418a6b79309013d33 Author: Takashi Iwai Date: Fri Jan 14 09:42:27 2011 +0100 ALSA: hda - Suppress the odd number of channels for HDMI It looks like that HDMI codecs don't support the odd number of channels although HD-audio spec doesn't have the restriction. Add the hw_constraint to limit to only the even number of channels. Signed-off-by: Takashi Iwai commit 5f35765d836befebdfabf745fdbf2e070c887fac Author: Abhilash Kesavan Date: Wed Jan 12 15:00:23 2011 +0900 spi: Enable SPI driver for S5P6440 and S5P6450 This patch enables the existing S3C64XX series SPI driver for S5P64X0 and removed dependency on EXPERIMENTAL because we don't need it now. v3: Changed dependency of S3C64XX_DMA v2: Removed dependency on EXPERIMENTAL Signed-off-by: Abhilash Kesavan Signed-off-by: Sangbeom Kim Acked-by: Jassi Brar Signed-off-by: Kukjin Kim Signed-off-by: Grant Likely commit c553f8e335c00a7cff3ab3f13e793b13d3f2207f Author: Shaohua Li Date: Fri Jan 14 08:41:03 2011 +0100 block cfq: compensate preempted queue even if it has no slice assigned If a queue is preempted before it gets slice assigned, the queue doesn't get compensation, which looks unfair. For such queue, we compensate it for a whole slice. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit f8ae6e3eb8251be32c6e913393d9f8d9e0609489 Author: Shaohua Li Date: Fri Jan 14 08:41:02 2011 +0100 block cfq: make queue preempt work for queues from different workload I got this: fio-874 [007] 2157.724514: 8,32 m N cfq874 preempt fio-874 [007] 2157.724519: 8,32 m N cfq830 slice expired t=1 fio-874 [007] 2157.724520: 8,32 m N cfq830 sl_used=1 disp=0 charge=1 iops=0 sect=0 fio-874 [007] 2157.724521: 8,32 m N cfq830 set_active wl_prio:0 wl_type:0 fio-874 [007] 2157.724522: 8,32 m N cfq830 Not idling. st->count:1 cfq830 is an async queue, and preempted by a sync queue cfq874. But since we have cfqg->saved_workload_slice mechanism, the preempt is a nop. Looks currently our preempt is totally broken if the two queues are not from the same workload type. Below patch fixes it. This will might make async queue starvation, but it's what our old code does before cgroup is added. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit c289ef41431144a538b5fb5f94fc83c81b3020e2 Author: Rob Herring Date: Tue Nov 16 14:33:52 2010 -0600 mmc: sdhci-of: fix build on non-powerpc platforms Explicitly include err.h, of_address.h and of_irq.h. Make use of machine_is() conditional on PPC. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit f1e02ed109df5f99abf942b8ccc99960cb09dd38 Author: françois romieu Date: Thu Jan 13 13:07:53 2011 +0000 r8169: keep firmware in memory. The firmware agent is not available during resume. Loading the firmware during open() (see eee3a96c6368f47df8df5bd4ed1843600652b337) is not enough. close() is run during resume through rtl8169_reset_task(), whence the mildly natural release of firmware in the driver removal method instead. It will help with http://bugs.debian.org/609538. It will not avoid the 60 seconds delay when: - there is no firmware - the driver is loaded and the device is not up before a suspend/resume Signed-off-by: Francois Romieu Tested-by: Jarek Kamiński Cc: Hayes Cc: Ben Hutchings Signed-off-by: David S. Miller commit d0f49157d1ce02671a450b566a12ff19baed6c19 Author: Tobias Klauser Date: Wed Jan 12 22:15:08 2011 +0000 netdev: tilepro: Use is_unicast_ether_addr helper Use is_unicast_ether_addr from linux/etherdevice.h instead of custom macros. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 51e7eed79c41180919ff94942895ba38467d9ad4 Author: Tobias Klauser Date: Wed Jan 12 22:14:56 2011 +0000 etherdevice.h: Add is_unicast_ether_addr function From a check for !is_multicast_ether_addr it is not always obvious that we're checking for a unicast address. So add this helper function to make those code paths easier to read. Signed-off-by: Tobias Klauser Acked-by: Chris Metcalf Signed-off-by: David S. Miller commit 5cd8a77df3e9916069787365a32918caa371fc16 Author: Ben Hutchings Date: Thu Jan 13 07:52:51 2011 +0000 ks8695net: Use default implementation of ethtool_ops::get_link This is completely untested as I don't have an ARM build environment. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit c3d2a7309c95021f143c94a16ea9becc0c9b9d23 Author: Ben Hutchings Date: Thu Jan 13 07:50:14 2011 +0000 ks8695net: Disable non-working ethtool operations Some ethtool operations can only be implemented for the WAN port, and not all such operations are allowed to return an error code such as -EOPNOTSUPP. Therefore, define two separate ethtool_ops structures for WAN and non-WAN ports; simplify and rename the WAN-only functions. This is completely untested as I don't have an ARM build environment. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 9e56790ad31d72a5a44142af462d047c0c897b29 Author: Jesper Juhl Date: Thu Jan 13 11:40:11 2011 +0000 USB CDC NCM: Don't deref NULL in cdc_ncm_rx_fixup() and don't use uninitialized variable. skb_clone() dynamically allocates memory and may fail. If it does it returns NULL. This means we'll dereference a NULL pointer in drivers/net/usb/cdc_ncm.c::cdc_ncm_rx_fixup(). As far as I can tell, the proper way to deal with this is simply to goto the error label. Furthermore gcc complains that 'skb' may be used uninitialized: drivers/net/usb/cdc_ncm.c: In function ‘cdc_ncm_rx_fixup’: drivers/net/usb/cdc_ncm.c:922:18: warning: ‘skb’ may be used uninitialized in this function and I believe it is right. On the line where we pr_debug("invalid frame detected (ignored)" ... we are using the local variable 'skb' but nothing has ever been assigned to that variable yet. I believe the correct fix for that is to use 'skb_in' instead. Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit e84f885ebfb43b1ebb1481ee8bb2018743f947e9 Author: Jesper Juhl Date: Thu Jan 13 10:25:20 2011 +0000 vxge: Remember to release firmware after upgrading firmware Regardless of whether the firmware update being performed by vxge_fw_upgrade() is a success or not we must still remember to always release_firmware() before returning. Signed-off-by: Jesper Juhl Acked-by: Ram Vepa Signed-off-by: David S. Miller commit f767b6df8a796f901b2bd595ae22234636be4124 Author: Joe Perches Date: Wed Jan 12 18:08:04 2011 +0000 netdev: bfin_mac: Remove is_multicast_ether_addr use in netdev_for_each_mc_addr Remove code that has no effect. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 78d07369462e9feeaa5db301b0aa70e9dcb40b48 Author: Nicolas Dichtel Date: Thu Jan 13 11:51:03 2011 +0000 ipsec: update MAX_AH_AUTH_LEN to support sha512 icv_truncbits is set to 256 for sha512, so update MAX_AH_AUTH_LEN to 64. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit 1ac9ad1394fa542ac7ae0dc943ee3cda678799fa Author: Eric Dumazet Date: Wed Jan 12 12:13:14 2011 +0000 net: remove dev_txq_stats_fold() After recent changes, (percpu stats on vlan/tunnels...), we dont need anymore per struct netdev_queue tx_bytes/tx_packets/tx_dropped counters. Only remaining users are ixgbe, sch_teql, gianfar & macvlan : 1) ixgbe can be converted to use existing tx_ring counters. 2) macvlan incremented txq->tx_dropped, it can use the dev->stats.tx_dropped counter. 3) sch_teql : almost revert ab35cd4b8f42 (Use net_device internal stats) Now we have ndo_get_stats64(), use it, even for "unsigned long" fields (No need to bring back a struct net_device_stats) 4) gianfar adds a stats structure per tx queue to hold tx_bytes/tx_packets This removes a lockdep warning (and possible lockup) in rndis gadget, calling dev_get_stats() from hard IRQ context. Ref: http://www.spinics.net/lists/netdev/msg149202.html Reported-by: Neil Jones Signed-off-by: Eric Dumazet CC: Jarek Poplawski CC: Alexander Duyck CC: Jeff Kirsher CC: Sandeep Gopalpet CC: Michal Nazarewicz Signed-off-by: David S. Miller commit 52cfd503ad7176d23a5dd7af3981744feb60622f Merge: dc8e7e3 4263d9a Author: Linus Torvalds Date: Thu Jan 13 20:15:35 2011 -0800 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: (59 commits) ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework ACPI: fix resource check message ACPI / Battery: Update information on info notification and resume ACPI: Drop device flag wake_capable ACPI: Always check if _PRW is present before trying to evaluate it ACPI / PM: Check status of power resources under mutexes ACPI / PM: Rename acpi_power_off_device() ACPI / PM: Drop acpi_power_nocheck ACPI / PM: Drop acpi_bus_get_power() Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() ACPI / Fan: Rework the handling of power resources ACPI / PM: Register power resource devices as soon as they are needed ACPI / PM: Register acpi_power_driver early ACPI / PM: Add function for updating device power state consistently ACPI / PM: Add function for device power state initialization ACPI / PM: Introduce __acpi_bus_get_power() ACPI / PM: Introduce function for refcounting device power resources ACPI / PM: Add functions for manipulating lists of power resources ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes ACPICA: Update version to 20101209 ... commit dc8e7e3ec60bd5ef7868aa88755e9d4c948dc5cc Merge: 2c79c69 4395288 Author: Linus Torvalds Date: Thu Jan 13 20:15:18 2011 -0800 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: cpuidle/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer intel_idle: open broadcast clock event cpuidle: CPUIDLE_FLAG_CHECK_BM is omap3_idle specific cpuidle: CPUIDLE_FLAG_TLB_FLUSHED is specific to intel_idle cpuidle: delete unused CPUIDLE_FLAG_SHALLOW, BALANCED, DEEP definitions SH, cpuidle: delete use of NOP CPUIDLE_FLAGS_SHALLOW cpuidle: delete NOP CPUIDLE_FLAG_POLL ACPI: processor_idle: delete use of NOP CPUIDLE_FLAGs cpuidle: Rename X86 specific idle poll state[0] from C0 to POLL ACPI, intel_idle: Cleanup idle= internal variables cpuidle: Make cpuidle_enable_device() call poll_idle_init() intel_idle: update Sandy Bridge core C-state residency targets commit 2c79c69adc6205fd115e4b1980c979e1e0e1828a Merge: db9effe 5b026c4 Author: Linus Torvalds Date: Thu Jan 13 20:15:02 2011 -0800 Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 * 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6: SFI: use ioremap_cache() instead of ioremap() commit db9effe99adc67c53e6aedadadd2aa9a02342e48 Merge: 9c4bc1c f20877d Author: Linus Torvalds Date: Thu Jan 13 20:14:13 2011 -0800 Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin * 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: fs: fix do_last error case when need_reval_dot nfs: add missing rcu-walk check fs: hlist UP debug fixup fs: fix dropping of rcu-walk from force_reval_path fs: force_reval_path drop rcu-walk before d_invalidate fs: small rcu-walk documentation fixes Fixed up trivial conflicts in Documentation/filesystems/porting commit f20877d94a74557b7c28b4ed8920d834c31e0ea5 Author: J. R. Okajima Date: Fri Jan 14 03:56:04 2011 +0000 fs: fix do_last error case when need_reval_dot When open(2) without O_DIRECTORY opens an existing dir, it should return EISDIR. In do_last(), the variable 'error' is initialized EISDIR, but it is changed by d_revalidate() which returns any positive to represent 'the target dir is valid.' Should we keep and return the initialized 'error' in this case. Signed-off-by: Nick Piggin commit 657e94b673a805b427903c5628e95348235fad06 Author: Nick Piggin Date: Fri Jan 14 02:48:39 2011 +0000 nfs: add missing rcu-walk check Signed-off-by: Nick Piggin commit 9c4bc1c2befbbdce4b9fd526e67a7a2ea143ffa2 Merge: 2c0076d e1b478e Author: Linus Torvalds Date: Thu Jan 13 18:46:48 2011 -0800 Merge branch 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/gntdev' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/p2m: Fix module linking error. xen p2m: clear the old pte when adding a page to m2p_override xen gntdev: use gnttab_map_refs and gnttab_unmap_refs xen: introduce gnttab_map_refs and gnttab_unmap_refs xen p2m: transparently change the p2m mappings in the m2p override xen/gntdev: Fix circular locking dependency xen/gntdev: stop using "token" argument xen: gntdev: move use of GNTMAP_contains_pte next to the map_op xen: add m2p override mechanism xen: move p2m handling to separate file xen/gntdev: add VM_PFNMAP to vma xen/gntdev: allow usermode to map granted pages xen: define gnttab_set_map_op/unmap_op Fix up trivial conflict in drivers/xen/Kconfig commit 2c0076d8c7eb1dafa03d0a792444862080b34106 Merge: 50de1dd e528db5 Author: Linus Torvalds Date: Thu Jan 13 18:44:52 2011 -0800 Merge branch 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/platform-pci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen-platform: Fix compile errors if CONFIG_PCI is not enabled. xen: rename platform-pci module to xen-platform-pci. xen-platform: use PCI interfaces to request IO and MEM resources. commit 2c6755988afc003a0332406a134fb6a1626f9b28 Author: Nick Piggin Date: Fri Jan 14 02:36:43 2011 +0000 fs: hlist UP debug fixup Po-Yu Chuang noticed that hlist_bl_set_first could crash on a UP system when LIST_BL_LOCKMASK is 0, because LIST_BL_BUG_ON(!((unsigned long)h->first & LIST_BL_LOCKMASK)); always evaulates to true. Fix the expression, and also avoid a dependency between bit spinlock implementation and list bl code (list code shouldn't know anything except that bit 0 is set when adding and removing elements). Eventually if a good use case comes up, we might use this list to store 1 or more arbitrary bits of data, so it really shouldn't be tied to locking either, but for now they are helpful for debugging. Signed-off-by: Nick Piggin commit 90dbb77ba48dddb87445d238e84cd137cf97dd98 Author: Nick Piggin Date: Fri Jan 14 02:36:19 2011 +0000 fs: fix dropping of rcu-walk from force_reval_path As J. R. Okajima noted, force_reval_path passes in the same dentry to d_revalidate as the one in the nameidata structure (other callers pass in a child), so the locking breaks. This can oops with a chrooted nfs mount, for example. Similarly there can be other problems with revalidating a dentry which is already in nameidata of the path walk. Signed-off-by: Nick Piggin commit bb20c18db6fbb5e6ba499c76473a487d35073467 Author: Nick Piggin Date: Fri Jan 14 02:35:53 2011 +0000 fs: force_reval_path drop rcu-walk before d_invalidate d_revalidate can return in rcu-walk mode even when it returns 0. We can't just call any old dcache function on rcu-walk dentry (the dentry is unstable, so even through d_lock can safely be taken, the result may no longer be what we expect -- careful re-checks would be required). So just drop rcu in this case. (I missed this conversion when switching to the rcu-walk convention that Linus suggested) Signed-off-by: Nick Piggin commit a82416da83722944d78d933301e32e7c5ad70edd Author: Nick Piggin Date: Fri Jan 14 02:26:53 2011 +0000 fs: small rcu-walk documentation fixes Signed-off-by: Nick Piggin commit 4795bb37effb7b8fe77e2d2034545d062d3788a8 Author: J. Bruce Fields Date: Tue Jan 11 13:55:46 2011 -0500 nfsd: break lease on unlink, link, and rename Any change to any of the links pointing to an entry should also break delegations. Signed-off-by: J. Bruce Fields commit 6a76bebefe15d9a08864f824d7f8d5beaf37c997 Author: J. Bruce Fields Date: Tue Jan 11 12:54:39 2011 -0500 nfsd4: break lease on nfsd setattr Leases (delegations) should really be broken on any metadata change, not just on size change. Signed-off-by: J. Bruce Fields commit 9ce137eee4febaabca81143be07d4205d2bd52d4 Author: J. Bruce Fields Date: Tue Jan 11 14:07:12 2011 -0500 nfsd: don't support msnfs export option We've long had these pointless #ifdef MSNFS's sprinkled throughout the code--pointless because MSNFS is always defined (and we give no config option to make that easy to change). So we could just remove the ifdef's and compile the resulting code unconditionally. But as long as we're there: why not just rip out this code entirely? The only purpose is to implement the "msnfs" export option which turns on Windows-like behavior in some cases, and: - the export option isn't documented anywhere; - the userland utilities (which would need to be able to parse "msnfs" in an export file) don't support it; - I don't know how to maintain this, as I don't know what the proper behavior is; and - google shows no evidence that anyone has ever used this. Signed-off-by: J. Bruce Fields commit 9ee1ba5402e9d35fb35f8e61c968f4987b5fb443 Author: J. Bruce Fields Date: Thu Jan 13 17:08:19 2011 -0500 nfsd4: initialize cb_per_client Otherwise a callback that is aborted before it runs will result in a list_del on an uninitialized list head. Signed-off-by: J. Bruce Fields commit 50de1dd967d4ba3b8a90ebe7a4f5feca24191317 Author: Daisuke Nishimura Date: Thu Jan 13 15:47:43 2011 -0800 memcg: fix memory migration of shmem swapcache In the current implementation mem_cgroup_end_migration() decides whether the page migration has succeeded or not by checking "oldpage->mapping". But if we are tring to migrate a shmem swapcache, the page->mapping of it is NULL from the begining, so the check would be invalid. As a result, mem_cgroup_end_migration() assumes the migration has succeeded even if it's not, so "newpage" would be freed while it's not uncharged. This patch fixes it by passing mem_cgroup_end_migration() the result of the page migration. Signed-off-by: Daisuke Nishimura Reviewed-by: Minchan Kim Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: Minchan Kim Reviewed-by: Johannes Weiner Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17295c88a160c6eea3fcf46cec9d08a0fcb02db9 Author: Jesper Juhl Date: Thu Jan 13 15:47:42 2011 -0800 memcg: use [kv]zalloc[_node] rather than [kv]malloc+memset In mem_cgroup_alloc() we currently do either kmalloc() or vmalloc() then followed by memset() to zero the memory. This can be more efficiently achieved by using kzalloc() and vzalloc(). There's also one situation where we can use kzalloc_node() - this is what's new in this version of the patch. Signed-off-by: Jesper Juhl Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Wu Fengguang Cc: Balbir Singh Cc: Li Zefan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfe076b0971a783469bc2066e85d46e23c8acb1c Author: Daisuke Nishimura Date: Thu Jan 13 15:47:41 2011 -0800 memcg: fix deadlock between cpuset and memcg Commit b1dd693e ("memcg: avoid deadlock between move charge and try_charge()") can cause another deadlock about mmap_sem on task migration if cpuset and memcg are mounted onto the same mount point. After the commit, cgroup_attach_task() has sequence like: cgroup_attach_task() ss->can_attach() cpuset_can_attach() mem_cgroup_can_attach() down_read(&mmap_sem) (1) ss->attach() cpuset_attach() mpol_rebind_mm() down_write(&mmap_sem) (2) up_write(&mmap_sem) cpuset_migrate_mm() do_migrate_pages() down_read(&mmap_sem) up_read(&mmap_sem) mem_cgroup_move_task() mem_cgroup_clear_mc() up_read(&mmap_sem) We can cause deadlock at (2) because we've already aquire the mmap_sem at (1). But the commit itself is necessary to fix deadlocks which have existed before the commit like: Ex.1) move charge | try charge --------------------------------------+------------------------------ mem_cgroup_can_attach() | down_write(&mmap_sem) mc.moving_task = current | .. mem_cgroup_precharge_mc() | __mem_cgroup_try_charge() mem_cgroup_count_precharge() | prepare_to_wait() down_read(&mmap_sem) | if (mc.moving_task) -> cannot aquire the lock | -> true | schedule() | -> move charge should wake it up Ex.2) move charge | try charge --------------------------------------+------------------------------ mem_cgroup_can_attach() | mc.moving_task = current | mem_cgroup_precharge_mc() | mem_cgroup_count_precharge() | down_read(&mmap_sem) | .. | up_read(&mmap_sem) | | down_write(&mmap_sem) mem_cgroup_move_task() | .. mem_cgroup_move_charge() | __mem_cgroup_try_charge() down_read(&mmap_sem) | prepare_to_wait() -> cannot aquire the lock | if (mc.moving_task) | -> true | schedule() | -> move charge should wake it up This patch fixes all of these problems by: 1. revert the commit. 2. To fix the Ex.1, we set mc.moving_task after mem_cgroup_count_precharge() has released the mmap_sem. 3. To fix the Ex.2, we use down_read_trylock() instead of down_read() in mem_cgroup_move_charge() and, if it has failed to aquire the lock, cancel all extra charges, wake up all waiters, and retry trylock. Signed-off-by: Daisuke Nishimura Reported-by: Ben Blum Cc: Miao Xie Cc: David Rientjes Cc: Paul Menage Cc: Hiroyuki Kamezawa Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 043d18b1e5bdfc4870b8a19d00f0d5c636a5c231 Author: Minchan Kim Date: Thu Jan 13 15:47:40 2011 -0800 memcg: remove unnecessary return from void-returning mem_cgroup_del_lru_list() Signed-off-by: Minchan Kim Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3e8eb70b1807d1b30aa6972af0cf30077c40112 Author: Johannes Weiner Date: Thu Jan 13 15:47:39 2011 -0800 memcg: fix unit mismatch in memcg oom limit calculation Adding the number of swap pages to the byte limit of a memory control group makes no sense. Convert the pages to bytes before adding them. The only user of this code is the OOM killer, and the way it is used means that the error results in a higher OOM badness value. Since the cgroup limit is the same for all tasks in the cgroup, the error should have no practical impact at the moment. But let's not wait for future or changing users to trip over it. Signed-off-by: Johannes Weiner Cc: Greg Thelen Cc: David Rientjes Acked-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbd4ea78f002df283c95d9774837041735fa1bf9 Author: KAMEZAWA Hiroyuki Date: Thu Jan 13 15:47:38 2011 -0800 memcg: add lock to synchronize page accounting and migration Introduce a new bit spin lock, PCG_MOVE_LOCK, to synchronize the page accounting and migration code. This reworks the locking scheme of _update_stat() and _move_account() by adding new lock bit PCG_MOVE_LOCK, which is always taken under IRQ disable. 1. If pages are being migrated from a memcg, then updates to that memcg page statistics are protected by grabbing PCG_MOVE_LOCK using move_lock_page_cgroup(). In an upcoming commit, memcg dirty page accounting will be updating memcg page accounting (specifically: num writeback pages) from IRQ context (softirq). Avoid a deadlocking nested spin lock attempt by disabling irq on the local processor when grabbing the PCG_MOVE_LOCK. 2. lock for update_page_stat is used only for avoiding race with move_account(). So, IRQ awareness of lock_page_cgroup() itself is not a problem. The problem is between mem_cgroup_update_page_stat() and mem_cgroup_move_account_page(). Trade-off: * Changing lock_page_cgroup() to always disable IRQ (or local_bh) has some impacts on performance and I think it's bad to disable IRQ when it's not necessary. * adding a new lock makes move_account() slower. Score is here. Performance Impact: moving a 8G anon process. Before: real 0m0.792s user 0m0.000s sys 0m0.780s After: real 0m0.854s user 0m0.000s sys 0m0.842s This score is bad but planned patches for optimization can reduce this impact. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Greg Thelen Reviewed-by: Minchan Kim Acked-by: Daisuke Nishimura Cc: Andrea Righi Cc: Balbir Singh Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7106f2cb0768d00fe8c1eb42a754a7d8518f08 Author: Greg Thelen Date: Thu Jan 13 15:47:37 2011 -0800 memcg: create extensible page stat update routines Replace usage of the mem_cgroup_update_file_mapped() memcg statistic update routine with two new routines: * mem_cgroup_inc_page_stat() * mem_cgroup_dec_page_stat() As before, only the file_mapped statistic is managed. However, these more general interfaces allow for new statistics to be more easily added. New statistics are added with memcg dirty page accounting. Signed-off-by: Greg Thelen Signed-off-by: Andrea Righi Acked-by: KAMEZAWA Hiroyuki Acked-by: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ece72400c2a27a3d726cb0854449f991d9fcd2da Author: Greg Thelen Date: Thu Jan 13 15:47:36 2011 -0800 memcg: document cgroup dirty memory interfaces Document cgroup dirty memory interfaces and statistics. [akpm@linux-foundation.org: fix use_hierarchy description] Signed-off-by: Andrea Righi Signed-off-by: Greg Thelen Cc: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db16d5ec1f87f17511599bc77857dd1662b5a22f Author: Greg Thelen Date: Thu Jan 13 15:47:35 2011 -0800 memcg: add page_cgroup flags for dirty page tracking This patchset provides the ability for each cgroup to have independent dirty page limits. Limiting dirty memory is like fixing the max amount of dirty (hard to reclaim) page cache used by a cgroup. So, in case of multiple cgroup writers, they will not be able to consume more than their designated share of dirty pages and will be forced to perform write-out if they cross that limit. The patches are based on a series proposed by Andrea Righi in Mar 2010. Overview: - Add page_cgroup flags to record when pages are dirty, in writeback, or nfs unstable. - Extend mem_cgroup to record the total number of pages in each of the interesting dirty states (dirty, writeback, unstable_nfs). - Add dirty parameters similar to the system-wide /proc/sys/vm/dirty_* limits to mem_cgroup. The mem_cgroup dirty parameters are accessible via cgroupfs control files. - Consider both system and per-memcg dirty limits in page writeback when deciding to queue background writeback or block for foreground writeback. Known shortcomings: - When a cgroup dirty limit is exceeded, then bdi writeback is employed to writeback dirty inodes. Bdi writeback considers inodes from any cgroup, not just inodes contributing dirty pages to the cgroup exceeding its limit. - When memory.use_hierarchy is set, then dirty limits are disabled. This is a implementation detail. An enhanced implementation is needed to check the chain of parents to ensure that no dirty limit is exceeded. Performance data: - A page fault microbenchmark workload was used to measure performance, which can be called in read or write mode: f = open(foo. $cpu) truncate(f, 4096) alarm(60) while (1) { p = mmap(f, 4096) if (write) *p = 1 else x = *p munmap(p) } - The workload was called for several points in the patch series in different modes: - s_read is a single threaded reader - s_write is a single threaded writer - p_read is a 16 thread reader, each operating on a different file - p_write is a 16 thread writer, each operating on a different file - Measurements were collected on a 16 core non-numa system using "perf stat --repeat 3". The -a option was used for parallel (p_*) runs. - All numbers are page fault rate (M/sec). Higher is better. - To compare the performance of a kernel without non-memcg compare the first and last rows, neither has memcg configured. The first row does not include any of these memcg patches. - To compare the performance of using memcg dirty limits, compare the baseline (2nd row titled "w/ memcg") with the the code and memcg enabled (2nd to last row titled "all patches"). root_cgroup child_cgroup s_read s_write p_read p_write s_read s_write p_read p_write mmotm w/o memcg 0.428 0.390 0.429 0.388 mmotm w/ memcg 0.411 0.378 0.391 0.362 0.412 0.377 0.385 0.363 all patches 0.384 0.360 0.370 0.348 0.381 0.363 0.368 0.347 all patches 0.431 0.402 0.427 0.395 w/o memcg This patch: Add additional flags to page_cgroup to track dirty pages within a mem_cgroup. Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrea Righi Signed-off-by: Greg Thelen Acked-by: Daisuke Nishimura Cc: Balbir Singh Cc: Minchan Kim Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 744ed1442757767ffede5008bb13e0805085902e Author: Shaohua Li Date: Thu Jan 13 15:47:34 2011 -0800 mm: batch activate_page() to reduce lock contention The zone->lru_lock is heavily contented in workload where activate_page() is frequently used. We could do batch activate_page() to reduce the lock contention. The batched pages will be added into zone list when the pool is full or page reclaim is trying to drain them. For example, in a 4 socket 64 CPU system, create a sparse file and 64 processes, processes shared map to the file. Each process read access the whole file and then exit. The process exit will do unmap_vmas() and cause a lot of activate_page() call. In such workload, we saw about 58% total time reduction with below patch. Other workloads with a lot of activate_page also benefits a lot too. I tested some microbenchmarks: case-anon-cow-rand-mt 0.58% case-anon-cow-rand -3.30% case-anon-cow-seq-mt -0.51% case-anon-cow-seq -5.68% case-anon-r-rand-mt 0.23% case-anon-r-rand 0.81% case-anon-r-seq-mt -0.71% case-anon-r-seq -1.99% case-anon-rx-rand-mt 2.11% case-anon-rx-seq-mt 3.46% case-anon-w-rand-mt -0.03% case-anon-w-rand -0.50% case-anon-w-seq-mt -1.08% case-anon-w-seq -0.12% case-anon-wx-rand-mt -5.02% case-anon-wx-seq-mt -1.43% case-fork 1.65% case-fork-sleep -0.07% case-fork-withmem 1.39% case-hugetlb -0.59% case-lru-file-mmap-read-mt -0.54% case-lru-file-mmap-read 0.61% case-lru-file-mmap-read-rand -2.24% case-lru-file-readonce -0.64% case-lru-file-readtwice -11.69% case-lru-memcg -1.35% case-mmap-pread-rand-mt 1.88% case-mmap-pread-rand -15.26% case-mmap-pread-seq-mt 0.89% case-mmap-pread-seq -69.72% case-mmap-xread-rand-mt 0.71% case-mmap-xread-seq-mt 0.38% The most significent are: case-lru-file-readtwice -11.69% case-mmap-pread-rand -15.26% case-mmap-pread-seq -69.72% which use activate_page a lot. others are basically variations because each run has slightly difference. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Shaohua Li Cc: Andi Kleen Cc: Minchan Kim Cc: KOSAKI Motohiro Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8505dee1a87b8d41b9c4ee1325cd72258226fbc Author: Shaohua Li Date: Thu Jan 13 15:47:33 2011 -0800 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: Andi Kleen Cc: Minchan Kim Cc: KOSAKI Motohiro Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c06b1fca18c3ad868bfcaca230146e3038583422 Author: Andrew Morton Date: Thu Jan 13 15:47:32 2011 -0800 mm/page_alloc.c: don't cache `current' in a local It's old-fashioned and unneeded. akpm:/usr/src/25> size mm/page_alloc.o text data bss dec hex filename 39884 1241317 18808 1300009 13d629 mm/page_alloc.o (before) 39838 1241317 18808 1299963 13d5fb mm/page_alloc.o (after) Acked-by: David Rientjes Acked-by: Mel Gorman Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd4a4663db293bfd5dc20fb4113977f62895e550 Author: Hugh Dickins Date: Thu Jan 13 15:47:31 2011 -0800 mm: fix hugepage migration 2.6.37 added an unmap_and_move_huge_page() for memory failure recovery, but its anon_vma handling was still based around the 2.6.35 conventions. Update it to use page_lock_anon_vma, get_anon_vma, page_unlock_anon_vma, drop_anon_vma in the same way as we're now changing unmap_and_move(). I don't particularly like to propose this for stable when I've not seen its problems in practice nor tested the solution: but it's clearly out of synch at present. Signed-off-by: Hugh Dickins Cc: Mel Gorman Cc: Rik van Riel Cc: Naoya Horiguchi Cc: "Jun'ichi Nomura" Cc: Andi Kleen Cc: [2.6.37, 2.6.36] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ce82b69e96c838d007f316b8347b911fdfa9842 Author: Hugh Dickins Date: Thu Jan 13 15:47:30 2011 -0800 mm: fix migration hangs on anon_vma lock Increased usage of page migration in mmotm reveals that the anon_vma locking in unmap_and_move() has been deficient since 2.6.36 (or even earlier). Review at the time of f18194275c39835cb84563500995e0d503a32d9a ("mm: fix hang on anon_vma->root->lock") missed the issue here: the anon_vma to which we get a reference may already have been freed back to its slab (it is in use when we check page_mapped, but that can change), and so its anon_vma->root may be switched at any moment by reuse in anon_vma_prepare. Perhaps we could fix that with a get_anon_vma_unless_zero(), but let's not: just rely on page_lock_anon_vma() to do all the hard thinking for us, then we don't need any rcu read locking over here. In removing the rcu_unlock label: since PageAnon is a bit in page->mapping, it's impossible for a !page->mapping page to be anon; but insert VM_BUG_ON in case the implementation ever changes. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Hugh Dickins Reviewed-by: Mel Gorman Reviewed-by: Rik van Riel Cc: Naoya Horiguchi Cc: "Jun'ichi Nomura" Cc: Andi Kleen Cc: [2.6.37, 2.6.36] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2919bfd0758257c469abef8c26c3e516bbebb851 Author: Hugh Dickins Date: Thu Jan 13 15:47:29 2011 -0800 ksm: drain pagevecs to lru It was hard to explain the page counts which were causing new LTP tests of KSM to fail: we need to drain the per-cpu pagevecs to LRU occasionally. Signed-off-by: Hugh Dickins Reported-by: CAI Qian Cc:Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73ae31e5986a4c0ee84bfd13ccd9b57a98956f6f Author: Eric B Munson Date: Thu Jan 13 15:47:28 2011 -0800 hugetlb: fix handling of parse errors in sysfs When parsing changes to the huge page pool sizes made from userspace via the sysfs interface, bogus input values are being covered up by nr_hugepages_store_common and nr_overcommit_hugepages_store returning 0 when strict_strtoul returns an error. This can cause an infinite loop in the nr_hugepages_store code. This patch changes the return value for these functions to -EINVAL when strict_strtoul returns an error. Signed-off-by: Eric B Munson Reported-by: CAI Qian Cc: Andrea Arcangeli Cc: Eric B Munson Cc: Michal Hocko Cc: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit adbe8726dc2a3805630d517270db17e3af86e526 Author: Eric B Munson Date: Thu Jan 13 15:47:27 2011 -0800 hugetlb: do not allow pagesize >= MAX_ORDER pool adjustment Huge pages with order >= MAX_ORDER must be allocated at boot via the kernel command line, they cannot be allocated or freed once the kernel is up and running. Currently we allow values to be written to the sysfs and sysctl files controling pool size for these huge page sizes. This patch makes the store functions for nr_hugepages and nr_overcommit_hugepages return -EINVAL when the pool for a page size >= MAX_ORDER is changed. [akpm@linux-foundation.org: avoid multiple return paths in nr_hugepages_store_common()] [caiqian@redhat.com: add checking in hugetlb_overcommit_handler()] Signed-off-by: Eric B Munson Reported-by: CAI Qian Cc: Andrea Arcangeli Cc: Michal Hocko Cc: Nishanth Aravamudan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d4a24659f1284f33e574211435aa12ce968477 Author: Michal Hocko Date: Thu Jan 13 15:47:26 2011 -0800 hugetlb: check the return value of string conversion in sysctl handler proc_doulongvec_minmax may fail if the given buffer doesn't represent a valid number. If we provide something invalid we will initialize the resulting value (nr_overcommit_huge_pages in this case) to a random value from the stack. The issue was introduced by a3d0c6aa when the default handler has been replaced by the helper function where we do not check the return value. Reproducer: echo "" > /proc/sys/vm/nr_overcommit_hugepages [akpm@linux-foundation.org: correctly propagate proc_doulongvec_minmax return code] Signed-off-by: Michal Hocko Cc: CAI Qian Cc: Nishanth Aravamudan Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb9ef8d5e394f70db64bda79c20d3569a20d2574 Author: Stefan Hajnoczi Date: Thu Jan 13 15:47:26 2011 -0800 fs/fs-writeback.c: fix sync_inodes_sb() return value kernel-doc The sync_inodes_sb() function does not have a return value. Remove the outdated documentation comment. Signed-off-by: Stefan Hajnoczi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 684265d4a30f133162f06ddb2e5010608e60e4bb Author: Andrew Morton Date: Thu Jan 13 15:47:25 2011 -0800 mm/dmapool.c: use TASK_UNINTERRUPTIBLE in dma_pool_alloc() As it stands this code will degenerate into a busy-wait if the calling task has signal_pending(). Cc: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84bc227d7fde049a568cd58a5610613feedc0dff Author: Rolf Eike Beer Date: Thu Jan 13 15:47:24 2011 -0800 mm/dmapool.c: take lock only once in dma_pool_free() dma_pool_free() scans for the page to free in the pool list holding the pool lock. Then it releases the lock basically to acquire it immediately again. Modify the code to only take the lock once. This will do some additional loops and computations with the lock held in if memory debugging is activated. If it is not activated the only new operations with this lock is one if and one substraction. Signed-off-by: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43506fad21ca3d8dc59e768ff458f7c5e5c01086 Author: KyongHo Cho Date: Thu Jan 13 15:47:24 2011 -0800 mm/page_alloc.c: simplify calculation of combined index of adjacent buddy lists The previous approach of calucation of combined index was page_idx & ~(1 << order)) but we have same result with page_idx & buddy_idx This reduces instructions slightly as well as enhances readability. [akpm@linux-foundation.org: coding-style fixes] [akpm@linux-foundation.org: fix used-unintialised warning] Signed-off-by: KyongHo Cho Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5520e89485252c759ee60d313e9422447659947b Author: Jiri Kosina Date: Thu Jan 13 15:47:23 2011 -0800 brk: fix min_brk lower bound computation for COMPAT_BRK Even if CONFIG_COMPAT_BRK is set in the kernel configuration, it can still be overriden by randomize_va_space sysctl. If this is the case, the min_brk computation in sys_brk() implementation is wrong, as it solely takes into account COMPAT_BRK setting, assuming that brk start is not randomized. But that might not be the case if randomize_va_space sysctl has been set to '2' at the time the binary has been loaded from disk. In such case, the check has to be done in a same way as in !CONFIG_COMPAT_BRK case. In addition to that, the check for the COMPAT_BRK case introduced back in a5b4592c ("brk: make sys_brk() honor COMPAT_BRK when computing lower bound") is slightly wrong -- the lower bound shouldn't be mm->end_code, but mm->end_data instead, as that's where the legacy applications expect brk section to start (i.e. immediately after last global variable). [akpm@linux-foundation.org: fix comment] Signed-off-by: Jiri Kosina Cc: Geert Uytterhoeven Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32d6feadf4e17ea9b98071be9bbf402a74a4f818 Author: Jesper Juhl Date: Thu Jan 13 15:47:22 2011 -0800 mm/hugetlb.c: fix error-path memory leak in nr_hugepages_store_common() The NODEMASK_ALLOC macro may dynamically allocate memory for its second argument ('nodes_allowed' in this context). In nr_hugepages_store_common() we may abort early if strict_strtoul() fails, but in that case we do not free the memory already allocated to 'nodes_allowed', causing a memory leak. This patch closes the leak by freeing the memory in the error path. [akpm@linux-foundation.org: use NODEMASK_FREE, per Minchan Kim] Signed-off-by: Jesper Juhl Cc: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29c1f677d424e8c5683a837fc4f03fc9f19201d7 Author: Mel Gorman Date: Thu Jan 13 15:47:21 2011 -0800 mm: migration: use rcu_dereference_protected when dereferencing the radix tree slot during file page migration migrate_pages() -> unmap_and_move() only calls rcu_read_lock() for anonymous pages, as introduced by git commit 989f89c57e6361e7d16fbd9572b5da7d313b073d ("fix rcu_read_lock() in page migraton"). The point of the RCU protection there is part of getting a stable reference to anon_vma and is only held for anon pages as file pages are locked which is sufficient protection against freeing. However, while a file page's mapping is being migrated, the radix tree is double checked to ensure it is the expected page. This uses radix_tree_deref_slot() -> rcu_dereference() without the RCU lock held triggering the following warning. [ 173.674290] =================================================== [ 173.676016] [ INFO: suspicious rcu_dereference_check() usage. ] [ 173.676016] --------------------------------------------------- [ 173.676016] include/linux/radix-tree.h:145 invoked rcu_dereference_check() without protection! [ 173.676016] [ 173.676016] other info that might help us debug this: [ 173.676016] [ 173.676016] [ 173.676016] rcu_scheduler_active = 1, debug_locks = 0 [ 173.676016] 1 lock held by hugeadm/2899: [ 173.676016] #0: (&(&inode->i_data.tree_lock)->rlock){..-.-.}, at: [] migrate_page_move_mapping+0x40/0x1ab [ 173.676016] [ 173.676016] stack backtrace: [ 173.676016] Pid: 2899, comm: hugeadm Not tainted 2.6.37-rc5-autobuild [ 173.676016] Call Trace: [ 173.676016] [] ? printk+0x14/0x1b [ 173.676016] [] lockdep_rcu_dereference+0x7d/0x86 [ 173.676016] [] migrate_page_move_mapping+0xca/0x1ab [ 173.676016] [] migrate_page+0x23/0x39 [ 173.676016] [] buffer_migrate_page+0x22/0x107 [ 173.676016] [] ? buffer_migrate_page+0x0/0x107 [ 173.676016] [] move_to_new_page+0x9a/0x1ae [ 173.676016] [] migrate_pages+0x1e7/0x2fa This patch introduces radix_tree_deref_slot_protected() which calls rcu_dereference_protected(). Users of it must pass in the mapping->tree_lock that is protecting this dereference. Holding the tree lock protects against parallel updaters of the radix tree meaning that rcu_dereference_protected is allowable. [akpm@linux-foundation.org: remove unneeded casts] Signed-off-by: Mel Gorman Cc: Minchan Kim Cc: KAMEZAWA Hiroyuki Cc: Milton Miller Cc: Nick Piggin Cc: Wu Fengguang Cc: [2.6.37.early] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22e5c47ee238abe636655c3862ed28d6eb084ad4 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:20 2011 -0800 thp: add compound_trans_head() helper Cleanup some code with common compound_trans_head helper. Signed-off-by: Andrea Arcangeli Cc: Hugh Dickins Cc: Johannes Weiner Cc: Marcelo Tosatti Cc: Avi Kivity Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ad768cfc08611a4c1070d0f13f82eeea2bac7b Author: Andrea Arcangeli Date: Thu Jan 13 15:47:19 2011 -0800 thp: KSM on THP This makes KSM full operational with THP pages. Subpages are scanned while the hugepage is still in place and delivering max cpu performance, and only if there's a match and we're going to deduplicate memory, the single hugepages with the subpage match is split. There will be no false sharing between ksmd and khugepaged. khugepaged won't collapse 2m virtual regions with KSM pages inside. ksmd also should only split pages when the checksum matches and we're likely to split an hugepage for some long living ksm page (usual ksm heuristic to avoid sharing pages that get de-cowed). Signed-off-by: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 60ab3244ec85c44276c585a2a20d3750402e1cf4 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:18 2011 -0800 thp: khugepaged: make khugepaged aware about madvise MADV_HUGEPAGE and MADV_NOHUGEPAGE were fully effective only if run after mmap and before touching the memory. While this is enough for most usages, it's little effort to make madvise more dynamic at runtime on an existing mapping by making khugepaged aware about madvise. MADV_HUGEPAGE: register in khugepaged immediately without waiting a page fault (that may not ever happen if all pages are already mapped and the "enabled" knob was set to madvise during the initial page faults). MADV_NOHUGEPAGE: skip vmas marked VM_NOHUGEPAGE in khugepaged to stop collapsing pages where not needed. [akpm@linux-foundation.org: tweak comment] Signed-off-by: Andrea Arcangeli Cc: Michael Kerrisk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a664b2d8555c659127bf8fe049a58449d394a707 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:17 2011 -0800 thp: madvise(MADV_NOHUGEPAGE) Add madvise MADV_NOHUGEPAGE to mark regions that are not important to be hugepage backed. Return -EINVAL if the vma is not of an anonymous type, or the feature isn't built into the kernel. Never silently return success. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ddd6db43a08cba56c7ee920800980862086f1c3 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:17 2011 -0800 thp: mm: define MADV_NOHUGEPAGE Define MADV_NOHUGEPAGE. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 37c2ac7872a9387542616f658d20ac25f5bdb32e Author: Andrea Arcangeli Date: Thu Jan 13 15:47:16 2011 -0800 thp: compound_trans_order Read compound_trans_order safe. Noop for CONFIG_TRANSPARENT_HUGEPAGE=n. Signed-off-by: Andrea Arcangeli Cc: Daisuke Nishimura Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91600e9e592e48736e630851c83da2ad6bf0e91f Author: Andrea Arcangeli Date: Thu Jan 13 15:47:16 2011 -0800 thp: fix memory-failure hugetlbfs vs THP collision hugetlbfs was changed to allow memory failure to migrate the hugetlbfs pages and that broke THP as split_huge_page was then called on hugetlbfs pages too. compound_head/order was also run unsafe on THP pages that can be splitted at any time. All compound_head() invocations in memory-failure.c that are run on pages that aren't pinned and that can be freed and reused from under us (while compound_head is running) are buggy because compound_head can return a dangling pointer, but I'm not fixing this as this is a generic memory-failure bug not specific to THP but it applies to hugetlbfs too, so I can fix it later after THP is merged upstream. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14d1a55cd26f1860f837f37ae42520c7c13b1347 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:15 2011 -0800 thp: add debug checks for mapcount related invariants Add debug checks for invariants that if broken could lead to mapcount vs page_mapcount debug checks to trigger later in split_huge_page. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05b258e99725112c4febeab4fad23ea2c8908a3a Author: David Rientjes Date: Thu Jan 13 15:47:14 2011 -0800 thp: transparent hugepage sysfs meminfo Add hugepage statistics to per-node sysfs meminfo Reviewed-by: Rik van Riel Signed-off-by: David Rientjes Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9992af102974f3f8a02a1f2729c3461881539e26 Author: Rik van Riel Date: Thu Jan 13 15:47:13 2011 -0800 thp: scale nr_rotated to balance memory pressure Make sure we scale up nr_rotated when we encounter a referenced transparent huge page. This ensures pageout scanning balance is not distorted when there are huge pages on the LRU. Signed-off-by: Rik van Riel Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c888cfbc1b45508a44763d85ba2e8ac43faff5f Author: Rik van Riel Date: Thu Jan 13 15:47:13 2011 -0800 thp: fix anon memory statistics with transparent hugepages Count each transparent hugepage as HPAGE_PMD_NR pages in the LRU statistics, so the Active(anon) and Inactive(anon) statistics in /proc/meminfo are correct. Signed-off-by: Rik van Riel Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97562cd243298acf573620c764a1037bd545c9bc Author: Rik van Riel Date: Thu Jan 13 15:47:12 2011 -0800 thp: disable transparent hugepages by default on small systems On small systems, the extra memory used by the anti-fragmentation memory reserve and simply because huge pages are smaller than large pages can easily outweigh the benefits of less TLB misses. A less obvious concern is if run on a NUMA machine with asymmetric node sizes and one of them is very small. The reserve could make the node unusable. In case of the crashdump kernel, OOMs have been observed due to the anti-fragmentation memory reserve taking up a large fraction of the crashdump image. This patch disables transparent hugepages on systems with less than 1GB of RAM, but the hugepage subsystem is fully initialized so administrators can enable THP through /sys if desired. Signed-off-by: Rik van Riel Acked-by: Avi Kiviti Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5a73c3d55be1faadba35b41a862e036a3b12ddb Author: Andrea Arcangeli Date: Thu Jan 13 15:47:11 2011 -0800 thp: use compaction for all allocation orders It makes no sense not to enable compaction for small order pages as we don't want to end up with bad order 2 allocations and good and graceful order 9 allocations. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a03b051ed87e72b959f32a86054e1142ac4cf55 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:11 2011 -0800 thp: use compaction in kswapd for GFP_ATOMIC order > 0 This takes advantage of memory compaction to properly generate pages of order > 0 if regular page reclaim fails and priority level becomes more severe and we don't reach the proper watermarks. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 878aee7d6b5504e01b9caffce080e792b6b8d090 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:10 2011 -0800 thp: freeze khugepaged and ksmd It's unclear why schedule friendly kernel threads can't be taken away by the CPU through the scheduler itself. It's safer to stop them as they can trigger memory allocation, if kswapd also freezes itself to avoid generating I/O they have too. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ee53820edfd1f3b6554c593f337148dd3d7fc91 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:10 2011 -0800 thp: mmu_notifier_test_young For GRU and EPT, we need gup-fast to set referenced bit too (this is why it's correct to return 0 when shadow_access_mask is zero, it requires gup-fast to set the referenced bit). qemu-kvm access already sets the young bit in the pte if it isn't zero-copy, if it's zero copy or a shadow paging EPT minor fault we relay on gup-fast to signal the page is in use... We also need to check the young bits on the secondary pagetables for NPT and not nested shadow mmu as the data may never get accessed again by the primary pte. Without this closer accuracy, we'd have to remove the heuristic that avoids collapsing hugepages in hugepage virtual regions that have not even a single subpage in use. ->test_young is full backwards compatible with GRU and other usages that don't have young bits in pagetables set by the hardware and that should nuke the secondary mmu mappings when ->clear_flush_young runs just like EPT does. Removing the heuristic that checks the young bit in khugepaged/collapse_huge_page completely isn't so bad either probably but I thought it was worth it and this makes it reliable. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b7167b9ff9b7f3f528cbc4c7d02ebd275b9b10c Author: Andrea Arcangeli Date: Thu Jan 13 15:47:09 2011 -0800 thp: don't allow transparent hugepage support without PSE Archs implementing Transparent Hugepage Support must implement a function called has_transparent_hugepage to be sure the virtual or physical CPU supports Transparent Hugepages. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94fcc585fb85ad7b059c70872489b50044d401f3 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:08 2011 -0800 thp: avoid breaking huge pmd invariants in case of vma_adjust failures An huge pmd can only be mapped if the corresponding 2M virtual range is fully contained in the vma. At times the VM calls split_vma twice, if the first split_vma succeeds and the second fail, the first split_vma remains in effect and it's not rolled back. For split_vma or vma_adjust to fail an allocation failure is needed so it's a very unlikely event (the out of memory killer would normally fire before any allocation failure is visible to kernel and userland and if an out of memory condition happens it's unlikely to happen exactly here). Nevertheless it's safer to ensure that no huge pmd can be left around if the vma is adjusted in a way that can't fit hugepages anymore at the new vm_start/vm_end address. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc835011afbea3957217ee716093d791fb2fe44f Author: Andrea Arcangeli Date: Thu Jan 13 15:47:08 2011 -0800 thp: transhuge isolate_migratepages() It's not worth migrating transparent hugepages during compaction. Those hugepages don't create fragmentation. Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d6892407cab23d4bf2f6de065ca351a53849323 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:07 2011 -0800 thp: select CONFIG_COMPACTION if TRANSPARENT_HUGEPAGE enabled With transparent hugepage support we need compaction for the "defrag" sysfs controls to be effective. At the moment THP hangs the system if COMPACTION isn't selected, as without COMPACTION lumpy reclaim wouldn't be entirely disabled. So at the moment it's not orthogonal. When lumpy will be removed from the VM I can remove the select COMPACTION in theory, but then 99% of THP users would be still doing a mistake in disabling compaction, even if the mistake won't return in fatal runtime but just slightly degraded performance. So from a theoretical standpoing forcing the below select is not needed (the dependency isn't strict nor at compile time nor at runtime) but from a practical standpoint it is safer. If anybody really wants THP to run without compaction, it'd be such a weird setup that editing the Kconfig file to allow it will be surely not a problem. Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13ece886d99cd668483113f7238e419d5331af26 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:07 2011 -0800 thp: transparent hugepage config choice Allow to choose between the always|madvise default for page faults and khugepaged at config time. madvise guarantees zero risk of higher memory footprint for applications (applications using madvise(MADV_HUGEPAGE) won't risk to use any more memory by backing their virtual regions with hugepages). Initially set the default to N and don't depend on EMBEDDED. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce83d2174ea9c3d72d5821cf3ebc974e36391bf7 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:06 2011 -0800 thp: allocate memory in khugepaged outside of mmap_sem write mode This tries to be more friendly to filesystem in userland, with userland backends that allocate memory in the I/O paths and that could deadlock if khugepaged holds the mmap_sem write mode of the userland backend while allocating memory. Memory allocation may wait for writeback I/O completion from the daemon that may be blocked in the mmap_sem read mode if a page fault happens and the daemon wasn't using mlock for the memory required for the I/O submission and completion. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bbbc0b33d141f78a0d9218a54a47f50621220d3 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:05 2011 -0800 thp: add numa awareness to hugepage allocations It's mostly a matter of replacing alloc_pages with alloc_pages_vma after introducing alloc_pages_vma. khugepaged needs special handling as the allocation has to happen inside collapse_huge_page where the vma is known and an error has to be returned to the outer loop to sleep alloc_sleep_millisecs in case of failure. But it retains the more efficient logic of handling allocation failures in khugepaged in case of CONFIG_NUMA=n. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d39d33c332c611094f84cee39715866f4cbf79e2 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:05 2011 -0800 thp: enable direct defrag With memory compaction in, and lumpy-reclaim disabled, it seems safe enough to defrag memory during the (synchronous) transparent hugepage page faults (TRANSPARENT_HUGEPAGE_DEFRAG_FLAG) and not only during khugepaged (async) hugepage allocations that was already enabled even before memory compaction was in (TRANSPARENT_HUGEPAGE_DEFRAG_KHUGEPAGED_FLAG). Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f000565adb770b14cebbafde0a4f3e61a3342a63 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:04 2011 -0800 thp: set recommended min free kbytes If transparent hugepage is enabled initialize min_free_kbytes to an optimal value by default. This moves the hugeadm algorithm in kernel. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd7548ab360c462118568eebb8c6da3bc303b02e Author: Johannes Weiner Date: Thu Jan 13 15:47:04 2011 -0800 thp: mprotect: transparent huge page support Natively handle huge pmds when changing page tables on behalf of mprotect(). I left out update_mmu_cache() because we do not need it on x86 anyway but more importantly the interface works on ptes, not pmds. Signed-off-by: Johannes Weiner Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b36f5b0710e9e3b92484de32920fddcb17278664 Author: Johannes Weiner Date: Thu Jan 13 15:47:03 2011 -0800 thp: mprotect: pass vma down to page table walkers Flushing the tlb for huge pmds requires the vma's anon_vma, so pass along the vma instead of the mm, we can always get the latter when we need it. Signed-off-by: Johannes Weiner Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c489f1257b8cacd4881a18da1e93659f934a8e98 Author: Johannes Weiner Date: Thu Jan 13 15:47:02 2011 -0800 thp: add pmd_modify Add pmd_modify() for use with mprotect() on huge pmds. Signed-off-by: Johannes Weiner Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ca1634d4143c3579273ca53b993df19f5c98e92 Author: Johannes Weiner Date: Thu Jan 13 15:47:02 2011 -0800 thp: mincore transparent hugepage support Handle transparent huge page pmd entries natively instead of splitting them into subpages. Signed-off-by: Johannes Weiner Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d6bfe9ff0acec30b713614260e78b03d20e909 Author: Johannes Weiner Date: Thu Jan 13 15:47:01 2011 -0800 thp: add x86 32bit support Add support for transparent hugepages to x86 32bit. Share the same VM_ bitflag for VM_MAPPED_COPY. mm/nommu.c will never support transparent hugepages. Signed-off-by: Johannes Weiner Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f24ce5fd34c3ca1b3d10d30da754732da64d5c0 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:00 2011 -0800 thp: remove PG_buddy PG_buddy can be converted to _mapcount == -2. So the PG_compound_lock can be added to page->flags without overflowing (because of the sparse section bits increasing) with CONFIG_X86_PAE=y and CONFIG_X86_PAT=y. This also has to move the memory hotplug code from _mapcount to lru.next to avoid any risk of clashes. We can't use lru.next for PG_buddy removal, but memory hotplug can use lru.next even more easily than the mapcount instead. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21ae5b01750f14140809508a478a4413792e0261 Author: Andrea Arcangeli Date: Thu Jan 13 15:47:00 2011 -0800 thp: skip transhuge pages in ksm for now Skip transhuge pages in ksm for now. Signed-off-by: Andrea Arcangeli Reviewed-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b15d00b6af617251cc70a908df983e9aff57e169 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:59 2011 -0800 thp: khugepaged vma merge register in khugepaged if the vma grows. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba76149f47d8c939efa0acc07a191237af900471 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:58 2011 -0800 thp: khugepaged Add khugepaged to relocate fragmented pages into hugepages if new hugepages become available. (this is indipendent of the defrag logic that will have to make new hugepages available) The fundamental reason why khugepaged is unavoidable, is that some memory can be fragmented and not everything can be relocated. So when a virtual machine quits and releases gigabytes of hugepages, we want to use those freely available hugepages to create huge-pmd in the other virtual machines that may be running on fragmented memory, to maximize the CPU efficiency at all times. The scan is slow, it takes nearly zero cpu time, except when it copies data (in which case it means we definitely want to pay for that cpu time) so it seems a good tradeoff. In addition to the hugepages being released by other process releasing memory, we have the strong suspicion that the performance impact of potentially defragmenting hugepages during or before each page fault could lead to more performance inconsistency than allocating small pages at first and having them collapsed into large pages later... if they prove themselfs to be long lived mappings (khugepaged scan is slow so short lived mappings have low probability to run into khugepaged if compared to long lived mappings). Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79134171df238171daa4c024a42b77b401ccb00b Author: Andrea Arcangeli Date: Thu Jan 13 15:46:58 2011 -0800 thp: transparent hugepage vmstat Add hugepage stat information to /proc/vmstat and /proc/meminfo. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9bbfbe30ae088cc88a4b2ba7732baeebd1a0162 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:57 2011 -0800 thp: memcg huge memory Add memcg charge/uncharge to hugepage faults in huge_memory.c. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 152c9ccb75548c027fa3103efa4fa4e19a345449 Author: Daisuke Nishimura Date: Thu Jan 13 15:46:56 2011 -0800 thp: transhuge-memcg: commit tail pages at charge By this patch, when a transparent hugepage is charged, not only the head page but also all the tail pages are committed, IOW pc->mem_cgroup and pc->flags of tail pages are set. Without this patch: - Tail pages are not linked to any memcg's LRU at splitting. This causes many problems, for example, the charged memcg's directory can never be rmdir'ed because it doesn't have enough pages to scan to make the usage decrease to 0. - "rss" field in memory.stat would be incorrect. Moreover, usage_in_bytes in root cgroup is calculated by the stat not by res_counter(since 2.6.32), it would be incorrect too. Signed-off-by: Daisuke Nishimura Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec1685109f1314a30919489ef2800ed626a38c1e Author: Andrea Arcangeli Date: Thu Jan 13 15:46:56 2011 -0800 thp: memcg compound Teach memcg to charge/uncharge compound pages. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 500d65d471018d9a13b0d51b7e141ed2a3555c1d Author: Andrea Arcangeli Date: Thu Jan 13 15:46:55 2011 -0800 thp: pmd_trans_huge migrate bugcheck No pmd_trans_huge should ever materialize in migration ptes areas, because we split the hugepage before migration ptes are instantiated. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0af4e98b6b095c74588af04872f83d333c958c32 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:55 2011 -0800 thp: madvise(MADV_HUGEPAGE) Add madvise MADV_HUGEPAGE to mark regions that are important to be hugepage backed. Return -EINVAL if the vma is not of an anonymous type, or the feature isn't built into the kernel. Never silently return success. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f66055ab6fb9731dbfce320c5202ef4441b5d77f Author: Andrea Arcangeli Date: Thu Jan 13 15:46:54 2011 -0800 thp: verify pmd_trans_huge isn't leaking pte_trans_huge must not leak in certain vmas like the mmio special pfn or filebacked mappings. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05759d380a9d7f131a475186c07fce58ceaa8902 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:53 2011 -0800 thp: split_huge_page anon_vma ordering dependency This documents how split_huge_page is safe vs new vma inserctions into the anon_vma that may have already released the anon_vma->lock but not established pmds yet when split_huge_page starts. Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a07651ee8cdaa9e27cb4ae372aed347533770f5 Author: Hugh Dickins Date: Thu Jan 13 15:46:52 2011 -0800 thp: transparent hugepage core fixlet If you configure THP in addition to HUGETLB_PAGE on x86_32 without PAE, the p?d-folding works out that munlock_vma_pages_range() can crash to follow_page()'s pud_huge() BUG_ON(flags & FOLL_GET): it needs the same VM_HUGETLB check already there on the pmd_huge() line. Conveniently, openSUSE provides a "blogd" which tests this out at startup! Signed-off-by: Hugh Dickins Cc: Rik van Riel Cc: Johannes Weiner Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71e3aac0724ffe8918992d76acfe3aad7d8724a5 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:52 2011 -0800 thp: transparent hugepage core Lately I've been working to make KVM use hugepages transparently without the usual restrictions of hugetlbfs. Some of the restrictions I'd like to see removed: 1) hugepages have to be swappable or the guest physical memory remains locked in RAM and can't be paged out to swap 2) if a hugepage allocation fails, regular pages should be allocated instead and mixed in the same vma without any failure and without userland noticing 3) if some task quits and more hugepages become available in the buddy, guest physical memory backed by regular pages should be relocated on hugepages automatically in regions under madvise(MADV_HUGEPAGE) (ideally event driven by waking up the kernel deamon if the order=HPAGE_PMD_SHIFT-PAGE_SHIFT list becomes not null) 4) avoidance of reservation and maximization of use of hugepages whenever possible. Reservation (needed to avoid runtime fatal faliures) may be ok for 1 machine with 1 database with 1 database cache with 1 database cache size known at boot time. It's definitely not feasible with a virtualization hypervisor usage like RHEV-H that runs an unknown number of virtual machines with an unknown size of each virtual machine with an unknown amount of pagecache that could be potentially useful in the host for guest not using O_DIRECT (aka cache=off). hugepages in the virtualization hypervisor (and also in the guest!) are much more important than in a regular host not using virtualization, becasue with NPT/EPT they decrease the tlb-miss cacheline accesses from 24 to 19 in case only the hypervisor uses transparent hugepages, and they decrease the tlb-miss cacheline accesses from 19 to 15 in case both the linux hypervisor and the linux guest both uses this patch (though the guest will limit the addition speedup to anonymous regions only for now...). Even more important is that the tlb miss handler is much slower on a NPT/EPT guest than for a regular shadow paging or no-virtualization scenario. So maximizing the amount of virtual memory cached by the TLB pays off significantly more with NPT/EPT than without (even if there would be no significant speedup in the tlb-miss runtime). The first (and more tedious) part of this work requires allowing the VM to handle anonymous hugepages mixed with regular pages transparently on regular anonymous vmas. This is what this patch tries to achieve in the least intrusive possible way. We want hugepages and hugetlb to be used in a way so that all applications can benefit without changes (as usual we leverage the KVM virtualization design: by improving the Linux VM at large, KVM gets the performance boost too). The most important design choice is: always fallback to 4k allocation if the hugepage allocation fails! This is the _very_ opposite of some large pagecache patches that failed with -EIO back then if a 64k (or similar) allocation failed... Second important decision (to reduce the impact of the feature on the existing pagetable handling code) is that at any time we can split an hugepage into 512 regular pages and it has to be done with an operation that can't fail. This way the reliability of the swapping isn't decreased (no need to allocate memory when we are short on memory to swap) and it's trivial to plug a split_huge_page* one-liner where needed without polluting the VM. Over time we can teach mprotect, mremap and friends to handle pmd_trans_huge natively without calling split_huge_page*. The fact it can't fail isn't just for swap: if split_huge_page would return -ENOMEM (instead of the current void) we'd need to rollback the mprotect from the middle of it (ideally including undoing the split_vma) which would be a big change and in the very wrong direction (it'd likely be simpler not to call split_huge_page at all and to teach mprotect and friends to handle hugepages instead of rolling them back from the middle). In short the very value of split_huge_page is that it can't fail. The collapsing and madvise(MADV_HUGEPAGE) part will remain separated and incremental and it'll just be an "harmless" addition later if this initial part is agreed upon. It also should be noted that locking-wise replacing regular pages with hugepages is going to be very easy if compared to what I'm doing below in split_huge_page, as it will only happen when page_count(page) matches page_mapcount(page) if we can take the PG_lock and mmap_sem in write mode. collapse_huge_page will be a "best effort" that (unlike split_huge_page) can fail at the minimal sign of trouble and we can try again later. collapse_huge_page will be similar to how KSM works and the madvise(MADV_HUGEPAGE) will work similar to madvise(MADV_MERGEABLE). The default I like is that transparent hugepages are used at page fault time. This can be changed with /sys/kernel/mm/transparent_hugepage/enabled. The control knob can be set to three values "always", "madvise", "never" which mean respectively that hugepages are always used, or only inside madvise(MADV_HUGEPAGE) regions, or never used. /sys/kernel/mm/transparent_hugepage/defrag instead controls if the hugepage allocation should defrag memory aggressively "always", only inside "madvise" regions, or "never". The pmd_trans_splitting/pmd_trans_huge locking is very solid. The put_page (from get_user_page users that can't use mmu notifier like O_DIRECT) that runs against a __split_huge_page_refcount instead was a pain to serialize in a way that would result always in a coherent page count for both tail and head. I think my locking solution with a compound_lock taken only after the page_first is valid and is still a PageHead should be safe but it surely needs review from SMP race point of view. In short there is no current existing way to serialize the O_DIRECT final put_page against split_huge_page_refcount so I had to invent a new one (O_DIRECT loses knowledge on the mapping status by the time gup_fast returns so...). And I didn't want to impact all gup/gup_fast users for now, maybe if we change the gup interface substantially we can avoid this locking, I admit I didn't think too much about it because changing the gup unpinning interface would be invasive. If we ignored O_DIRECT we could stick to the existing compound refcounting code, by simply adding a get_user_pages_fast_flags(foll_flags) where KVM (and any other mmu notifier user) would call it without FOLL_GET (and if FOLL_GET isn't set we'd just BUG_ON if nobody registered itself in the current task mmu notifier list yet). But O_DIRECT is fundamental for decent performance of virtualized I/O on fast storage so we can't avoid it to solve the race of put_page against split_huge_page_refcount to achieve a complete hugepage feature for KVM. Swap and oom works fine (well just like with regular pages ;). MMU notifier is handled transparently too, with the exception of the young bit on the pmd, that didn't have a range check but I think KVM will be fine because the whole point of hugepages is that EPT/NPT will also use a huge pmd when they notice gup returns pages with PageCompound set, so they won't care of a range and there's just the pmd young bit to check in that case. NOTE: in some cases if the L2 cache is small, this may slowdown and waste memory during COWs because 4M of memory are accessed in a single fault instead of 8k (the payoff is that after COW the program can run faster). So we might want to switch the copy_huge_page (and clear_huge_page too) to not temporal stores. I also extensively researched ways to avoid this cache trashing with a full prefault logic that would cow in 8k/16k/32k/64k up to 1M (I can send those patches that fully implemented prefault) but I concluded they're not worth it and they add an huge additional complexity and they remove all tlb benefits until the full hugepage has been faulted in, to save a little bit of memory and some cache during app startup, but they still don't improve substantially the cache-trashing during startup if the prefault happens in >4k chunks. One reason is that those 4k pte entries copied are still mapped on a perfectly cache-colored hugepage, so the trashing is the worst one can generate in those copies (cow of 4k page copies aren't so well colored so they trashes less, but again this results in software running faster after the page fault). Those prefault patches allowed things like a pte where post-cow pages were local 4k regular anon pages and the not-yet-cowed pte entries were pointing in the middle of some hugepage mapped read-only. If it doesn't payoff substantially with todays hardware it will payoff even less in the future with larger l2 caches, and the prefault logic would blot the VM a lot. If one is emebdded transparent_hugepage can be disabled during boot with sysfs or with the boot commandline parameter transparent_hugepage=0 (or transparent_hugepage=2 to restrict hugepages inside madvise regions) that will ensure not a single hugepage is allocated at boot time. It is simple enough to just disable transparent hugepage globally and let transparent hugepages be allocated selectively by applications in the MADV_HUGEPAGE region (both at page fault time, and if enabled with the collapse_huge_page too through the kernel daemon). This patch supports only hugepages mapped in the pmd, archs that have smaller hugepages will not fit in this patch alone. Also some archs like power have certain tlb limits that prevents mixing different page size in the same regions so they will not fit in this framework that requires "graceful fallback" to basic PAGE_SIZE in case of physical memory fragmentation. hugetlbfs remains a perfect fit for those because its software limits happen to match the hardware limits. hugetlbfs also remains a perfect fit for hugepage sizes like 1GByte that cannot be hoped to be found not fragmented after a certain system uptime and that would be very expensive to defragment with relocation, so requiring reservation. hugetlbfs is the "reservation way", the point of transparent hugepages is not to have any reservation at all and maximizing the use of cache and hugepages at all times automatically. Some performance result: vmx andrea # LD_PRELOAD=/usr/lib64/libhugetlbfs.so HUGETLB_MORECORE=yes HUGETLB_PATH=/mnt/huge/ ./largep ages3 memset page fault 1566023 memset tlb miss 453854 memset second tlb miss 453321 random access tlb miss 41635 random access second tlb miss 41658 vmx andrea # LD_PRELOAD=/usr/lib64/libhugetlbfs.so HUGETLB_MORECORE=yes HUGETLB_PATH=/mnt/huge/ ./largepages3 memset page fault 1566471 memset tlb miss 453375 memset second tlb miss 453320 random access tlb miss 41636 random access second tlb miss 41637 vmx andrea # ./largepages3 memset page fault 1566642 memset tlb miss 453417 memset second tlb miss 453313 random access tlb miss 41630 random access second tlb miss 41647 vmx andrea # ./largepages3 memset page fault 1566872 memset tlb miss 453418 memset second tlb miss 453315 random access tlb miss 41618 random access second tlb miss 41659 vmx andrea # echo 0 > /proc/sys/vm/transparent_hugepage vmx andrea # ./largepages3 memset page fault 2182476 memset tlb miss 460305 memset second tlb miss 460179 random access tlb miss 44483 random access second tlb miss 44186 vmx andrea # ./largepages3 memset page fault 2182791 memset tlb miss 460742 memset second tlb miss 459962 random access tlb miss 43981 random access second tlb miss 43988 ============ #include #include #include #include #define SIZE (3UL*1024*1024*1024) int main() { char *p = malloc(SIZE), *p2; struct timeval before, after; gettimeofday(&before, NULL); memset(p, 0, SIZE); gettimeofday(&after, NULL); printf("memset page fault %Lu\n", (after.tv_sec-before.tv_sec)*1000000UL + after.tv_usec-before.tv_usec); gettimeofday(&before, NULL); memset(p, 0, SIZE); gettimeofday(&after, NULL); printf("memset tlb miss %Lu\n", (after.tv_sec-before.tv_sec)*1000000UL + after.tv_usec-before.tv_usec); gettimeofday(&before, NULL); memset(p, 0, SIZE); gettimeofday(&after, NULL); printf("memset second tlb miss %Lu\n", (after.tv_sec-before.tv_sec)*1000000UL + after.tv_usec-before.tv_usec); gettimeofday(&before, NULL); for (p2 = p; p2 < p+SIZE; p2 += 4096) *p2 = 0; gettimeofday(&after, NULL); printf("random access tlb miss %Lu\n", (after.tv_sec-before.tv_sec)*1000000UL + after.tv_usec-before.tv_usec); gettimeofday(&before, NULL); for (p2 = p; p2 < p+SIZE; p2 += 4096) *p2 = 0; gettimeofday(&after, NULL); printf("random access second tlb miss %Lu\n", (after.tv_sec-before.tv_sec)*1000000UL + after.tv_usec-before.tv_usec); return 0; } ============ Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c3240d92e29ae7bfb9cb58a9b37e80ab40894ff Author: Andrea Arcangeli Date: Thu Jan 13 15:46:49 2011 -0800 thp: don't alloc harder for gfp nomemalloc even if nowait Not worth throwing away the precious reserved free memory pool for allocations that can fail gracefully (either through mempool or because they're transhuge allocations later falling back to 4k allocations). Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Reviewed-by: KOSAKI Motohiro Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32dba98e085f8b2b4345887df9abf5e0e93bfc12 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:49 2011 -0800 thp: _GFP_NO_KSWAPD Transparent hugepage allocations must be allowed not to invoke kswapd or any other kind of indirect reclaim (especially when the defrag sysfs is control disabled). It's unacceptable to swap out anonymous pages (potentially anonymous transparent hugepages) in order to create new transparent hugepages. This is true for the MADV_HUGEPAGE areas too (swapping out a kvm virtual machine and so having it suffer an unbearable slowdown, so another one with guest physical memory marked MADV_HUGEPAGE can run 30% faster if it is running memory intensive workloads, makes no sense). If a transparent hugepage allocation fails the slowdown is minor and there is total fallback, so kswapd should never be asked to swapout memory to allow the high order allocation to succeed. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 936a5fe6e6148c0b3ea0d792b903847d9b9931a1 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:48 2011 -0800 thp: kvm mmu transparent hugepage support This should work for both hugetlbfs and transparent hugepages. [akpm@linux-foundation.org: bring forward PageTransCompound() addition for bisectability] Signed-off-by: Andrea Arcangeli Cc: Avi Kivity Cc: Marcelo Tosatti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 47ad8475c000141eacb3ecda5e5ce4b43a9cd04d Author: Andrea Arcangeli Date: Thu Jan 13 15:46:47 2011 -0800 thp: clear_copy_huge_page Move the copy/clear_huge_page functions to common code to share between hugetlb.c and huge_memory.c. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f04f62f90d46a82dd73027c5fd7a15daed5c33d Author: Andrea Arcangeli Date: Thu Jan 13 15:46:47 2011 -0800 thp: split_huge_page paging Paging logic that splits the page before it is unmapped and added to swap to ensure backwards compatibility with the legacy swap code. Eventually swap should natively pageout the hugepages to increase performance and decrease seeking and fragmentation of swap space. swapoff can just skip over huge pmd as they cannot be part of swap yet. In add_to_swap be careful to split the page only if we got a valid swap entry so we don't split hugepages with a full swap. In theory we could split pages before isolating them during the lru scan, but for khugepaged to be safe, I'm relying on either mmap_sem write mode, or PG_lock taken, so split_huge_page has to run either with mmap_sem read/write mode or PG_lock taken. Calling it from isolate_lru_page would make locking more complicated, in addition to that split_huge_page would deadlock if called by __isolate_lru_page because it has to take the lru lock to add the tail pages. Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bae9c19bf12bb2a914a8e530270f41d36cc87c63 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:46 2011 -0800 thp: split_huge_page_mm/vma split_huge_page_pmd compat code. Each one of those would need to be expanded to hundred of lines of complex code without a fully reliable split_huge_page_pmd design. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Johannes Weiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7a00c45f29c0155007aa150bf231a70fa470365 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:45 2011 -0800 thp: add pmd_huge_pte to mm_struct This increase the size of the mm struct a bit but it is needed to preallocate one pte for each hugepage so that split_huge_page will not require a fail path. Guarantee of success is a fundamental property of split_huge_page to avoid decrasing swapping reliability and to avoid adding -ENOMEM fail paths that would otherwise force the hugepage-unaware VM code to learn rolling back in the middle of its pte mangling operations (if something we need it to learn handling pmd_trans_huge natively rather being capable of rollback). When split_huge_page runs a pte is needed to succeed the split, to map the newly splitted regular pages with a regular pte. This way all existing VM code remains backwards compatible by just adding a split_huge_page* one liner. The memory waste of those preallocated ptes is negligible and so it is worth it. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e6af67e970a2ac287739a4c526c857b5bda27ec Author: Andrea Arcangeli Date: Thu Jan 13 15:46:44 2011 -0800 thp: clear page compound split_huge_page must transform a compound page to a regular page and needs ClearPageCompound. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Reviewed-by: Christoph Lameter Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91a4ee2670e0ee2b0630a0eb24fb9a87ea3acd0a Author: Andrea Arcangeli Date: Thu Jan 13 15:46:44 2011 -0800 thp: add pmd mmu_notifier helpers Add mmu notifier helpers to handle pmd huge operations. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ac1f8320a0073f28cf9e0491af4cd98f504f92a Author: Andrea Arcangeli Date: Thu Jan 13 15:46:43 2011 -0800 thp: pte alloc trans splitting pte alloc routines must wait for split_huge_page if the pmd is not present and not null (i.e. pmd_trans_splitting). The additional branches are optimized away at compile time by pmd_trans_splitting if the config option is off. However we must pass the vma down in order to know the anon_vma lock to wait for. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64cc6ae001d70bc59e5f854e6b5678f59110df16 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:42 2011 -0800 thp: bail out gup_fast on splitting pmd Force gup_fast to take the slow path and block if the pmd is splitting, not only if it's none. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit db3eb96f4e6281b84dd33c8980dacc27f2efe177 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:41 2011 -0800 thp: add pmd mangling functions to x86 Add needed pmd mangling functions with symmetry with their pte counterparts. pmdp_splitting_flush() is the only new addition on the pmd_ methods and it's needed to serialize the VM against split_huge_page. It simply atomically sets the splitting bit in a similar way pmdp_clear_flush_young atomically clears the accessed bit. pmdp_splitting_flush() also has to flush the tlb to make it effective against gup_fast, but it wouldn't really require to flush the tlb too. Just the tlb flush is the simplest operation we can invoke to serialize pmdp_splitting_flush() against gup_fast. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2cda322648122dc400c85ada80eaddbc612ef6a Author: Andrea Arcangeli Date: Thu Jan 13 15:46:40 2011 -0800 thp: add pmd mangling generic functions Some are needed to build but not actually used on archs not supporting transparent hugepages. Others like pmdp_clear_flush are used by x86 too. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f6e8da70a289d403975907371ce5738c726ad3f Author: Andrea Arcangeli Date: Thu Jan 13 15:46:40 2011 -0800 thp: special pmd_trans_* functions These returns 0 at compile time when the config option is disabled, to allow gcc to eliminate the transparent hugepage function calls at compile time without additional #ifdefs (only the export of those functions have to be visible to gcc but they won't be required at link time and huge_memory.o can be not built at all). _PAGE_BIT_UNUSED1 is never used for pmd, only on pte. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c76d9d1fb9b21fa10c9e4c1fab2875018a88aa1 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:39 2011 -0800 thp: CONFIG_TRANSPARENT_HUGEPAGE Add config option. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59ff421631295cd54dbf75dcc53d27e84af6d9c0 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:38 2011 -0800 thp: comment reminder in destroy_compound_page Warn destroy_compound_page that __split_huge_page_refcount is heavily dependent on its internal behavior. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14fd403f2146f740942d78af4e0ee59396ad8eab Author: Andrea Arcangeli Date: Thu Jan 13 15:46:37 2011 -0800 thp: export maybe_mkwrite huge_memory.c needs it too when it fallbacks in copying hugepages into regular fragmented pages if hugepage allocation fails during COW. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2609ae6d10af0531e826335bd1445d1ace17c847 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:37 2011 -0800 thp: no paravirt version of pmd ops No paravirt version of set_pmd_at/pmd_update/pmd_update_defer. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 331127f799d1618e2ad978a0d220ed935a7b0ca8 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:36 2011 -0800 thp: add pmd paravirt ops Paravirt ops pmd_update/pmd_update_defer/pmd_set_at. Not all might be necessary (vmware needs pmd_update, Xen needs set_pmd_at, nobody needs pmd_update_defer), but this is to keep full simmetry with pte paravirt ops, which looks cleaner and simpler from a common code POV. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a47de52db04c5eb346e99a8d038e693689bedca Author: Andrea Arcangeli Date: Thu Jan 13 15:46:35 2011 -0800 thp: add native_set_pmd_at Used by paravirt and not paravirt set_pmd_at. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8dd60a3a65c1b057bf0031d28436d3447a3c545b Author: Andrea Arcangeli Date: Thu Jan 13 15:46:34 2011 -0800 thp: clear compound mapping Clear compound mapping for anonymous compound pages like it already happens for regular anonymous pages. But crash if mapping is set for any tail page, also the PageAnon check is meaningless for tail pages. This check only makes sense for the head page, for tail page it can only hide bugs and we definitely don't want to hide bugs. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a5b338f2b0b1ff73ae20c66ab831201549eaec01 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:34 2011 -0800 thp: update futex compound knowledge Futex code is smarter than most other gup_fast O_DIRECT code and knows about the compound internals. However now doing a put_page(head_page) will not release the pin on the tail page taken by gup-fast, leading to all sort of refcounting bugchecks. Getting a stable head_page is a little tricky. page_head = page is there because if this is not a tail page it's also the page_head. Only in case this is a tail page, compound_head is called, otherwise it's guaranteed unnecessary. And if it's a tail page compound_head has to run atomically inside irq disabled section __get_user_pages_fast before returning. Otherwise ->first_page won't be a stable pointer. Disableing irq before __get_user_page_fast and releasing irq after running compound_head is needed because if __get_user_page_fast returns == 1, it means the huge pmd is established and cannot go away from under us. pmdp_splitting_flush_notify in __split_huge_page_splitting will have to wait for local_irq_enable before the IPI delivery can return. This means __split_huge_page_refcount can't be running from under us, and in turn when we run compound_head(page) we're not reading a dangling pointer from tailpage->first_page. Then after we get to stable head page, we are always safe to call compound_lock and after taking the compound lock on head page we can finally re-check if the page returned by gup-fast is still a tail page. in which case we're set and we didn't need to split the hugepage in order to take a futex on it. Signed-off-by: Andrea Arcangeli Acked-by: Mel Gorman Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a95a82e96c48270980dd248ccd5546f1b49e6f8a Author: Andrea Arcangeli Date: Thu Jan 13 15:46:33 2011 -0800 thp: put_page: recheck PageHead after releasing the compound_lock After releasing the compound_lock split_huge_page can still run and release the page before put_page_testzero runs. Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9180706344487700b40da9eca5dedd3d11cb33b4 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:32 2011 -0800 thp: alter compound get_page/put_page Alter compound get_page/put_page to keep references on subpages too, in order to allow __split_huge_page_refcount to split an hugepage even while subpages have been pinned by one of the get_user_pages() variants. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9da73d67729b58bba256123e2b4651e0d8a01ac Author: Andrea Arcangeli Date: Thu Jan 13 15:46:32 2011 -0800 thp: compound_lock Add a new compound_lock() needed to serialize put_page against __split_huge_page_refcount(). Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a826e422420b461a6247137c292ff83c4800354a Author: Andrea Arcangeli Date: Thu Jan 13 15:46:31 2011 -0800 thp: mm: define MADV_HUGEPAGE Define MADV_HUGEPAGE. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Arnd Bergmann Acked-by: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c9bf22c09ae14d65225d9b9619b2eb357350cd7 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:30 2011 -0800 thp: transparent hugepage support documentation Documentation/vm/transhuge.txt Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e9f64c42d0ba5eb0c78569435ada4c224332ce4 Author: Andrea Arcangeli Date: Thu Jan 13 15:46:29 2011 -0800 thp: fix bad_page to show the real reason the page is bad page_count shows the count of the head page, but the actual check is done on the tail page, so show what is really being checked. Signed-off-by: Andrea Arcangeli Acked-by: Rik van Riel Acked-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae52a2adb5afa5ac5ec5fb5c7b24777f84b6c926 Author: Hugh Dickins Date: Thu Jan 13 15:46:28 2011 -0800 thp: ksm: free swap when swapcache page is replaced When a swapcache page is replaced by a ksm page, it's best to free that swap immediately. Reported-by: Andrea Arcangeli Signed-off-by: Hugh Dickins Signed-off-by: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 240c879f20a605346705be24253bc9fc6fa8a106 Author: Minchan Kim Date: Thu Jan 13 15:46:27 2011 -0800 writeback: avoid unnecessary determine_dirtyable_memory call I think determine_dirtyable_memory() is a rather costly function since it need many atomic reads for gathering zone/global page state. But when we use vm_dirty_bytes && dirty_background_bytes, we don't need that costly calculation. This patch eliminates such unnecessary overhead. NOTE : newly added if condition might add overhead in normal path. But it should be _really_ small because anyway we need the access both vm_dirty_bytes and dirty_background_bytes so it is likely to hit the cache. [akpm@linux-foundation.org: fix used-uninitialised warning] Signed-off-by: Minchan Kim Cc: Wu Fengguang Cc: Peter Zijlstra Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecb256f815232b35ae8382cff36ca8ce0bbd077e Author: Volodymyr G. Lukiianyk Date: Thu Jan 13 15:46:26 2011 -0800 mm: set correct numa_zonelist_order string when configured on the kernel command line When numa_zonelist_order parameter is set to "node" or "zone" on the command line it's still showing as "default" in sysctl. That's because early_param parsing function changes only user_zonelist_order variable. Fix this by copying user-provided string to numa_zonelist_order if it was successfully parsed. Signed-off-by: Volodymyr G Lukiianyk Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc83edd941f412e938841b4989be24aa288a1aa6 Author: Mel Gorman Date: Thu Jan 13 15:46:26 2011 -0800 mm: kswapd: use the classzone idx that kswapd was using for sleeping_prematurely() When kswapd is woken up for a high-order allocation, it takes account of the highest usable zone by the caller (the classzone idx). During allocation, this index is used to select the lowmem_reserve[] that should be applied to the watermark calculation in zone_watermark_ok(). When balancing a node, kswapd considers the highest unbalanced zone to be the classzone index. This will always be at least be the callers classzone_idx and can be higher. However, sleeping_prematurely() always considers the lowest zone (e.g. ZONE_DMA) to be the classzone index. This means that sleeping_prematurely() can consider a zone to be balanced that is unusable by the allocation request that originally woke kswapd. This patch changes sleeping_prematurely() to use a classzone_idx matching the value it used in balance_pgdat(). Signed-off-by: Mel Gorman Reviewed-by: Minchan Kim Reviewed-by: Eric B Munson Cc: KAMEZAWA Hiroyuki Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 355b09c47a0cbb73b3e65a57c03f157f2e7ddb0b Author: Mel Gorman Date: Thu Jan 13 15:46:24 2011 -0800 mm: kswapd: treat zone->all_unreclaimable in sleeping_prematurely similar to balance_pgdat() After DEF_PRIORITY, balance_pgdat() considers all_unreclaimable zones to be balanced but sleeping_prematurely does not. This can force kswapd to stay awake longer than it should. This patch fixes it. Signed-off-by: Mel Gorman Reviewed-by: Eric B Munson Cc: Minchan Kim Cc: KAMEZAWA Hiroyuki Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d40502ea580c35414a1466d86f96484910ebaec Author: Mel Gorman Date: Thu Jan 13 15:46:23 2011 -0800 mm: kswapd: reset kswapd_max_order and classzone_idx after reading When kswapd wakes up, it reads its order and classzone from pgdat and calls balance_pgdat. While its awake, it potentially reclaimes at a high order and a low classzone index. This might have been a once-off that was not required by subsequent callers. However, because the pgdat values were not reset, they remain artifically high while balance_pgdat() is running and potentially kswapd enters a second unnecessary reclaim cycle. Reset the pgdat order and classzone index after reading. Signed-off-by: Mel Gorman Reviewed-by: Minchan Kim Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Eric B Munson Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0abdee2bd4118366c62349a304f81537be69af33 Author: Mel Gorman Date: Thu Jan 13 15:46:22 2011 -0800 mm: kswapd: use the order that kswapd was reclaiming at for sleeping_prematurely() Before kswapd goes to sleep, it uses sleeping_prematurely() to check if there was a race pushing a zone below its watermark. If the race happened, it stays awake. However, balance_pgdat() can decide to reclaim at order-0 if it decides that high-order reclaim is not working as expected. This information is not passed back to sleeping_prematurely(). The impact is that kswapd remains awake reclaiming pages long after it should have gone to sleep. This patch passes the adjusted order to sleeping_prematurely and uses the same logic as balance_pgdat to decide if it's ok to go to sleep. Signed-off-by: Mel Gorman Reviewed-by: Minchan Kim Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Eric B Munson Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1741c87757448cedd03224f01586504f9256415d Author: Mel Gorman Date: Thu Jan 13 15:46:21 2011 -0800 mm: kswapd: keep kswapd awake for high-order allocations until a percentage of the node is balanced When reclaiming for high-orders, kswapd is responsible for balancing a node but it should not reclaim excessively. It avoids excessive reclaim by considering if any zone in a node is balanced then the node is balanced. In the cases where there are imbalanced zone sizes (e.g. ZONE_DMA with both ZONE_DMA32 and ZONE_NORMAL), kswapd can go to sleep prematurely as just one small zone was balanced. This alters the sleep logic of kswapd slightly. It counts the number of pages that make up the balanced zones. If the total number of balanced pages is more than a quarter of the zone, kswapd will go back to sleep. This should keep a node balanced without reclaiming an excessive number of pages. Signed-off-by: Mel Gorman Reviewed-by: Minchan Kim Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Eric B Munson Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9950474883e027e6e728cbcff25f7f2bf0c96530 Author: Mel Gorman Date: Thu Jan 13 15:46:20 2011 -0800 mm: kswapd: stop high-order balancing when any suitable zone is balanced Simon Kirby reported the following problem We're seeing cases on a number of servers where cache never fully grows to use all available memory. Sometimes we see servers with 4 GB of memory that never seem to have less than 1.5 GB free, even with a constantly-active VM. In some cases, these servers also swap out while this happens, even though they are constantly reading the working set into memory. We have been seeing this happening for a long time; I don't think it's anything recent, and it still happens on 2.6.36. After some debugging work by Simon, Dave Hansen and others, the prevaling theory became that kswapd is reclaiming order-3 pages requested by SLUB too aggressive about it. There are two apparent problems here. On the target machine, there is a small Normal zone in comparison to DMA32. As kswapd tries to balance all zones, it would continually try reclaiming for Normal even though DMA32 was balanced enough for callers. The second problem is that sleeping_prematurely() does not use the same logic as balance_pgdat() when deciding whether to sleep or not. This keeps kswapd artifically awake. A number of tests were run and the figures from previous postings will look very different for a few reasons. One, the old figures were forcing my network card to use GFP_ATOMIC in attempt to replicate Simon's problem. Second, I previous specified slub_min_order=3 again in an attempt to reproduce Simon's problem. In this posting, I'm depending on Simon to say whether his problem is fixed or not and these figures are to show the impact to the ordinary cases. Finally, the "vmscan" figures are taken from /proc/vmstat instead of the tracepoints. There is less information but recording is less disruptive. The first test of relevance was postmark with a process running in the background reading a large amount of anonymous memory in blocks. The objective was to vaguely simulate what was happening on Simon's machine and it's memory intensive enough to have kswapd awake. POSTMARK traceonly kanyzone Transactions per second: 156.00 ( 0.00%) 153.00 (-1.96%) Data megabytes read per second: 21.51 ( 0.00%) 21.52 ( 0.05%) Data megabytes written per second: 29.28 ( 0.00%) 29.11 (-0.58%) Files created alone per second: 250.00 ( 0.00%) 416.00 (39.90%) Files create/transact per second: 79.00 ( 0.00%) 76.00 (-3.95%) Files deleted alone per second: 520.00 ( 0.00%) 420.00 (-23.81%) Files delete/transact per second: 79.00 ( 0.00%) 76.00 (-3.95%) MMTests Statistics: duration User/Sys Time Running Test (seconds) 16.58 17.4 Total Elapsed Time (seconds) 218.48 222.47 VMstat Reclaim Statistics: vmscan Direct reclaims 0 4 Direct reclaim pages scanned 0 203 Direct reclaim pages reclaimed 0 184 Kswapd pages scanned 326631 322018 Kswapd pages reclaimed 312632 309784 Kswapd low wmark quickly 1 4 Kswapd high wmark quickly 122 475 Kswapd skip congestion_wait 1 0 Pages activated 700040 705317 Pages deactivated 212113 203922 Pages written 9875 6363 Total pages scanned 326631 322221 Total pages reclaimed 312632 309968 %age total pages scanned/reclaimed 95.71% 96.20% %age total pages scanned/written 3.02% 1.97% proc vmstat: Faults Major Faults 300 254 Minor Faults 645183 660284 Page ins 493588 486704 Page outs 4960088 4986704 Swap ins 1230 661 Swap outs 9869 6355 Performance is mildly affected because kswapd is no longer doing as much work and the background memory consumer process is getting in the way. Note that kswapd scanned and reclaimed fewer pages as it's less aggressive and overall fewer pages were scanned and reclaimed. Swap in/out is particularly reduced again reflecting kswapd throwing out fewer pages. The slight performance impact is unfortunate here but it looks like a direct result of kswapd being less aggressive. As the bug report is about too many pages being freed by kswapd, it may have to be accepted for now. The second test is a streaming IO benchmark that was previously used by Johannes to show regressions in page reclaim. MICRO traceonly kanyzone User/Sys Time Running Test (seconds) 29.29 28.87 Total Elapsed Time (seconds) 492.18 488.79 VMstat Reclaim Statistics: vmscan Direct reclaims 2128 1460 Direct reclaim pages scanned 2284822 1496067 Direct reclaim pages reclaimed 148919 110937 Kswapd pages scanned 15450014 16202876 Kswapd pages reclaimed 8503697 8537897 Kswapd low wmark quickly 3100 3397 Kswapd high wmark quickly 1860 7243 Kswapd skip congestion_wait 708 801 Pages activated 9635 9573 Pages deactivated 1432 1271 Pages written 223 1130 Total pages scanned 17734836 17698943 Total pages reclaimed 8652616 8648834 %age total pages scanned/reclaimed 48.79% 48.87% %age total pages scanned/written 0.00% 0.01% proc vmstat: Faults Major Faults 165 221 Minor Faults 9655785 9656506 Page ins 3880 7228 Page outs 37692940 37480076 Swap ins 0 69 Swap outs 19 15 Again fewer pages are scanned and reclaimed as expected and this time the test completed faster. Note that kswapd is hitting its watermarks faster (low and high wmark quickly) which I expect is due to kswapd reclaiming fewer pages. I also ran fs-mark, iozone and sysbench but there is nothing interesting to report in the figures. Performance is not significantly changed and the reclaim statistics look reasonable. Tgis patch: When the allocator enters its slow path, kswapd is woken up to balance the node. It continues working until all zones within the node are balanced. For order-0 allocations, this makes perfect sense but for higher orders it can have unintended side-effects. If the zone sizes are imbalanced, kswapd may reclaim heavily within a smaller zone discarding an excessive number of pages. The user-visible behaviour is that kswapd is awake and reclaiming even though plenty of pages are free from a suitable zone. This patch alters the "balance" logic for high-order reclaim allowing kswapd to stop if any suitable zone becomes balanced to reduce the number of pages it reclaims from other zones. kswapd still tries to ensure that order-0 watermarks for all zones are met before sleeping. Signed-off-by: Mel Gorman Reviewed-by: Minchan Kim Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Eric B Munson Cc: Simon Kirby Cc: KOSAKI Motohiro Cc: Shaohua Li Cc: Dave Hansen Cc: Johannes Weiner Cc: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c585a2678d83ba8fb02fa6b197de0ac7d67377f1 Author: Steven Rostedt Date: Thu Jan 13 15:46:18 2011 -0800 mm: remove likely() from grab_cache_page_write_begin() Running the annotated branch profiler on a box doing average work (firefox, evolution, xchat, distcc farm), the likely() used in grab_cache_page_write_begin() was incorrect most of the time: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 1924262 71332401 97 grab_cache_page_write_begin filemap.c 2206 Adding a trace_printk() and running the function tracer limited to just this function I can see: gconfd-2-2696 [000] 4467.268935: grab_cache_page_write_begin: page= (null) mapping=ffff8800676a9460 index=7 gconfd-2-2696 [000] 4467.268946: grab_cache_page_write_begin <-ext3_write_begin gconfd-2-2696 [000] 4467.268947: grab_cache_page_write_begin: page= (null) mapping=ffff8800676a9460 index=8 gconfd-2-2696 [000] 4467.268959: grab_cache_page_write_begin <-ext3_write_begin gconfd-2-2696 [000] 4467.268960: grab_cache_page_write_begin: page= (null) mapping=ffff8800676a9460 index=9 gconfd-2-2696 [000] 4467.268972: grab_cache_page_write_begin <-ext3_write_begin gconfd-2-2696 [000] 4467.268973: grab_cache_page_write_begin: page= (null) mapping=ffff8800676a9460 index=10 gconfd-2-2696 [000] 4467.268991: grab_cache_page_write_begin <-ext3_write_begin gconfd-2-2696 [000] 4467.268992: grab_cache_page_write_begin: page= (null) mapping=ffff8800676a9460 index=11 gconfd-2-2696 [000] 4467.269005: grab_cache_page_write_begin <-ext3_write_begin Which shows that a lot of calls from ext3_write_begin will result in the page returned by "find_lock_page" will be NULL. Signed-off-by: Steven Rostedt Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e20e87795834f2f14cb53baf657b91d9c39f92c8 Author: Steven Rostedt Date: Thu Jan 13 15:46:17 2011 -0800 mm: remove unlikely() from page_mapping() page_mapping() has a unlikely that the mapping has PAGE_MAPPING_ANON set. But running the annotated branch profiler on a normal desktop system doing vairous tasks (xchat, evolution, firefox, distcc), it is not really that unlikely that the mapping here will have the PAGE_MAPPING_ANON flag set: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 35935762 1270265395 97 page_mapping mm.h 659 1306198001 143659 0 page_mapping mm.h 657 203131478 121586 0 page_mapping mm.h 657 5415491 1116 0 page_mapping mm.h 657 74899487 1116 0 page_mapping mm.h 657 203132845 224 0 page_mapping mm.h 659 5415464 27 0 page_mapping mm.h 659 13552 0 0 page_mapping mm.h 657 13552 0 0 page_mapping mm.h 659 242630 0 0 page_mapping mm.h 657 242630 0 0 page_mapping mm.h 659 74899487 0 0 page_mapping mm.h 659 The page_mapping() is a static inline, which is why it shows up multiple times. The unlikely in page_mapping() was correct a total of 1909540379 times and incorrect 1270533123 times, with a 39% being incorrect. With this much of an error, it's best to simply remove the unlikely and have the compiler and branch prediction figure this out. Signed-off-by: Steven Rostedt Cc: KOSAKI Motohiro Cc: Nick Piggin Cc: Rik van Riel Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 088e54658f559a13c2b988086512d76fe9e8f846 Author: Steven Rostedt Date: Thu Jan 13 15:46:16 2011 -0800 mm: remove likely() from mapping_unevictable() The mapping_unevictable() has a likely() around the mapping parameter. This mapping parameter comes from page_mapping() which has an unlikely() that the page will be set as PAGE_MAPPING_ANON, and if so, it will return NULL. One would think that this unlikely() means that the mapping returned by page_mapping() would not be NULL, but where page_mapping() is used just above mapping_unevictable(), that unlikely() is incorrect most of the time. This means that the "likely(mapping)" in mapping_unevictable() is incorrect most of the time. Running the annotated branch profiler on my main box which runs firefox, evolution, xchat and is part of my distcc farm, I had this: correct incorrect % Function File Line ------- --------- - -------- ---- ---- 12872836 1269443893 98 mapping_unevictable pagemap.h 51 35935762 1270265395 97 page_mapping mm.h 659 1306198001 143659 0 page_mapping mm.h 657 203131478 121586 0 page_mapping mm.h 657 5415491 1116 0 page_mapping mm.h 657 74899487 1116 0 page_mapping mm.h 657 203132845 224 0 page_mapping mm.h 659 5415464 27 0 page_mapping mm.h 659 13552 0 0 page_mapping mm.h 657 13552 0 0 page_mapping mm.h 659 242630 0 0 page_mapping mm.h 657 242630 0 0 page_mapping mm.h 659 74899487 0 0 page_mapping mm.h 659 The page_mapping() is a static inline, which is why it shows up multiple times. The mapping_unevictable() is also a static inline but seems to be used only once in my setup. The unlikely in page_mapping() was correct a total of 1909540379 times and incorrect 1270533123 times, with a 39% being incorrect. Perhaps this is enough to remove the unlikely from page_mapping() as well. Signed-off-by: Steven Rostedt Reviewed-by: KOSAKI Motohiro Acked-by: Nick Piggin Acked-by: Rik van Riel Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddf9c6d472825ceda66b3adff0f6437dbcd37f71 Author: Tobias Klauser Date: Thu Jan 13 15:46:15 2011 -0800 vmalloc: remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e50df39f6e2c3a4a3394df62baa8a213df16c54 Author: KOSAKI Motohiro Date: Thu Jan 13 15:46:14 2011 -0800 mempolicy: remove tasklist_lock from migrate_pages Today, tasklist_lock in migrate_pages doesn't protect anything. rcu_read_lock() provide enough protection from pid hash walk. Signed-off-by: KOSAKI Motohiro Reported-by: Peter Zijlstra Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53a7706d5ed8f1a53ba062b318773160cc476dde Author: Michel Lespinasse Date: Thu Jan 13 15:46:14 2011 -0800 mlock: do not hold mmap_sem for extended periods of time __get_user_pages gets a new 'nonblocking' parameter to signal that the caller is prepared to re-acquire mmap_sem and retry the operation if needed. This is used to split off long operations if they are going to block on a disk transfer, or when we detect contention on the mmap_sem. [akpm@linux-foundation.org: remove ref to rwsem_is_contended()] Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Peter Zijlstra Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fdb2002131cd4e210b9638a4fc932ec7be491d1 Author: Michel Lespinasse Date: Thu Jan 13 15:46:12 2011 -0800 mm: move VM_LOCKED check to __mlock_vma_pages_range() Use a single code path for faulting in pages during mlock. The reason to have it in this patch series is that I did not want to update both code paths in a later change that releases mmap_sem when blocking on disk. Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Peter Zijlstra Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 110d74a921f4d272b47ef6104fcf937df808f4c8 Author: Michel Lespinasse Date: Thu Jan 13 15:46:11 2011 -0800 mm: add FOLL_MLOCK follow_page flag. Move the code to mlock pages from __mlock_vma_pages_range() to follow_page(). This allows __mlock_vma_pages_range() to not have to break down work into 16-page batches. An additional motivation for doing this within the present patch series is that it'll make it easier for a later chagne to drop mmap_sem when blocking on disk (we'd like to be able to resume at the page that was read from disk instead of at the start of a 16-page batch). Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Peter Zijlstra Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fed067da46ad3b9acedaf794a5f05d0bc153280b Author: Michel Lespinasse Date: Thu Jan 13 15:46:10 2011 -0800 mlock: only hold mmap_sem in shared mode when faulting in pages Currently mlock() holds mmap_sem in exclusive mode while the pages get faulted in. In the case of a large mlock, this can potentially take a very long time, during which various commands such as 'ps auxw' will block. This makes sysadmins unhappy: real 14m36.232s user 0m0.003s sys 0m0.015s (output from 'time ps auxw' while a 20GB file was being mlocked without being previously preloaded into page cache) I propose that mlock() could release mmap_sem after the VM_LOCKED bits have been set in all appropriate VMAs. Then a second pass could be done to actually mlock the pages, in small batches, releasing mmap_sem when we block on disk access or when we detect some contention. This patch: Before this change, mlock() holds mmap_sem in exclusive mode while the pages get faulted in. In the case of a large mlock, this can potentially take a very long time. Various things will block while mmap_sem is held, including 'ps auxw'. This can make sysadmins angry. I propose that mlock() could release mmap_sem after the VM_LOCKED bits have been set in all appropriate VMAs. Then a second pass could be done to actually mlock the pages with mmap_sem held for reads only. We need to recheck the vma flags after we re-acquire mmap_sem, but this is easy. In the case where a vma has been munlocked before mlock completes, pages that were already marked as PageMlocked() are handled by the munlock() call, and mlock() is careful to not mark new page batches as PageMlocked() after the munlock() call has cleared the VM_LOCKED vma flags. So, the end result will be identical to what'd happen if munlock() had executed after the mlock() call. In a later change, I will allow the second pass to release mmap_sem when blocking on disk accesses or when it is otherwise contended, so that it won't be held for long periods of time even in shared mode. Signed-off-by: Michel Lespinasse Tested-by: Valdis Kletnieks Cc: Hugh Dickins Cc: Rik van Riel Cc: Peter Zijlstra Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ecfda041e4b4bd858d25bbf5a16c2a6c06d7272 Author: Michel Lespinasse Date: Thu Jan 13 15:46:09 2011 -0800 mlock: avoid dirtying pages and triggering writeback When faulting in pages for mlock(), we want to break COW for anonymous or file pages within VM_WRITABLE, non-VM_SHARED vmas. However, there is no need to write-fault into VM_SHARED vmas since shared file pages can be mlocked first and dirtied later, when/if they actually get written to. Skipping the write fault is desirable, as we don't want to unnecessarily cause these pages to be dirtied and queued for writeback. Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Kosaki Motohiro Cc: Peter Zijlstra Cc: Nick Piggin Cc: Theodore Tso Cc: Michael Rubin Cc: Suleiman Souhlal Cc: Dave Chinner Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72ddc8f72270758951ccefb7d190f364d20215ab Author: Michel Lespinasse Date: Thu Jan 13 15:46:08 2011 -0800 do_wp_page: clarify dirty_page handling Reorganize the code so that dirty pages are handled closer to the place that makes them dirty (handling write fault into shared, writable VMAs). No behavior changes. Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Kosaki Motohiro Cc: Peter Zijlstra Cc: Nick Piggin Cc: Theodore Tso Cc: Michael Rubin Cc: Suleiman Souhlal Cc: Dave Chinner Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b009c024ff0059e293c1937516f2defe56263650 Author: Michel Lespinasse Date: Thu Jan 13 15:46:07 2011 -0800 do_wp_page: remove the 'reuse' flag mlocking a shared, writable vma currently causes the corresponding pages to be marked as dirty and queued for writeback. This seems rather unnecessary given that the pages are not being actually modified during mlock. It is understood that for non-shared mappings (file or anon) we want to use a write fault in order to break COW, but there is just no such need for shared mappings. The first two patches in this series do not introduce any behavior change. The intent there is to make it obvious that dirtying file pages is only done in the (writable, shared) case. I think this clarifies the code, but I wouldn't mind dropping these two patches if there is no consensus about them. The last patch is where we actually avoid dirtying shared mappings during mlock. Note that as a side effect of this, we won't call page_mkwrite() for the mappings that define it, and won't be pre-allocating data blocks at the FS level if the mapped file was sparsely allocated. My understanding is that mlock does not need to provide such guarantee, as evidenced by the fact that it never did for the filesystems that don't define page_mkwrite() - including some common ones like ext3. However, I would like to gather feedback on this from filesystem people as a precaution. If this turns out to be a showstopper, maybe block preallocation can be added back on using a different interface. Large shared mlocks are getting significantly (>2x) faster in my tests, as the disk can be fully used for reading the file instead of having to share between this and writeback. This patch: Reorganize the code to remove the 'reuse' flag. No behavior changes. Signed-off-by: Michel Lespinasse Cc: Hugh Dickins Cc: Rik van Riel Cc: Kosaki Motohiro Cc: Peter Zijlstra Cc: Nick Piggin Cc: Theodore Tso Cc: Michael Rubin Cc: Suleiman Souhlal Cc: Dave Chinner Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 212260aa07135b327752dc02625c68cf4ce04caf Author: Rik van Riel Date: Thu Jan 13 15:46:06 2011 -0800 mm: clear PageError bit in msync & fsync Temporary IO failures, eg. due to loss of both multipath paths, can permanently leave the PageError bit set on a page, resulting in msync or fsync returning -EIO over and over again, even if IO is now getting to the disk correctly. We already clear the AS_ENOSPC and AS_IO bits in mapping->flags in the filemap_fdatawait_range function. Also clearing the PageError bit on the page allows subsequent msync or fsync calls on this file to return without an error, if the subsequent IO succeeds. Unfortunately data written out in the msync or fsync call that returned -EIO can still get lost, because the page dirty bit appears to not get restored on IO error. However, the alternative could be potentially all of memory filling up with uncleanable dirty pages, hanging the system, so there is no nice choice here... Signed-off-by: Rik van Riel Acked-by: Valerie Aurora Acked-by: Jeff Layton Cc: Theodore Ts'o Acked-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dabb16f639820267b3850d804571c70bd93d4e07 Author: Mandeep Singh Baines Date: Thu Jan 13 15:46:05 2011 -0800 oom: allow a non-CAP_SYS_RESOURCE proces to oom_score_adj down We'd like to be able to oom_score_adj a process up/down as it enters/leaves the foreground. Currently, it is not possible to oom_adj down without CAP_SYS_RESOURCE. This patch allows a task to decrease its oom_score_adj back to the value that a CAP_SYS_RESOURCE thread set it to or its inherited value at fork. Assuming the thread that has forked it has oom_score_adj of 0, each process could decrease it back from 0 upon activation unless a CAP_SYS_RESOURCE thread elevated it to something higher. Alternative considered: * a setuid binary * a daemon with CAP_SYS_RESOURCE Since you don't wan't all processes to be able to reduce their oom_adj, a setuid or daemon implementation would be complex. The alternatives also have much higher overhead. This patch updated from original patch based on feedback from David Rientjes. Signed-off-by: Mandeep Singh Baines Acked-by: David Rientjes Cc: KAMEZAWA Hiroyuki Cc: KOSAKI Motohiro Cc: Rik van Riel Cc: Ying Han Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0a21265dfb5fa8ae54e90d0fb6d1c215b10a28a Author: David Rientjes Date: Thu Jan 13 15:46:02 2011 -0800 mm: unify module_alloc code for vmalloc Four architectures (arm, mips, sparc, x86) use __vmalloc_area() for module_init(). Much of the code is duplicated and can be generalized in a globally accessible function, __vmalloc_node_range(). __vmalloc_node() now calls into __vmalloc_node_range() with a range of [VMALLOC_START, VMALLOC_END) for functionally equivalent behavior. Each architecture may then use __vmalloc_node_range() directly to remove the duplication of code. Signed-off-by: David Rientjes Cc: Christoph Lameter Cc: Russell King Cc: Ralf Baechle Cc: "David S. Miller" Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec3f64fc9c196a304c4b7db3e1ff56d640628509 Author: David Rientjes Date: Thu Jan 13 15:46:01 2011 -0800 mm: remove gfp mask from pcpu_get_vm_areas pcpu_get_vm_areas() only uses GFP_KERNEL allocations, so remove the gfp_t formal and use the mask internally. Signed-off-by: David Rientjes Cc: Christoph Lameter Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5a5623b28198aa91ea71ee5d3846757fc76bc87 Author: David Rientjes Date: Thu Jan 13 15:46:00 2011 -0800 mm: remove unused get_vm_area_node get_vm_area_node() is unused in the kernel and can thus be removed. Signed-off-by: David Rientjes Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3a310bc4e5ce7e55e1c8e25c31e63af017f3e50 Author: Mel Gorman Date: Thu Jan 13 15:46:00 2011 -0800 mm: vmscan: rename lumpy_mode to reclaim_mode With compaction being used instead of lumpy reclaim, the name lumpy_mode and associated variables is a bit misleading. Rename lumpy_mode to reclaim_mode which is a better fit. There is no functional change. Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Acked-by: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9927af740b1b9b1e769310bd0b91425e8047b803 Author: Mel Gorman Date: Thu Jan 13 15:45:59 2011 -0800 mm: compaction: perform a faster migration scan when migrating asynchronously try_to_compact_pages() is initially called to only migrate pages asychronously and kswapd always compacts asynchronously. Both are being optimistic so it is important to complete the work as quickly as possible to minimise stalls. This patch alters the scanner when asynchronous to only consider MIGRATE_MOVABLE pageblocks as migration candidates. This reduces stalls when allocating huge pages while not impairing allocation success rates as a full scan will be performed if necessary after direct reclaim. Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Acked-by: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f0f24967b0349798803260b2e4bf347cffa1990 Author: Mel Gorman Date: Thu Jan 13 15:45:58 2011 -0800 mm: migration: cleanup migrate_pages API by matching types for offlining and sync With the introduction of the boolean sync parameter, the API looks a little inconsistent as offlining is still an int. Convert offlining to a bool for the sake of being tidy. Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Acked-by: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77f1fe6b08b13a87391549c8a820ddc817b6f50e Author: Mel Gorman Date: Thu Jan 13 15:45:57 2011 -0800 mm: migration: allow migration to operate asynchronously and avoid synchronous compaction in the faster path Migration synchronously waits for writeback if the initial passes fails. Callers of memory compaction do not necessarily want this behaviour if the caller is latency sensitive or expects that synchronous migration is not going to have a significantly better success rate. This patch adds a sync parameter to migrate_pages() allowing the caller to indicate if wait_on_page_writeback() is allowed within migration or not. For reclaim/compaction, try_to_compact_pages() is first called asynchronously, direct reclaim runs and then try_to_compact_pages() is called synchronously as there is a greater expectation that it'll succeed. [akpm@linux-foundation.org: build/merge fix] Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Acked-by: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e7d344970673c5334cf7b5bb27c8c0942b06126 Author: Mel Gorman Date: Thu Jan 13 15:45:56 2011 -0800 mm: vmscan: reclaim order-0 and use compaction instead of lumpy reclaim Lumpy reclaim is disruptive. It reclaims a large number of pages and ignores the age of the pages it reclaims. This can incur significant stalls and potentially increase the number of major faults. Compaction has reached the point where it is considered reasonably stable (meaning it has passed a lot of testing) and is a potential candidate for displacing lumpy reclaim. This patch introduces an alternative to lumpy reclaim whe compaction is available called reclaim/compaction. The basic operation is very simple - instead of selecting a contiguous range of pages to reclaim, a number of order-0 pages are reclaimed and then compaction is later by either kswapd (compact_zone_order()) or direct compaction (__alloc_pages_direct_compact()). [akpm@linux-foundation.org: fix build] [akpm@linux-foundation.org: use conventional task_struct naming] Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Acked-by: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee64fc9354e515a79c7232cfde65c88ec627308b Author: Mel Gorman Date: Thu Jan 13 15:45:55 2011 -0800 mm: vmscan: convert lumpy_mode into a bitmask Currently lumpy_mode is an enum and determines if lumpy reclaim is off, syncronous or asyncronous. In preparation for using compaction instead of lumpy reclaim, this patch converts the flags into a bitmap. Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Cc: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7aba6984dc048503b69c2a885098cdd430832bf Author: Mel Gorman Date: Thu Jan 13 15:45:54 2011 -0800 mm: compaction: add trace events for memory compaction activity In preparation for a patches promoting the use of memory compaction over lumpy reclaim, this patch adds trace points for memory compaction activity. Using them, we can monitor the scanning activity of the migration and free page scanners as well as the number and success rates of pages passed to page migration. Signed-off-by: Mel Gorman Cc: Andrea Arcangeli Cc: KOSAKI Motohiro Cc: Rik van Riel Cc: Johannes Weiner Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d90508f638241a2e7422d884767398296ebe720 Author: Nikanth Karthikesan Date: Thu Jan 13 15:45:53 2011 -0800 mm: smaps: export mlock information Currently there is no way to find whether a process has locked its pages in memory or not. And which of the memory regions are locked in memory. Add a new field "Locked" to export this information via the smaps file. Signed-off-by: Nikanth Karthikesan Acked-by: Balbir Singh Acked-by: Wu Fengguang Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62c70bce8ac236514c610020bb1ae5b8bde965cb Author: Joe Perches Date: Thu Jan 13 15:45:52 2011 -0800 mm: convert sprintf_symbol to %pS Signed-off-by: Joe Perches Acked-by: Pekka Enberg Cc: Jiri Kosina Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c32b0d4b3f19c2f5d29568f8b7b72b61693f1277 Author: Hai Shan Date: Thu Jan 13 15:45:51 2011 -0800 fs/mpage.c: consolidate code Merge mpage_end_io_read() and mpage_end_io_write() into mpage_end_io() to eliminate code duplication. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Hai Shan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9cbb4cb21b19fff46cf1174d0ed699ef710e641c Author: Nick Piggin Date: Thu Jan 13 15:45:51 2011 -0800 mm: find_get_pages_contig fixlet Testing ->mapping and ->index without a ref is not stable as the page may have been reused at this point. Signed-off-by: Nick Piggin Reviewed-by: Wu Fengguang Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0bc0a60b13f209df16062f94e9fb4b90dc08708 Author: KOSAKI Motohiro Date: Thu Jan 13 15:45:50 2011 -0800 vmscan: factor out kswapd sleeping logic from kswapd() Currently, kswapd() has deep nesting and is slightly hard to read. Clean this up. Signed-off-by: KOSAKI Motohiro Cc: Mel Gorman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3f0da631539b3b8e17f6dda567af9958d49d14f Author: Bob Liu Date: Thu Jan 13 15:45:49 2011 -0800 mm/page-writeback.c: fix __set_page_dirty_no_writeback() return value __set_page_dirty_no_writeback() should return true if it actually transitioned the page from a clean to dirty state although it seems nobody uses its return value at present. Signed-off-by: Bob Liu Acked-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c691b9d983d7015d54057034f4cd9b6d8affd976 Author: Andrew Morton Date: Thu Jan 13 15:45:48 2011 -0800 sync_inode_metadata: fix comment Use correct function name, remove incorrect apostrophe Cc: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b9543dac5bbc4aef0a598965b6b34f6259ab9a9b Author: Jan Kara Date: Thu Jan 13 15:45:48 2011 -0800 writeback: avoid livelocking WB_SYNC_ALL writeback When wb_writeback() is called in WB_SYNC_ALL mode, work->nr_to_write is usually set to LONG_MAX. The logic in wb_writeback() then calls __writeback_inodes_sb() with nr_to_write == MAX_WRITEBACK_PAGES and we easily end up with non-positive nr_to_write after the function returns, if the inode has more than MAX_WRITEBACK_PAGES dirty pages at the moment. When nr_to_write is <= 0 wb_writeback() decides we need another round of writeback but this is wrong in some cases! For example when a single large file is continuously dirtied, we would never finish syncing it because each pass would be able to write MAX_WRITEBACK_PAGES and inode dirty timestamp never gets updated (as inode is never completely clean). Thus __writeback_inodes_sb() would write the redirtied inode again and again. Fix the issue by setting nr_to_write to LONG_MAX in WB_SYNC_ALL mode. We do not need nr_to_write in WB_SYNC_ALL mode anyway since write_cache_pages() does livelock avoidance using page tagging in WB_SYNC_ALL mode. This makes wb_writeback() call __writeback_inodes_sb() only once on WB_SYNC_ALL. The latter function won't livelock because it works on - a finite set of files by doing queue_io() once at the beginning - a finite set of pages by PAGECACHE_TAG_TOWRITE page tagging After this patch, program from http://lkml.org/lkml/2010/10/24/154 is no longer able to stall sync forever. [fengguang.wu@intel.com: fix locking comment] Signed-off-by: Jan Kara Signed-off-by: Wu Fengguang Cc: Johannes Weiner Cc: Dave Chinner Cc: Christoph Hellwig Cc: Jan Engelhardt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa373cf550994623efb5d49a4d8775bafd10bbc1 Author: Jan Kara Date: Thu Jan 13 15:45:47 2011 -0800 writeback: stop background/kupdate works from livelocking other works Background writeback is easily livelockable in a loop in wb_writeback() by a process continuously re-dirtying pages (or continuously appending to a file). This is in fact intended as the target of background writeback is to write dirty pages it can find as long as we are over dirty_background_threshold. But the above behavior gets inconvenient at times because no other work queued in the flusher thread's queue gets processed. In particular, since e.g. sync(1) relies on flusher thread to do all the IO for it, sync(1) can hang forever waiting for flusher thread to do the work. Generally, when a flusher thread has some work queued, someone submitted the work to achieve a goal more specific than what background writeback does. Moreover by working on the specific work, we also reduce amount of dirty pages which is exactly the target of background writeout. So it makes sense to give specific work a priority over a generic page cleaning. Thus we interrupt background writeback if there is some other work to do. We return to the background writeback after completing all the queued work. This may delay the writeback of expired inodes for a while, however the expired inodes will eventually be flushed to disk as long as the other works won't livelock. [fengguang.wu@intel.com: update comment] Signed-off-by: Jan Kara Signed-off-by: Wu Fengguang Cc: Johannes Weiner Cc: Dave Chinner Cc: Christoph Hellwig Cc: Jan Engelhardt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71927e84e0aebfbe5a91565c3b207af25a4e9162 Author: Wu Fengguang Date: Thu Jan 13 15:45:46 2011 -0800 writeback: trace wakeup event for background writeback This tracks when balance_dirty_pages() tries to wakeup the flusher thread for background writeback (if it was not started already). Suggested-by: Christoph Hellwig Signed-off-by: Wu Fengguang Cc: Jan Kara Cc: Johannes Weiner Cc: Dave Chinner Cc: Jan Engelhardt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6585027a5e8cb490e3a761b2f3f3c3acf722aff2 Author: Jan Kara Date: Thu Jan 13 15:45:44 2011 -0800 writeback: integrated background writeback work Check whether background writeback is needed after finishing each work. When bdi flusher thread finishes doing some work check whether any kind of background writeback needs to be done (either because dirty_background_ratio is exceeded or because we need to start flushing old inodes). If so, just do background write back. This way, bdi_start_background_writeback() just needs to wake up the flusher thread. It will do background writeback as soon as there is no other work. This is a preparatory patch for the next patch which stops background writeback as soon as there is other work to do. Signed-off-by: Jan Kara Signed-off-by: Wu Fengguang Cc: Johannes Weiner Cc: Dave Chinner Cc: Christoph Hellwig Cc: Jan Engelhardt Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b44129b30652c8771db2265939bb8b463724043d Author: Mel Gorman Date: Thu Jan 13 15:45:43 2011 -0800 mm: vmstat: use a single setter function and callback for adjusting percpu thresholds reduce_pgdat_percpu_threshold() and restore_pgdat_percpu_threshold() exist to adjust the per-cpu vmstat thresholds while kswapd is awake to avoid errors due to counter drift. The functions duplicate some code so this patch replaces them with a single set_pgdat_percpu_threshold() that takes a callback function to calculate the desired threshold as a parameter. [akpm@linux-foundation.org: readability tweak] [kosaki.motohiro@jp.fujitsu.com: set_pgdat_percpu_threshold(): don't use for_each_online_cpu] Signed-off-by: Mel Gorman Reviewed-by: Christoph Lameter Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88f5acf88ae6a9778f6d25d0d5d7ec2d57764a97 Author: Mel Gorman Date: Thu Jan 13 15:45:41 2011 -0800 mm: page allocator: adjust the per-cpu counter threshold when memory is low Commit aa45484 ("calculate a better estimate of NR_FREE_PAGES when memory is low") noted that watermarks were based on the vmstat NR_FREE_PAGES. To avoid synchronization overhead, these counters are maintained on a per-cpu basis and drained both periodically and when a threshold is above a threshold. On large CPU systems, the difference between the estimate and real value of NR_FREE_PAGES can be very high. The system can get into a case where pages are allocated far below the min watermark potentially causing livelock issues. The commit solved the problem by taking a better reading of NR_FREE_PAGES when memory was low. Unfortately, as reported by Shaohua Li this accurate reading can consume a large amount of CPU time on systems with many sockets due to cache line bouncing. This patch takes a different approach. For large machines where counter drift might be unsafe and while kswapd is awake, the per-cpu thresholds for the target pgdat are reduced to limit the level of drift to what should be a safe level. This incurs a performance penalty in heavy memory pressure by a factor that depends on the workload and the machine but the machine should function correctly without accidentally exhausting all memory on a node. There is an additional cost when kswapd wakes and sleeps but the event is not expected to be frequent - in Shaohua's test case, there was one recorded sleep and wake event at least. To ensure that kswapd wakes up, a safe version of zone_watermark_ok() is introduced that takes a more accurate reading of NR_FREE_PAGES when called from wakeup_kswapd, when deciding whether it is really safe to go back to sleep in sleeping_prematurely() and when deciding if a zone is really balanced or not in balance_pgdat(). We are still using an expensive function but limiting how often it is called. When the test case is reproduced, the time spent in the watermark functions is reduced. The following report is on the percentage of time spent cumulatively spent in the functions zone_nr_free_pages(), zone_watermark_ok(), __zone_watermark_ok(), zone_watermark_ok_safe(), zone_page_state_snapshot(), zone_page_state(). vanilla 11.6615% disable-threshold 0.2584% David said: : We had to pull aa454840 "mm: page allocator: calculate a better estimate : of NR_FREE_PAGES when memory is low and kswapd is awake" from 2.6.36 : internally because tests showed that it would cause the machine to stall : as the result of heavy kswapd activity. I merged it back with this fix as : it is pending in the -mm tree and it solves the issue we were seeing, so I : definitely think this should be pushed to -stable (and I would seriously : consider it for 2.6.37 inclusion even at this late date). Signed-off-by: Mel Gorman Reported-by: Shaohua Li Reviewed-by: Christoph Lameter Tested-by: Nicolas Bareil Cc: David Rientjes Cc: Kyle McMartin Cc: [2.6.37.1, 2.6.36.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43bb40c9e3aa51a3b038c9df2c9afb4d4685614d Author: Dave Jones Date: Thu Jan 13 15:45:40 2011 -0800 sched: remove long deprecated CLONE_STOPPED flag This warning was added in commit bdff746a3915 ("clone: prepare to recycle CLONE_STOPPED") three years ago. 2.6.26 came and went. As far as I know, no-one is actually using CLONE_STOPPED. Signed-off-by: Dave Jones Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Tejun Heo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dfbd1d734ef5415bc47b034df7433ba21e40e7b Author: Claudio Scordino Date: Thu Jan 13 15:45:39 2011 -0800 atmel_serial: fix RTS high after initialization in RS485 mode When working in RS485 mode, the atmel_serial driver keeps RTS high after the initialization of the serial port. It goes low only after the first character has been sent. [akpm@linux-foundation.org: simplify code] Signed-off-by: Claudio Scordino Signed-off-by: Arkadiusz Bubala Tested-by: Arkadiusz Bubala Cc: Nicolas Ferre Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c9ae009b298753a3baf71298d676a68b5a10c8f Author: Eric Dumazet Date: Thu Jan 13 15:45:38 2011 -0800 irq: use per_cpu kstat_irqs Use modern per_cpu API to increment {soft|hard}irq counters, and use per_cpu allocation for (struct irq_desc)->kstats_irq instead of an array. This gives better SMP/NUMA locality and saves few instructions per irq. With small nr_cpuids values (8 for example), kstats_irq was a small array (less than L1_CACHE_BYTES), potentially source of false sharing. In the !CONFIG_SPARSE_IRQ case, remove the huge, NUMA/cache unfriendly kstat_irqs_all[NR_IRQS][NR_CPUS] array. Note: we still populate kstats_irq for all possible irqs in early_irq_init(). We probably could use on-demand allocations. (Code included in alloc_descs()). Problem is not all IRQS are used with a prior alloc_descs() call. kstat_irqs_this_cpu() is not used anymore, remove it. Signed-off-by: Eric Dumazet Reviewed-by: Christoph Lameter Cc: Ingo Molnar Cc: Andi Kleen Cc: Tejun Heo Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 558bbb2fc75fd9676e07e347c021865e326c56db Author: Bruce Chang Date: Thu Jan 13 15:45:37 2011 -0800 MAINTAINERS: update entries affecting VIA Technologies Since the original maintainer-Joseph Chan (josephchan@via.com.tw) doesn't handle the Linux driver for VIA now, I would like to request to update the maintainer for the SD/MMC CARD CONTROLLER DRIVER and VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER before we find a better one. Signed-off-by: Bruce Chang Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Geert Uytterhoeven Cc: Harald Welte Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6bcfd94c0a97c11ce9197ade93a08bc8af6e057 Merge: 509e4ae 9d09e66 Author: Linus Torvalds Date: Thu Jan 13 17:30:47 2011 -0800 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: (32 commits) dm: raid456 basic support dm: per target unplug callback support dm: introduce target callbacks and congestion callback dm mpath: delay activate_path retry on SCSI_DH_RETRY dm: remove superfluous irq disablement in dm_request_fn dm log: use PTR_ERR value instead of ENOMEM dm snapshot: avoid storing private suspended state dm snapshot: persistent make metadata_wq multithreaded dm: use non reentrant workqueues if equivalent dm: convert workqueues to alloc_ordered dm stripe: switch from local workqueue to system_wq dm: dont use flush_scheduled_work dm snapshot: remove unused dm_snapshot queued_bios_work dm ioctl: suppress needless warning messages dm crypt: add loop aes iv generator dm crypt: add multi key capability dm crypt: add post iv call to iv generator dm crypt: use io thread for reads only if mempool exhausted dm crypt: scale to multiple cpus dm crypt: simplify compatible table output ... commit 509e4aef44eb10e4aef1f81c3c3ff1214671503b Merge: 375b6f5 bf2cb0d Author: Linus Torvalds Date: Thu Jan 13 17:30:20 2011 -0800 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: Fix removal of extra drives when converting RAID6 to RAID5 md: range check slot number when manually adding a spare. md/raid5: handle manually-added spares in start_reshape. md: fix sync_completed reporting for very large drives (>2TB) md: allow suspend_lo and suspend_hi to decrease as well as increase. md: Don't let implementation detail of curr_resync leak out through sysfs. md: separate meta and data devs md-new-param-to_sync_page_io md-new-param-to-calc_dev_sboffset md: Be more careful about clearing flags bit in ->recovery md: md_stop_writes requires mddev_lock. md/raid5: use sysfs_notify_dirent_safe to avoid NULL pointer md: Ensure no IO request to get md device before it is properly initialised. md: Fix single printks with multiple KERN_s md: fix regression resulting in delays in clearing bits in a bitmap md: fix regression with re-adding devices to arrays with no metadata commit 375b6f5a40a3d8373561a3dbeed440a845e6d379 Merge: d8a3515 0957977 Author: Linus Torvalds Date: Thu Jan 13 17:29:53 2011 -0800 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] fix build error - arch/ia64/kernel/perfmon.c commit d8a3515e2a9523f8ed56d1f4537d16338bda2bc2 Author: Linus Torvalds Date: Thu Jan 13 17:26:46 2011 -0800 Revert "gpiolib: annotate gpio-intialization with __must_check" This reverts commit 0fdae42d361bbb431ca0ab0efed5126a94821177, which wasn't really supposed to go in, and causes lots of annoying warnings. Quoth Andrew: "Complete brainfart - I meant to drop that patch ages ago." Quoth Greg: "Ick, yeah, that patch isn't ok to go in as-is, all of the callers need to be fixed up first, which is what I thought we had agreed on..." Reported-by: Stephen Rothwell Acked-by: Andrew Morton Acked-by: Greg KH Signed-off-by: Linus Torvalds commit 6254b32b5791e47ba1c679d023f26985fa34755a Author: Linus Torvalds Date: Thu Jan 13 17:19:38 2011 -0800 ecryptfs: fix broken build Stephen Rothwell reports that the vfs merge broke the build of ecryptfs. The breakage comes from commit 66cb76666d69 ("sanitize ecryptfs ->mount()") which was obviously not even build tested. Tssk, tssk, Al. This is the minimal build fixup for the situation, although I don't have a filesystem to actually test it with. Reported-by: Stephen Rothwell Cc: Al Viro Signed-off-by: Linus Torvalds commit 09579770dcb8769f4f61046dcd01cc758cfa6d91 Author: Tony Luck Date: Thu Jan 13 14:49:56 2011 -0800 [IA64] fix build error - arch/ia64/kernel/perfmon.c arch/ia64/kernel/perfmon.c:621: error: duplicate 'static' Introduced by commit c74a1cbb3cac348f276fabc381758f5b0b4713b2 pass default dentry_operations to mount_pseudo() Signed-off-by: Tony Luck commit bf2cb0dab8c97f00a71875d9b13dbac17a2f47ca Author: NeilBrown Date: Fri Jan 14 09:14:34 2011 +1100 md: Fix removal of extra drives when converting RAID6 to RAID5 When a RAID6 is converted to a RAID5, the extra drive should be discarded. However it isn't due to a typo in a comparison. This bug was introduced in commit e93f68a1fc6 in 2.6.35-rc4 and is suitable for any -stable since than. As the extra drive is not removed, the 'degraded' counter is wrong and so the RAID5 will not respond correctly to a subsequent failure. Cc: stable@kernel.org Signed-off-by: NeilBrown commit ba1b41b6b4e30cb66ae2775faadea05cae3ce61c Author: NeilBrown Date: Fri Jan 14 09:14:34 2011 +1100 md: range check slot number when manually adding a spare. When adding a spare to an active array, we should check the slot number, but allow it to be larger than raid_disks if a reshape is being prepared. Apply the same test when adding a device to an array-under-construction. It already had most of the test in place, but not quite all. Signed-off-by: NeilBrown commit 1a940fcee31ec6c18c2f24dbdad31d54e4c35048 Author: NeilBrown Date: Fri Jan 14 09:14:34 2011 +1100 md/raid5: handle manually-added spares in start_reshape. It is possible to manually add spares to specific slots before starting a reshape. raid5_start_reshape should recognised this possibility and include it in the accounting. Signed-off-by: NeilBrown commit 13ae864bc86ff65547ffe7e966b6433a0d0edb8a Author: Rémi Rérolle Date: Fri Jan 14 09:14:34 2011 +1100 md: fix sync_completed reporting for very large drives (>2TB) The values exported in the sync_completed file are unsigned long, which overflows with very large drives, resulting in wrong values reported. Since sync_completed uses sectors as unit, we'll start getting wrong values with components larger than 2TB. This patch simply replaces the use of unsigned long by unsigned long long. Signed-off-by: Rémi Rérolle Signed-off-by: NeilBrown commit 23ddff3792f61193695114c68d6ebd57e974c4f8 Author: NeilBrown Date: Fri Jan 14 09:14:34 2011 +1100 md: allow suspend_lo and suspend_hi to decrease as well as increase. The sysfs attributes 'suspend_lo' and 'suspend_hi' describe a region to which read/writes are suspended so that the under lying data can be manipulated without user-space noticing. Currently the window they describe can only move forwards along the device. However this is an unnecessary restriction which will cause problems with planned developments. So relax this restriction and allow these endpoints to move arbitrarily. Signed-off-by: NeilBrown commit 75d3da43cb74d2e5fb87816dbfecb839cd97c7f4 Author: NeilBrown Date: Fri Jan 14 09:14:34 2011 +1100 md: Don't let implementation detail of curr_resync leak out through sysfs. mddev->curr_resync has artificial values of '1' and '2' which are used by the code which ensures only one resync is happening at a time on any given device. These values are internal and should never be exposed to user-space (except when translated appropriately as in the 'pending' status in /proc/mdstat). Unfortunately they are as ->curr_resync is assigned to ->curr_resync_completed and that value is directly visible through sysfs. So change the assignments to ->curr_resync_completed to get the same valued from elsewhere in a form that doesn't have the magic '1' or '2' values. Signed-off-by: NeilBrown commit a6ff7e089c7fca813c956ccbed824087e89a3a49 Author: Jonathan Brassow Date: Fri Jan 14 09:14:34 2011 +1100 md: separate meta and data devs Allow the metadata to be on a separate device from the data. This doesn't mean the data and metadata will by on separate physical devices - it simply gives device-mapper and userspace tools more flexibility. Signed-off-by: NeilBrown commit ccebd4c4159462c96397ae9af9c667bb394d7b70 Author: Jonathan Brassow Date: Fri Jan 14 09:14:33 2011 +1100 md-new-param-to_sync_page_io Add new parameter to 'sync_page_io'. The new parameter allows us to distinguish between metadata and data operations. This becomes important later when we add the ability to use separate devices for data and metadata. Signed-off-by: Jonathan Brassow commit 57b2caa394393f8870ed41bdcc38a7542593018f Author: Jonathan Brassow Date: Fri Jan 14 09:14:33 2011 +1100 md-new-param-to-calc_dev_sboffset When we allow for separate devices for data and metadata in a later patch, we will need to be able to calculate the superblock offset based on more than the bdev. Signed-off-by: Jonathan Brassow commit 7ebc0be7fff4146e87b4078f054977b72998abd3 Author: NeilBrown Date: Fri Jan 14 09:14:33 2011 +1100 md: Be more careful about clearing flags bit in ->recovery Setting ->recovery to 0 is generally not a good idea as it could clear bits that shouldn't be cleared. In particular, MD_RECOVERY_FROZEN should only be cleared on explicit request from user-space. So when we need to clear things, just clear the bits that need clearing. As there are a few different places which reap a resync process - and some do an incomplte job - factor out the code for doing the from md_check_recovery and call that function instead of open coding part of it. Signed-off-by: NeilBrown Reported-by: Jonathan Brassow commit defad61a5b16352d3e22a04d4c930a5b5a7fd1f0 Author: NeilBrown Date: Fri Jan 14 09:14:33 2011 +1100 md: md_stop_writes requires mddev_lock. As md_stop_writes manipulates the sync_thread and calls md_update_sb, it need to be called with mddev_lock held. In all internal cases it is, but the symbol is exported for dm-raid to call and in that case the lock won't be help. Do make an exported version which takes the lock, and an internal version which does not. Signed-off-by: NeilBrown commit 43c73ca43b3e03bb228ff9350b6b44d0e560f262 Author: Jonathan Brassow Date: Fri Jan 14 09:14:33 2011 +1100 md/raid5: use sysfs_notify_dirent_safe to avoid NULL pointer With the module parameter 'start_dirty_degraded' set, raid5_spare_active() previously called sysfs_notify_dirent() with a NULL argument (rdev->sysfs_state) when a rebuild finished. Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer commit 0ca69886a8273ac1350143d562280bfcbe4760dc Author: NeilBrown Date: Fri Jan 14 09:14:33 2011 +1100 md: Ensure no IO request to get md device before it is properly initialised. When an md device is in the process of coming on line it is possible for an IO request (typically a partition table probe) to get through before the array is fully initialised, which can cause unexpected behaviour (e.g. a crash). So explicitly record when the array is ready for IO and don't allow IO through until then. There is no possibility for a similar problem when the array is going off-line as there must only be one 'open' at that time, and it is busy off-lining the array and so cannot send IO requests. So no memory barrier is needed in md_stop() This has been a bug since commit 409c57f3801 in 2.6.30 which introduced md_make_request. Before then, each personality would register its own make_request_fn when it was ready. This is suitable for any stable kernel from 2.6.30.y onwards. Cc: Signed-off-by: NeilBrown Reported-by: "Hawrylewicz Czarnowski, Przemyslaw" commit 067032bc628598606056412594042564fcf09e22 Author: Joe Perches Date: Fri Jan 14 09:14:33 2011 +1100 md: Fix single printks with multiple KERN_s Noticed-by: Russell King Signed-off-by: Joe Perches Signed-off-by: NeilBrown commit 6c9879101442b08581e8a0e3ae6b7f643a78fd63 Author: NeilBrown Date: Fri Jan 14 09:13:53 2011 +1100 md: fix regression resulting in delays in clearing bits in a bitmap commit 589a594be1fb (2.6.37-rc4) fixed a problem were md_thread would sometimes call the ->run function at a bad time. If an error is detected during array start up after the md_thread has been started, the md_thread is killed. This resulted in the ->run function being called once. However the array may not be in a state that it is safe to call ->run. However the fix imposed meant that ->run was not called on a timeout. This means that when an array goes idle, bitmap bits do not get cleared promptly. While the array is busy the bits will still be cleared when appropriate so this is not very serious. There is no risk to data. Change the test so that we only avoid calling ->run when the thread is being stopped. This more explicitly addresses the problem situation. This is suitable for 2.6.37-stable and any -stable kernel to which 589a594be1fb was applied. Cc: stable@kernel.org Signed-off-by: NeilBrown commit 5b874e25c5c84bc45fc205407286fbe4744f4776 Author: Ben Hutchings Date: Wed Jan 12 19:11:05 2011 +0000 sfc: Restore the effect of the rss_cpus module parameter Commit a4900ac ("sfc: Create multiple TX queues") accidentally disabled the rss_cpus module parameter. Signed-off-by: Ben Hutchings commit 976534319b0823aae29237d02e29a32ebcd5f910 Author: Ben Hutchings Date: Wed Jan 12 18:26:56 2011 +0000 sfc: Make efx_get_tx_queue() an inline function Signed-off-by: Ben Hutchings commit 695b83495e2fba9d3a883193cfc9d5eefa96a911 Author: Bart Van Assche Date: Thu Jan 13 19:02:25 2011 +0000 IB/srp: Test only once whether iu allocation succeeded Merge the two tests in srp_queuecommand() of whether information unit allocation succeeded into one. An intended side effect of this change is that we fix the warning: drivers/infiniband/ulp/srp/ib_srp.c: In function 'srp_queuecommand': drivers/infiniband/ulp/srp/ib_srp.c:1116: warning: 'req' may be used uninitialized in this function (seen with CONFIG_CC_OPTIMIZE_FOR_SIZE=y at least with gcc 4.4.4) Signed-off-by: Bart Van Assche Acked-by: David Dillow Signed-off-by: Roland Dreier commit 01a678c5a2f41663b8faf03d17e2bbdbf44158a9 Author: Phillip Lougher Date: Wed Jan 5 18:23:53 2011 +0000 Squashfs: simplify CONFIG_SQUASHFS_LZO handling Get rid of messy repeated #if(n)def CONFIG_SQUASHFS_LZO code in decompressor.c Signed-off-by: Phillip Lougher commit 8fcd97216f45b1691f8f91f35cc108d06e0bfca8 Author: Phillip Lougher Date: Thu Jan 6 06:08:50 2011 +0000 Squashfs: move squashfs_i() definition from squashfs.h Move squashfs_i() definition out of squashfs.h, this eliminates the need to #include squashfs_fs_i.h from numerous files. Signed-off-by: Phillip Lougher commit 6197fd86789a28760f8375b5ae8885cd7258042f Author: Phillip Lougher Date: Wed Jan 5 18:15:58 2011 +0000 Squashfs: get rid of default n in Kconfig As pointed out by Geert Uytterhoeven, "default n" is the default, no reason to specify it. Signed-off-by: Phillip Lougher commit e7ee11f0ecd587caed0063c5f68ca20fef699f32 Author: Phillip Lougher Date: Wed Jan 5 18:02:37 2011 +0000 Squashfs: add missing check in zlib_wrapper On file system corruption zlib can return Z_STREAM_OK with input buffers remaining, which will not be released. Signed-off-by: Phillip Lougher commit 170cf02165272dfe026eba183563bad973ca4f05 Author: Phillip Lougher Date: Wed Jan 5 17:52:26 2011 +0000 Squashfs: remove unnecessary variable in zlib_wrapper Get rid of unnecessary bytes variable, and remove redundant initialisation of zlib_err. Signed-off-by: Phillip Lougher commit 7a43ae523744c01b6187013e781f44c2281c579c Author: Phillip Lougher Date: Thu Dec 9 02:08:31 2010 +0000 Squashfs: Add XZ compression configuration option Signed-off-by: Phillip Lougher commit 81bb8debd0d570dc67dc1e9d8b612632cb941893 Author: Phillip Lougher Date: Thu Dec 9 02:02:29 2010 +0000 Squashfs: add XZ compression support Add support for reading file systems compressed with the XZ compression algorithm. This patch adds the XZ decompressor wrapper code. Signed-off-by: Phillip Lougher commit 1949e084bfd143c76e22c0b37f370d6e7bf4bfdd Merge: 3806b4f f31e8d4 Author: David S. Miller Date: Thu Jan 13 12:34:21 2011 -0800 Merge branch 'master' of git://1984.lsi.us.es/net-2.6 commit 2a86cb7c2b1e9eb98b36d0a3cf4444d8851968b1 Merge: 8a0eebf c975ffa Author: Linus Torvalds Date: Thu Jan 13 12:06:58 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6: avr32: update default configuration files for Atmel boards avr32: Convert to clocksource_register_hz avr32: make architecture sys_clone prototype match asm-generic prototype avr32: use syscall prototypes from asm-generic instead of arch avr32: disable kprobes for all default configurations avr32: boards: setup: use IS_ERR() instead of NULL check commit 8a0eebf66e3b1deae036553ba641a9c2bdbae678 Author: Trond Myklebust Date: Thu Jan 13 14:15:50 2011 -0500 NFS: Fix NFSv3 exclusive open semantics Commit c0204fd2b8fe047b18b67e07e1bf2a03691240cd (NFS: Clean up nfs4_proc_create()) broke NFSv3 exclusive open by removing the code that passes the O_EXCL flag down to nfs3_proc_create(). This patch reverts that offending hunk from the original commit. Reported-by: Nick Bowler Signed-off-by: Trond Myklebust Cc: stable@kernel.org [2.6.37] Tested-by: Nick Bowler Signed-off-by: Linus Torvalds commit 9d09e663d5502c46f2d9481c04c1087e1c2da698 Author: NeilBrown Date: Thu Jan 13 20:00:02 2011 +0000 dm: raid456 basic support This patch is the skeleton for the DM target that will be the bridge from DM to MD (initially RAID456 and later RAID1). It provides a way to use device-mapper interfaces to the MD RAID456 drivers. As with all device-mapper targets, the nominal public interfaces are the constructor (CTR) tables and the status outputs (both STATUSTYPE_INFO and STATUSTYPE_TABLE). The CTR table looks like the following: 1: raid \ 2: <#raid_params> \ 3: <#raid_devs> .. Line 1 contains the standard first three arguments to any device-mapper target - the start, length, and target type fields. The target type in this case is "raid". Line 2 contains the arguments that define the particular raid type/personality/level, the required arguments for that raid type, and any optional arguments. Possible raid types include: raid4, raid5_la, raid5_ls, raid5_rs, raid6_zr, raid6_nr, and raid6_nc. (again, raid1 is planned for the future.) The list of required and optional parameters is the same for all the current raid types. The required parameters are positional, while the optional parameters are given as key/value pairs. The possible parameters are as follows: Chunk size in sectors. [[no]sync] Force/Prevent RAID initialization [rebuild ] Rebuild the drive indicated by the index [daemon_sleep ] Time between bitmap daemon work to clear bits [min_recovery_rate ] Throttle RAID initialization [max_recovery_rate ] Throttle RAID initialization [max_write_behind ] See '-write-behind=' (man mdadm) [stripe_cache ] Stripe cache size for higher RAIDs Line 3 contains the list of devices that compose the array in metadata/data device pairs. If the metadata is stored separately, a '-' is given for the metadata device position. If a drive has failed or is missing at creation time, a '-' can be given for both the metadata and data drives for a given position. Examples: # RAID4 - 4 data drives, 1 parity # No metadata devices specified to hold superblock/bitmap info # Chunk size of 1MiB # (Lines separated for easy reading) 0 1960893648 raid \ raid4 1 2048 \ 5 - 8:17 - 8:33 - 8:49 - 8:65 - 8:81 # RAID4 - 4 data drives, 1 parity (no metadata devices) # Chunk size of 1MiB, force RAID initialization, # min recovery rate at 20 kiB/sec/disk 0 1960893648 raid \ raid4 4 2048 min_recovery_rate 20 sync\ 5 - 8:17 - 8:33 - 8:49 - 8:65 - 8:81 Performing a 'dmsetup table' should display the CTR table used to construct the mapping (with possible reordering of optional parameters). Performing a 'dmsetup status' will yield information on the state and health of the array. The output is as follows: 1: raid \ 2: <#devices> <1 health char for each dev> Line 1 is standard DM output. Line 2 is best shown by example: 0 1960893648 raid raid4 5 AAAAA 2/490221568 Here we can see the RAID type is raid4, there are 5 devices - all of which are 'A'live, and the array is 2/490221568 complete with recovery. Cc: linux-raid@vger.kernel.org Signed-off-by: NeilBrown Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 99d03c141b40914b67d63c9d23b8da4386422ed7 Author: NeilBrown Date: Thu Jan 13 20:00:02 2011 +0000 dm: per target unplug callback support Add per-target unplug callback support. Cc: linux-raid@vger.kernel.org Signed-off-by: NeilBrown Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 9d357b0787bb3c91835d5e658c3bda178f9ca419 Author: NeilBrown Date: Thu Jan 13 20:00:01 2011 +0000 dm: introduce target callbacks and congestion callback DM currently implements congestion checking by checking on congestion in each component device. For raid456 we need to also check if the stripe cache is congested. Add per-target congestion checker callback support. Extending the target_callbacks structure with additional callback functions allows for establishing multiple callbacks per-target (a callback is also needed for unplug). Cc: linux-raid@vger.kernel.org Signed-off-by: NeilBrown Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 4e2d19e46b507018c6ed15f6c081d8f887ae229c Author: Chandra Seetharaman Date: Thu Jan 13 20:00:01 2011 +0000 dm mpath: delay activate_path retry on SCSI_DH_RETRY This patch adds a user-configurable 'pg_init_delay_msecs' feature. Use this feature to specify the number of milliseconds to delay before retrying scsi_dh_activate, when SCSI_DH_RETRY is returned. SCSI Device Handlers return SCSI_DH_IMM_RETRY if we could retry activation immediately and SCSI_DH_RETRY in cases where it is better to retry after some delay. Currently we immediately retry scsi_dh_activate irrespective of SCSI_DH_IMM_RETRY and SCSI_DH_RETRY. The 'pg_init_delay_msecs' feature may be provided during table create or load, e.g.: dmsetup create --table "0 20971520 multipath 3 queue_if_no_path \ pg_init_delay_msecs 2500 ..." mpatha The default for 'pg_init_delay_msecs' is 2000 milliseconds. Maximum configurable delay is 60000 milliseconds. Specifying a 'pg_init_delay_msecs' of 0 will cause immediate retry. Signed-off-by: Nikanth Karthikesan Signed-off-by: Chandra Seetharaman Acked-by: Mike Christie Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 052189a2ec956810feefb6a681416c5e6a207646 Author: Kiyoshi Ueda Date: Thu Jan 13 20:00:00 2011 +0000 dm: remove superfluous irq disablement in dm_request_fn This patch changes spin_lock_irq() to spin_lock() in dm_request_fn(). This patch is just a clean-up and no functional change. The spin_lock_irq() was leftover from the early request-based dm code, where map_request() used to enable interrupts. Since current map_request() never enables interrupts, we can change it to spin_lock() to match the prior spin_unlock(). Auditing through the dm and block-layer code called from map_request(), I confirmed all functions save/restore interrupt status, so no function returning with interrupts enabled. Also I haven't observed any problem on my test environment which uses scsi and lpfc driver after heavy I/O testing with occasional path down/up. Added BUG_ON() to detect breakage in future. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit dbc883f1570d992ba926a8c9e22140ba473c6cc1 Author: Dan Carpenter Date: Thu Jan 13 20:00:00 2011 +0000 dm log: use PTR_ERR value instead of ENOMEM It's nicer to return the PTR_ERR() value instead of just returning -ENOMEM. In the current code the PTR_ERR() value is always equal to -ENOMEM so this doesn't actually affect anything, but still... In addition, dm_dirty_log_create() doesn't check for a specific -ENOMEM return. So this change is safe relative to potential for a non -ENOMEM return in the future. Signed-off-by: Dan Carpenter Acked-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit b83b2f295aec418c7501c05df4dfd168a79d165a Author: Mike Snitzer Date: Thu Jan 13 19:59:59 2011 +0000 dm snapshot: avoid storing private suspended state Use dm_suspended() rather than having each snapshot target maintain a private 'suspended' flag in struct dm_snapshot. Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 239c8dd533e74de4a7f3c85c4f9f430eb08867c1 Author: Tejun Heo Date: Thu Jan 13 19:59:59 2011 +0000 dm snapshot: persistent make metadata_wq multithreaded metadata_wq serves on-stack work items from chunk_io(). Even if multiple chunk_io() are simultaneously in progress, each is independent and queued only once, so multithreaded workqueue can be safely used. Switch metadata_wq to multithread and flush the work item instead of the workqueue in chunk_io(). Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 9c4376de98719d2768dd919553843de34bb094a6 Author: Tejun Heo Date: Thu Jan 13 19:59:58 2011 +0000 dm: use non reentrant workqueues if equivalent kmirrord_wq, kcopyd_work and md->wq are created per dm instance and serve only a single work item from the dm instance, so non-reentrant workqueues would provide the same ordering guarantees as ordered ones while allowing CPU affinity and use of the workqueues for other purposes. Switch them to non-reentrant workqueues. Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 4d4d66ab5322fa9b0f51842a76139387a40e1ce9 Author: Tejun Heo Date: Thu Jan 13 19:59:57 2011 +0000 dm: convert workqueues to alloc_ordered Convert all create[_singlethread]_work() users to the new alloc[_ordered]_workqueue(). This conversion is mechanical and doesn't introduce any behavior change. Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit f521f074abe7b3990f5df65482cdc3d851b80665 Author: Tejun Heo Date: Thu Jan 13 19:59:57 2011 +0000 dm stripe: switch from local workqueue to system_wq kstriped only serves sc->kstriped_ws which runs dm_table_event(). This doesn't need to be executed from an ordered workqueue w/ rescuer. Drop kstriped and use the system_wq instead. While at it, rename kstriped_ws to trigger_event so that it's consistent with other dm modules. Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit d5ffa387e24646cb1cb55d80fd0f182a00e0edb7 Author: Tejun Heo Date: Thu Jan 13 19:59:56 2011 +0000 dm: dont use flush_scheduled_work flush_scheduled_work() is being deprecated. Flush the used work directly instead. In all dm targets, the only work which uses system_wq is ->trigger_event. Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit fecec20e55ec117a09857ac1a455e2e6e2f17df4 Author: Tejun Heo Date: Thu Jan 13 19:59:56 2011 +0000 dm snapshot: remove unused dm_snapshot queued_bios_work dm_snapshot->queued_bios_work isn't used. Remove ->queued_bios[_work] from dm_snapshot structure, the flush_queued_bios work function and ksnapd workqueue. The DM snapshot changes that were going to use the ksnapd workqueue were either superseded (fix for origin write races) or never completed (deallocation of invalid snapshot's memory via workqueue). Signed-off-by: Tejun Heo Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 810b492375f4aed5ce222982054adc0394a4bd33 Author: Milan Broz Date: Thu Jan 13 19:59:55 2011 +0000 dm ioctl: suppress needless warning messages The device-mapper should not send warning messages to syslog if a device is not found. This can be done by userspace according to the returned dm-ioctl error code. So move these messages to debug level and use rate limiting to not flood syslog. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 34745785937a2003c144c0d4802fa637470d87af Author: Milan Broz Date: Thu Jan 13 19:59:55 2011 +0000 dm crypt: add loop aes iv generator This patch adds a compatible implementation of the block chaining mode used by the Loop-AES block device encryption system (http://loop-aes.sourceforge.net/) designed by Jari Ruusu. It operates on full 512 byte sectors and uses CBC with an IV derived from the sector number, the data and optionally extra IV seed. This means that after CBC decryption the first block of sector must be tweaked according to decrypted data. Loop-AES can use three encryption schemes: version 1: is plain aes-cbc mode (already compatible) version 2: uses 64 multikey scheme with own IV generator version 3: the same as version 2 with additional IV seed (it uses 65 keys, last key is used as IV seed) The IV generator is here named lmk (Loop-AES multikey) and for the cipher specification looks like: aes:64-cbc-lmk Version 2 and 3 is recognised according to length of provided multi-key string (which is just hexa encoded "raw key" used in original Loop-AES ioctl). Configuration of the device and decoding key string will be done in userspace (cryptsetup). (Loop-AES stores keys in gpg encrypted file, raw keys are output of simple hashing of lines in this file). Based on an implementation by Max Vozeler: http://article.gmane.org/gmane.linux.kernel.cryptoapi/3752/ Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon CC: Max Vozeler commit d1f9642381847e2b94caa34c3533211cf36ffcf4 Author: Milan Broz Date: Thu Jan 13 19:59:54 2011 +0000 dm crypt: add multi key capability This patch adds generic multikey handling to be used in following patch for Loop-AES mode compatibility. This patch extends mapping table to optional keycount and implements generic multi-key capability. With more keys defined the string is divided into several sections and these are used for tfms. The tfm is used according to sector offset (sector 0->tfm[0], sector 1->tfm[1], sector N->tfm[N modulo keycount]) (only power of two values supported for keycount here). Because of tfms per-cpu allocation, this mode can be take a lot of memory on large smp systems. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon Cc: Max Vozeler commit 2dc5327d3acb3340ab6fa3981401b076b78a51f4 Author: Milan Broz Date: Thu Jan 13 19:59:54 2011 +0000 dm crypt: add post iv call to iv generator IV (initialisation vector) can in principle depend not only on sector but also on plaintext data (or other attributes). Change IV generator interface to work directly with dmreq structure to allow such dependence in generator. Also add post() function which is called after the crypto operation. This allows tricky modification of decrypted data or IV internals. In asynchronous mode the post() can be called after ctx->sector count was increased so it is needed to add iv_sector copy directly to dmreq structure. (N.B. dmreq always include only one sector in scatterlists) Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 20c82538e4f5ede51bc2b4795bc6e5cae772796d Author: Milan Broz Date: Thu Jan 13 19:59:53 2011 +0000 dm crypt: use io thread for reads only if mempool exhausted If there is enough memory, code can directly submit bio instead queing this operation in separate thread. Try to alloc bio clone with GFP_NOWAIT and only if it fails use separate queue (map function cannot block here). Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit c029772125594e31eb1a5ad9e0913724ed9891f2 Author: Andi Kleen Date: Thu Jan 13 19:59:53 2011 +0000 dm crypt: scale to multiple cpus Currently dm-crypt does all the encryption work for a single dm-crypt mapping in a single workqueue. This does not scale well when multiple CPUs are submitting IO at a high rate. The single CPU running the single thread cannot keep up with the encryption and encrypted IO performance tanks. This patch changes the crypto workqueue to be per CPU. This means that as long as the IO submitter (or the interrupt target CPUs for reads) runs on different CPUs the encryption work will be also parallel. To avoid a bottleneck on the IO worker I also changed those to be per-CPU threads. There is still some shared data, so I suspect some bouncing cache lines. But I haven't done a detailed study on that yet. Signed-off-by: Andi Kleen Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 7dbcd137414f3877737802438926d6dba7906a9a Author: Milan Broz Date: Thu Jan 13 19:59:52 2011 +0000 dm crypt: simplify compatible table output Rename cc->cipher_mode to cc->cipher_string and store the whole of the cipher information so it can easily be printed when processing the DM_DEV_STATUS ioctl. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 86a54a4802df10d23ccd655e2083e812fe990243 Author: Jonathan Brassow Date: Thu Jan 13 19:59:52 2011 +0000 dm log userspace: add version number to comms This patch adds a 'version' field to the 'dm_ulog_request' structure. The 'version' field is taken from a portion of the unused 'padding' field in the 'dm_ulog_request' structure. This was done to avoid changing the size of the structure and possibly disrupting backwards compatibility. The version number will help notify user-space daemons when a change has been made to the kernel/userspace log API. Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 085ae0651b2791f3a430ddb76da92925b9952e13 Author: Jonathan Brassow Date: Thu Jan 13 19:59:51 2011 +0000 dm log userspace: group clear and mark requests Allow the device-mapper log's 'mark' and 'clear' requests to be grouped and processed in a batch. This can significantly reduce the amount of traffic going between the kernel and userspace (where the processing daemon resides). Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 909cc4fb48dd9870f6ebe4bd32cfbe37c102df62 Author: Jonathan Brassow Date: Thu Jan 13 19:59:50 2011 +0000 dm log userspace: split flush queue Split the 'flush_list', which contained a mix of both 'mark' and 'clear' requests, into two distinct lists ('mark_list' and 'clear_list'). The device mapper log implementations (used by various DM targets) are allowed to cache 'mark' and 'clear' requests until a 'flush' is received. Until now, these cached requests were kept in the same list. They will now be put into distinct lists to facilitate group processing of these requests (in the next patch). Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 8d35d3e37eed884ba15229a146df846f399909b4 Author: Mikulas Patocka Date: Thu Jan 13 19:59:50 2011 +0000 dm kcopyd: delay unplugging Make kcopyd merge more I/O requests by using device unplugging. Without this patch, each I/O request is dispatched separately to the device. If the device supports tagged queuing, there are many small requests sent to the device. To improve performance, this patch will batch as many requests as possible, allowing the queue to merge consecutive requests, and send them to the device at once. In my tests (15k SCSI disk), this patch improves sequential write throughput: Sequential write throughput (chunksize of 4k, 32k, 512k) unpatched: 15.2, 18.5, 17.5 MB/s patched: 14.4, 22.6, 23.0 MB/s In most common uses (snapshot or two-way mirror), kcopyd is only used for two devices, one for reading and the other for writing, thus this optimization is implemented only for two devices. The optimization may be extended to n-way mirrors with some code complexity increase. We keep track of two block devices to unplug (one for read and the other for write) and unplug them when exiting "do_work" thread. If there are more devices used (in theory it could happen, in practice it is rare), we unplug immediately. Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 4a038677df4da84e42fd68b5ab2dfa4d82baa444 Author: Jonathan Brassow Date: Thu Jan 13 19:59:49 2011 +0000 dm log userspace: trap all failed log construction errors When constructing a mirror log, it is possible for the initial request to fail for other reasons besides -ESRCH. These must be handled too. Signed-off-by: Jonathan Brassow Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 69a8cfcda21017364df1c21b720daf304b5598a6 Author: Milan Broz Date: Thu Jan 13 19:59:49 2011 +0000 dm crypt: set key size early Simplify key size verification (hexadecimal string) and set key size early in constructor. (Patch required by later changes.) Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 4a1aeb98297e17f4e0a8cdda919e63bf528b2e5d Author: Milan Broz Date: Thu Jan 13 19:59:48 2011 +0000 dm: remove dm_mutex after bkl conversion This patch replaces dm_mutex with _minor_lock in dm_blk_close() and then removes it. During the BKL conversion, commit 6e9624b8caec290d28b4c6d9ec75749df6372b87 (block: push down BKL into .open and .release) pushed lock_kernel() down into dm_blk_open/close calls. Commit 2a48fc0ab24241755dc93bfd4f01d68efab47f5a (block: autoconvert trivial BKL users to private mutex) converted it to a local mutex, but _minor_lock is sufficient. Signed-off-by: Milan Broz Signed-off-by: Alasdair G Kergon commit 5fc2ffeabb9ee0fc0e71ff16b49f34f0ed3d05b4 Author: Mike Snitzer Date: Thu Jan 13 19:59:48 2011 +0000 dm raid1: support discard Enable discard support in the DM mirror target. Also change an existing use of 'bvec' to 'addr' in the union. Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 84c89557a302e18414a011cc52b1abd034860743 Author: Peter Jones Date: Thu Jan 13 19:59:47 2011 +0000 dm ioctl: allow rename to fill empty uuid Allow the uuid of a mapped device to be set after device creation. Previously the uuid (which is optional) could only be set by DM_DEV_CREATE. If no uuid was supplied it could not be set later. Sometimes it's necessary to create the device before the uuid is known, and in such cases the uuid must be filled in after the creation. This patch extends DM_DEV_RENAME to accept a uuid accompanied by a new flag DM_UUID_FLAG. This can only be done once and if no uuid was previously supplied. It cannot be used to change an existing uuid. DM_VERSION_MINOR is also bumped to 19 to indicate this interface extension is available. Signed-off-by: Peter Jones Signed-off-by: Jonathan Brassow Signed-off-by: Alasdair G Kergon commit d9bf0b508ddfe19883b982b29a03c02ccbf53806 Author: Mikulas Patocka Date: Thu Jan 13 19:59:47 2011 +0000 dm io: remove BIO_RW_SYNCIO flag from kcopyd Remove the REQ_SYNC flag to improve write throughput when writing to the origin with a snapshot on the same device (using the CFQ I/O scheduler). Sequential write throughput (chunksize of 4k, 32k, 512k) unpatched: 8.5, 8.6, 9.3 MB/s patched: 15.2, 18.5, 17.5 MB/s Snapshot exception reallocations are triggered by writes that are usually async, so mark the associated dm_io_request as async as well. This helps when using the CFQ I/O scheduler because it has separate queues for sync and async I/O. Async is optimized for throughput; sync for latency. With this change we're consciously favoring throughput over latency. Signed-off-by: Mikulas Patocka Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 09c9d4c9b6a2b5909ae3c6265e4cd3820b636863 Author: Mike Snitzer Date: Thu Jan 13 19:59:46 2011 +0000 dm mpath: disable blk_abort_queue Revert commit 224cb3e981f1b2f9f93dbd49eaef505d17d894c2 dm: Call blk_abort_queue on failed paths Multipath began to use blk_abort_queue() to allow for lower latency path deactivation. This was found to cause list corruption: the cmd gets blk_abort_queued/timedout run on it and the scsi eh somehow is able to complete and run scsi_queue_insert while scsi_request_fn is still trying to process the request. https://www.redhat.com/archives/dm-devel/2010-November/msg00085.html Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon Cc: Mike Anderson Cc: Mike Christie Cc: stable@kernel.org commit c217649bf2d60ac119afd71d938278cffd55962b Author: Mike Snitzer Date: Thu Jan 13 19:53:46 2011 +0000 dm: dont take i_mutex to change device size No longer needlessly hold md->bdev->bd_inode->i_mutex when changing the size of a DM device. This additional locking is unnecessary because i_size_write() is already protected by the existing critical section in dm_swap_table(). DM already has a reference on md->bdev so the associated bd_inode may be changed without lifetime concerns. A negative side-effect of having held md->bdev->bd_inode->i_mutex was that a concurrent DM device resize and flush (via fsync) would deadlock. Dropping md->bdev->bd_inode->i_mutex eliminates this potential for deadlock. The following reproducer no longer deadlocks: https://www.redhat.com/archives/dm-devel/2009-July/msg00284.html Signed-off-by: Mike Snitzer Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon Cc: stable@kernel.org commit c975ffadd144e8e99e83e8f80ee94efce4f170b5 Author: Hans-Christian Egtvedt Date: Thu Jan 13 12:18:32 2011 +0100 avr32: update default configuration files for Atmel boards This patch adjusts some values to make the default configuration for Atmel boards more similar, and adds missing values to enable required functions. Also remove defined symbols for functions not in use. Signed-off-by: Hans-Christian Egtvedt commit 1e2de47cddc70ae973cf468e2f2954b4ae80f4e3 Author: John Stultz Date: Mon Nov 1 13:12:27 2010 -0700 avr32: Convert to clocksource_register_hz This converts the avr32 clocksource to use clocksource_register_hz. This is untested, so any assistance in testing would be appreciated! CC: Hans-Christian Egtvedt CC: Thomas Gleixner Signed-off-by: John Stultz commit 992a88b62ca327f10d82dbad71a8c061d4229888 Author: Hans-Christian Egtvedt Date: Thu Dec 9 09:02:06 2010 +0100 avr32: make architecture sys_clone prototype match asm-generic prototype This patch will fix the arguments to the architecture sys_clone() function to match the asm-generic/syscalls.h prototype. In the same go remove the architecture specific prototype for the same function. The sys_clone() function is only called from assembly, hence the argument types were not having any affect. Signed-off-by: Hans-Christian Egtvedt commit 664cb7142ced8b827e92e1851d1ed2cae922f225 Author: Hans-Christian Egtvedt Date: Thu Dec 9 00:19:33 2010 +0100 avr32: use syscall prototypes from asm-generic instead of arch This patch removes the redundant syscalls prototypes in the architecture specific syscalls.h header file. These were identical with the ones in asm-generic/syscalls.h. Signed-off-by: Hans-Christian Egtvedt Reported-by: Peter Huewe Reported-by: Sven Schnelle Cc: stable commit 12be8e71bf17d403b8f7866a3581ef34b77ea16f Author: Hans-Christian Egtvedt Date: Thu Dec 9 08:54:55 2010 +0100 avr32: disable kprobes for all default configurations This patch will disable kprobes for all the default AVR32 board configurations. This works around a regression in kprobes which seems to be related to AVR32 is now lacking the struct kprobe_ctlblk. Signed-off-by: Hans-Christian Egtvedt commit 36b471e047a77eaf3ec8e693bd9d8291c4dfd864 Author: Vasiliy Kulikov Date: Fri Nov 26 20:06:12 2010 +0300 avr32: boards: setup: use IS_ERR() instead of NULL check clk_get() returns ERR_PTR() on error, not NULL. Signed-off-by: Vasiliy Kulikov Acked-by: Hans-Christian Egtvedt commit 581548db3b3c0f6e25b500329eb02e3c72e7acbe Merge: 03a4491 dff0092 Author: Linus Torvalds Date: Thu Jan 13 11:02:55 2011 -0800 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] Fix format warning in arch/ia64/kernel/acpi.c commit 03a4491f5d6835028dbbcf36990599c5c9f6ff55 Merge: 7b0cb1b 1427130 Author: Linus Torvalds Date: Thu Jan 13 11:02:05 2011 -0800 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: ohci: fix compilation on arches without PAGE_KERNEL_RO commit 7b0cb1bdac9e941141e3790785955ed933d476f3 Merge: 275220f e6e1ee9 Author: Linus Torvalds Date: Thu Jan 13 10:50:24 2011 -0800 Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block: cciss: reinstate proper FIFO order of command queue list floppy: replace NO_GEOM macro with a function commit 275220f0fcff1adf28a717076e00f575edf05fda Merge: fe3c560 81c5e2a Author: Linus Torvalds Date: Thu Jan 13 10:45:01 2011 -0800 Merge branch 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block * 'for-2.6.38/core' of git://git.kernel.dk/linux-2.6-block: (43 commits) block: ensure that completion error gets properly traced blktrace: add missing probe argument to block_bio_complete block cfq: don't use atomic_t for cfq_group block cfq: don't use atomic_t for cfq_queue block: trace event block fix unassigned field block: add internal hd part table references block: fix accounting bug on cross partition merges kref: add kref_test_and_get bio-integrity: mark kintegrityd_wq highpri and CPU intensive block: make kblockd_workqueue smarter Revert "sd: implement sd_check_events()" block: Clean up exit_io_context() source code. Fix compile warnings due to missing removal of a 'ret' variable fs/block: type signature of major_to_index(int) to major_to_index(unsigned) block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p) cfq-iosched: don't check cfqg in choose_service_tree() fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors cdrom: export cdrom_check_events() sd: implement sd_check_events() sr: implement sr_check_events() ... commit fe3c560b8a22cb28e54fe8950abef38e88d75831 Merge: d200560 dad9292 Author: Linus Torvalds Date: Thu Jan 13 10:40:57 2011 -0800 Merge branch 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c-2638' of git://git.fluff.org/bjdooks/linux: i2c-bfin-twi: move setup to the earlier subsys initcall i2c-bfin-twi: handle faulty slave devices better i2c-mv64xxx: send repeated START between messages in xfer i2c-nomadik: fix regression on adapter name i2c-omap: Set latency requirements only once for several messages i2c-eg20t: add driver for Intel EG20T i2c-ocores: add some device tree documentation i2c-ocores: Use devres for resource allocation i2c-ocores: Adapt for device tree i2c-iop3xx: add iomem annotation commit d20056032e20061db6583f517a4d3ea4492a94f1 Merge: 86f6f9b ceb50f3 Author: Linus Torvalds Date: Thu Jan 13 10:40:00 2011 -0800 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: ARM: mach-shmobile: Kill off unused !gpio_is_valid() case ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel ARM: mach-shmobile: sh7377 Enable SDIO IRQs ARM: mach-shmobile: sh7367 Enable SDIO IRQs ARM: mach-shmobile: sh7372 Enable SDIO IRQs ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot ARM: mach-shmobile: mackerel: Add support get_cd in CN23 commit 86f6f9b64a730844f1438cbedfacd6fb0170a7f7 Merge: d33a629 8b6f08e Author: Linus Torvalds Date: Thu Jan 13 10:39:38 2011 -0800 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: (31 commits) sh: Add support for AP-SH4AD-0A board. sh: Add support for AP-SH4A-3A board. sh: Add a new mach type for alpha project boards. serial: sh-sci: build fixes. sh: sh7372 SH4AL-DSP probe support sh: sh7366 Enable SDIO IRQs sh: sh7343 Enable SDIO IRQs sh: mach-ecovec24: enable runtime PM for SDHI sh: sh7723 / ap325rxa enable SDIO IRQs sh: sh7722 Enable SDIO IRQs sh: sh7724 Enable SDIO IRQs sh: Fix up legacy PTEA space attribute mapping. sh: Stub out legacy PCC pgprot encoding for X2 TLBs. sh: constify prefetch pointers. sh: Add a machvec callback for early memblock reservations. sh: update sh7757lcr_defconfig sh: add PVR probing for SH7757 3rd cut sh: Use device_initcall() instead of __initcall() sh: intc - convert board specific landisk code sh: Move init_landisk_IRQ to header file ... commit d33a6291c1c577ff2272edab7416a0f7308e1cef Merge: 66dc918 f00117a Author: Linus Torvalds Date: Thu Jan 13 10:39:14 2011 -0800 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: (29 commits) video: move SH_MIPI_DSI/SH_LCD_MIPI_DSI to the top of menu fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb video: imx: Update the manufacturer's name nuc900fb: don't treat NULL clk as an error s3c2410fb: don't treat NULL clk as an error video: tidy up modedb formatting. video: matroxfb: Correct video option in comments and kernel config help. fbdev: sh_mobile_hdmi: simplify pointer handling fbdev: sh_mobile_hdmi: framebuffer notifiers have to be registered fbdev: sh_mobile_hdmi: add command line option to use the preferred EDID mode OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new overlay manager. OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4 OMAP: DSS2: LCD2 Channel Changes for DISPC OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers OMAP: DSS2: Represent DISPC register defines with channel as parameter OMAP: DSS2: Add dss_features for omap4 and overlay manager related features OMAP: DSS2: Clean up DISPC color mode validation checks OMAP: DSS2: Add back authors of panel-generic.c based drivers OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers ... commit 66dc918d42eaaa9afe42a47d07526765162017a9 Merge: b2034d4 6db9a0f Author: Linus Torvalds Date: Thu Jan 13 10:32:54 2011 -0800 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: (348 commits) ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO ALSA: oxygen: fix Xonar DG input ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low ALSA: hda - Fix missing EAPD for Acer 4930G ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs. ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser ALSA: hda - Don't refer ELD when unplugged ASoC: tpa6130a2: Fix compiler warning ASoC: tlv320dac33: Add DAPM selection for LOM invert ASoC: DMIC codec: Adding a generic DMIC codec ALSA: snd-usb-us122l: Fix missing NULL checks ALSA: snd-usb-us122l: Fix MIDI output ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync() ASoC: Fix section mismatch in wm8995.c ALSA: oxygen: add S/PDIF source selection for Claro cards ALSA: oxygen: fix CD/MIDI for X-Meridian (2G) ASoC: fix migor audio build ALSA: include delay.h for msleep in Xonar DG support ... commit b2034d474b7e1e8578bd5c2977024b51693269d9 Merge: 27d189c 9242415 Author: Linus Torvalds Date: Thu Jan 13 10:27:28 2011 -0800 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: (41 commits) fs: add documentation on fallocate hole punching Gfs2: fail if we try to use hole punch Btrfs: fail if we try to use hole punch Ext4: fail if we try to use hole punch Ocfs2: handle hole punching via fallocate properly XFS: handle hole punching via fallocate properly fs: add hole punching to fallocate vfs: pass struct file to do_truncate on O_TRUNC opens (try #2) fix signedness mess in rw_verify_area() on 64bit architectures fs: fix kernel-doc for dcache::prepend_path fs: fix kernel-doc for dcache::d_validate sanitize ecryptfs ->mount() switch afs move internal-only parts of ncpfs headers to fs/ncpfs switch ncpfs switch 9p pass default dentry_operations to mount_pseudo() switch hostfs switch affs switch configfs ... commit 27d189c02ba25851973c8582e419c0bded9f7e5b Merge: a170315 55db838 Author: Linus Torvalds Date: Thu Jan 13 10:25:58 2011 -0800 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: (46 commits) hwrng: via_rng - Fix memory scribbling on some CPUs crypto: padlock - Move padlock.h into include/crypto hwrng: via_rng - Fix asm constraints crypto: n2 - use __devexit not __exit in n2_unregister_algs crypto: mark crypto workqueues CPU_INTENSIVE crypto: mv_cesa - dont return PTR_ERR() of wrong pointer crypto: ripemd - Set module author and update email address crypto: omap-sham - backlog handling fix crypto: gf128mul - Remove experimental tag crypto: af_alg - fix af_alg memory_allocated data type crypto: aesni-intel - Fixed build with binutils 2.16 crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets net: Add missing lockdep class names for af_alg include: Install linux/if_alg.h for user-space crypto API crypto: omap-aes - checkpatch --file warning fixes crypto: omap-aes - initialize aes module once per request crypto: omap-aes - unnecessary code removed crypto: omap-aes - error handling implementation improved crypto: omap-aes - redundant locking is removed crypto: omap-aes - DMA initialization fixes for OMAP off mode ... commit a1703154200c390ab03c10224c586e815d3e31e8 Merge: 67b5ad9 766fc43 Author: Linus Torvalds Date: Thu Jan 13 10:25:24 2011 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: rbd: fix cleanup when trying to mount inexistent image net/ceph: make ceph_msgr_wq non-reentrant ceph: fsc->*_wq's aren't used in memory reclaim path ceph: Always free allocated memory in osdmap_decode() ceph: Makefile: Remove unnessary code ceph: associate requests with opening sessions ceph: drop redundant r_mds field ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS ceph: add dir_layout to inode commit 67b5ad9a63caa2ce56ddd2b22b802dae00d72c13 Merge: 174a86d 88cce42 Author: Linus Torvalds Date: Thu Jan 13 10:24:52 2011 -0800 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: Add MCF548x watchdog driver. watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs watchdog: Add TCO support for nVidia chipsets watchdog: Add support for sp5100 chipset TCO watchdog: f71808e_wdt: add F71862FG, F71869 to Kconfig watchdog: iTCO_wdt: TCO Watchdog patch for Intel DH89xxCC PCH watchdog: iTCO_wdt: TCO Watchdog patch for Intel NM10 DeviceIDs watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h. watchdog: Propagate Book E WDT period changes to all cores watchdog: add CONFIG_WATCHDOG_NOWAYOUT support to PowerPC Book-E watchdog driver watchdog: alim7101_wdt: fix compiler warning on alim7101_pci_tbl watchdog: alim1535_wdt: fix compiler warning on ali_pci_tbl watchdog: Fix reboot on W83627ehf chipset. watchdog: Add watchdog support for W83627DHG chip watchdog: f71808e_wdt: Add Fintek F71869 watchdog watchdog: add f71862fg support watchdog: clean-up f71808e_wdt.c commit 174a86dff2f3c72ef55d994b1e7faa7099d3f844 Merge: 1896a13 06f3d9f Author: Linus Torvalds Date: Thu Jan 13 10:24:29 2011 -0800 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: (dme1737) Minor cleanups hwmon: (dme1737) Add support for in7 for SCH5127 hwmon: (emc1403) Add EMC1423 support hwmon: (w83627hf) Document W83627THF voltage pin mapping hwmon: (w83793) Drop useless mutex hwmon: (fschmd) Drop useless mutex hwmon: (w83781d) Use pr_fmt and pr_ hwmon: (pc87427) Use pr_fmt and pr_ hwmon: (pc87360) Use pr_fmt and pr_ hwmon: (lm78) Use pr_fmt and pr_ hwmon: (it87) Use pr_fmt and pr_ hwmon: Schedule the removal of the old intrusion detection interfaces hwmon: (w83793) Implement the standard intrusion detection interface hwmon: (w83792d) Implement the standard intrusion detection interface hwmon: (adm9240) Implement the standard intrusion detection interface hwmon: (via686a) Initialize fan_div values hwmon: (w83795) Silent false warning from gcc hwmon: (ads7828) Update email contact details commit 1896a1346a80b2dac1f63a338f1e2ee0b6484646 Merge: e691d24 fa63bd4 Author: Linus Torvalds Date: Thu Jan 13 10:24:07 2011 -0800 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: (45 commits) regulator: missing index in PTR_ERR() in isl6271a_probe() regulator: Assign return value of mc13xxx_reg_rmw to ret regulator: Add initial per-regulator debugfs support regulator: Make regulator_has_full_constraints a bool regulator: Clean up logging a bit regulator: Optimise out noop voltage changes regulator: Add API to re-apply voltage to hardware regulator: Staticise non-exported functions in mc13892 regulator: Only notify voltage changes when they succeed regulator: Provide a selector based set_voltage_sel() operation regulator: Factor out voltage set operation into a separate function regulator: Convert WM8994 to use get_voltage_sel() regulator: Convert WM835x to use get_voltage_sel() regulator: Allow modular build of mc13xxx-core regulator: support PMIC mc13892 make mc13783 regulator code generic Change the register name definitions for mc13783 mach-ux500: Updated and connected ab8500 regulator board configuration regulators: Removed macros for initialization of ab8500 regulators regulators: Added verbose debug messages to ab8500 regulators ... commit e691d24e9c5007486bef59c589c2a2d784e0c30b Merge: 55065bc b5318d3 Author: Linus Torvalds Date: Thu Jan 13 10:15:12 2011 -0800 Merge branch 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-olpc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, olpc: Speed up device tree creation during boot x86, olpc: Add OLPC device-tree support x86, of: Define irq functions to allow drivers/of/* to build on x86 commit 55065bc52795faae549abfb912aacc622dd63876 Merge: 008d23e e5c3014 Author: Linus Torvalds Date: Thu Jan 13 10:14:24 2011 -0800 Merge branch 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (142 commits) KVM: Initialize fpu state in preemptible context KVM: VMX: when entering real mode align segment base to 16 bytes KVM: MMU: handle 'map_writable' in set_spte() function KVM: MMU: audit: allow audit more guests at the same time KVM: Fetch guest cr3 from hardware on demand KVM: Replace reads of vcpu->arch.cr3 by an accessor KVM: MMU: only write protect mappings at pagetable level KVM: VMX: Correct asm constraint in vmcs_load()/vmcs_clear() KVM: MMU: Initialize base_role for tdp mmus KVM: VMX: Optimize atomic EFER load KVM: VMX: Add definitions for more vm entry/exit control bits KVM: SVM: copy instruction bytes from VMCB KVM: SVM: implement enhanced INVLPG intercept KVM: SVM: enhance mov DR intercept handler KVM: SVM: enhance MOV CR intercept handler KVM: SVM: add new SVM feature bit names KVM: cleanup emulate_instruction KVM: move complete_insn_gp() into x86.c KVM: x86: fix CR8 handling KVM guest: Fix kvm clock initialization when it's configured out ... commit 008d23e4852d78bb2618f2035f8b2110b6a6b968 Merge: 8f685fb bfc672d Author: Linus Torvalds Date: Thu Jan 13 10:05:56 2011 -0800 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it. commit 8f685fbda43deccd130d192c9fcef1444649eaca Merge: d24450e 2d93666 Author: Linus Torvalds Date: Thu Jan 13 09:58:38 2011 -0800 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: HID: hid-multitouch: minor fixes based on additional review HID: Switch turbox/mosart touchscreen to hid-mosart HID: add Add Cando touch screen 10.1-inch product id HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger' HID: hid-multitouch: add support for Cypress TrueTouch panels HID: hid-multitouch: support for PixCir-based panels HID: set HID_MAX_FIELD at 128 HID: add feature_mapping callback commit d24450e2075b9ceeef8ad942e6391bc73eae6933 Merge: 5cb2fad 01c728a Author: Linus Torvalds Date: Thu Jan 13 09:58:14 2011 -0800 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: add SW_ROTATE_LOCK switch type Input: fix force feedback capability query example Input: wacom_w8001 - add single-touch support Input: add Austria Microsystem AS5011 joystick driver Input: remove aaed2000 keyboard driver Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 Input: cy8ctmg110_ts - Convert to dev_pm_ops Input: migor_ts - convert to dev_pm_ops Input: mcs5000_ts - convert to dev_pm_ops Input: eeti_ts - convert to dev_pm_ops Input: ad7879 - convert I2C to dev_pm_ops commit 5b88128fd70dcf0d5d7c0ae7d7849777ff925bde Author: Lennert Buytenhek Date: Mon Nov 29 11:23:26 2010 +0100 ARM: plat-stmp3xxx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 0e60e117fb904e888bb76f2451f8183fe29c71ce Author: Lennert Buytenhek Date: Mon Nov 29 11:22:33 2010 +0100 ARM: plat-spear: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Viresh Kumar commit 3b0c8d40387482d6a446da9ef0c97fede20a7b89 Author: Lennert Buytenhek Date: Mon Nov 29 11:17:38 2010 +0100 ARM: plat-orion: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Nicolas Pitre commit e9191028e84a7a55146b2659e96bea998021b171 Author: Lennert Buytenhek Date: Mon Nov 29 11:17:17 2010 +0100 ARM: plat-omap: irq_data conversion. Signed-off-by: Lennert Buytenhek commit f272c00e6b72a27035b39d30ecb73dee93d6760f Author: Lennert Buytenhek Date: Mon Nov 29 11:16:48 2010 +0100 ARM: plat-nomadik: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Rabin Vincent commit 4d93579f63ca4998284934c43ac03fcee4216f91 Author: Lennert Buytenhek Date: Mon Nov 29 11:16:23 2010 +0100 ARM: plat-mxc: irq_data conversion. Signed-off-by: Lennert Buytenhek commit b9858efad32ffa8b3e9c2bd1286121824c3cebae Author: Lennert Buytenhek Date: Mon Nov 29 11:15:19 2010 +0100 ARM: w90x900: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Wan ZongShun commit 80cf22c4a6eedb312346b2b8574f35725c445ab0 Author: Lennert Buytenhek Date: Mon Nov 29 11:15:01 2010 +0100 ARM: versatile: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit 37337a8d5e68d6e19075dbdb3acf4f1011dae972 Author: Lennert Buytenhek Date: Mon Nov 29 11:14:46 2010 +0100 ARM: tegra: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 76fbec842e176e57c2ba2c8efbac3367e59cc8f7 Author: Lennert Buytenhek Date: Mon Nov 29 11:14:16 2010 +0100 ARM: tcc8k: irq_data conversion. Signed-off-by: Lennert Buytenhek commit cb55bc5f1b7d7a5fd8bfc901bca0ed099ee0e1e9 Author: Lennert Buytenhek Date: Mon Nov 29 11:13:59 2010 +0100 ARM: stmp37xx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 7940848aab2d16f1f6a7e77b957e40d10465f38a Author: Lennert Buytenhek Date: Mon Nov 29 11:13:40 2010 +0100 ARM: stmp378x: irq_data conversion. Signed-off-by: Lennert Buytenhek commit aab0c637f37950abd083d34e9f89311b0af61c96 Author: Lennert Buytenhek Date: Mon Nov 29 11:12:34 2010 +0100 ARM: shark: irq_data conversion. Signed-off-by: Lennert Buytenhek commit c4e8964e4eb3ea4edc34e1832d1691468f326beb Author: Lennert Buytenhek Date: Mon Nov 29 11:12:06 2010 +0100 ARM: sa1100: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 9a364da73d84bb5181fc8a0f85d497b596f0d560 Author: Lennert Buytenhek Date: Mon Nov 29 11:07:20 2010 +0100 ARM: rpc: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit a3f4c927d379cfaa597bc8ff75dc9d28f8d9200e Author: Lennert Buytenhek Date: Mon Nov 29 11:18:26 2010 +0100 ARM: PXA SoCs: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 406b005045ad18ffa08c439545801e1c8cec4b5e Author: Lennert Buytenhek Date: Mon Nov 29 10:40:16 2010 +0100 ARM: pnx4008: irq_data conversion. Signed-off-by: Lennert Buytenhek commit df303477bd06d5453a4d8a69fb1ecf24c5ca5e48 Author: Lennert Buytenhek Date: Mon Nov 29 10:39:59 2010 +0100 ARM: omap2: irq_data conversion. Signed-off-by: Lennert Buytenhek commit a51eef7eb45f7d0b141cf5b3729075e97992046b Author: Lennert Buytenhek Date: Mon Nov 29 10:39:27 2010 +0100 ARM: omap1: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 85dcd90ce11d24649906adc454f31f1ac3f2dc6a Author: Lennert Buytenhek Date: Mon Nov 29 10:38:52 2010 +0100 ARM: nuc93x: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Wan ZongShun commit 9b3ffe523af895f6b969b971079da4c06c2743af Author: Lennert Buytenhek Date: Mon Nov 29 10:38:34 2010 +0100 ARM: ns9xxx: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Uwe Kleine-König commit 4f8d7541b591883ff25ab1e0146f72e533f6183f Author: Lennert Buytenhek Date: Mon Nov 29 10:38:10 2010 +0100 ARM: netx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit e981a30209c77dab6e594ac454f8ff49cdcb0c20 Author: Lennert Buytenhek Date: Mon Nov 29 10:37:55 2010 +0100 ARM: mx3: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 0f86ee082caa043d5e2990d42a1d5034d2a5caf6 Author: Lennert Buytenhek Date: Mon Nov 29 10:37:34 2010 +0100 ARM: msm: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Gregory Bean Acked-by: Daniel Walker commit a157f26b2e624ce457a8f16b54d93f6af1850f85 Author: Lennert Buytenhek Date: Mon Nov 29 10:36:07 2010 +0100 ARM: mmp: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 5638538117ea81063b0611a7374c0d65133860ec Author: Lennert Buytenhek Date: Mon Nov 29 10:35:20 2010 +0100 ARM: lpc32xx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 3b7cff6604768bd561b032a02c38746707cbd3d1 Author: Lennert Buytenhek Date: Mon Nov 29 10:34:58 2010 +0100 ARM: lh7a40x: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 3cdb791bdabd3771f93522871755ec97a797d0fd Author: Lennert Buytenhek Date: Mon Nov 29 10:34:14 2010 +0100 ARM: ks8695: irq_data conversion. Signed-off-by: Lennert Buytenhek commit ee04087add7fa429fd1e4256705479cd1386adec Author: Lennert Buytenhek Date: Mon Nov 29 10:33:49 2010 +0100 ARM: ixp4xx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit c1d065e696b8a1e0486a25fa2a804da0d2d6d98c Author: Lennert Buytenhek Date: Mon Nov 29 10:33:32 2010 +0100 ARM: ixp23xx: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 6e8f54fad5b2e15b64595d6ededb316d713db102 Author: Lennert Buytenhek Date: Mon Nov 29 10:32:55 2010 +0100 ARM: ixp2000: irq_data conversion. Signed-off-by: Lennert Buytenhek commit a0ad2a7e6b74def9b3b0db0cd4daea7a1bccef59 Author: Lennert Buytenhek Date: Mon Nov 29 10:32:37 2010 +0100 ARM: iop33x: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Dan Williams commit 465b40794c29497d93bc590f119e6e033b6d48d5 Author: Lennert Buytenhek Date: Mon Nov 29 10:32:18 2010 +0100 ARM: iop32x: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Dan Williams commit 418c9904d3353f9d33f37d045975fed5d0ff1a81 Author: Lennert Buytenhek Date: Mon Nov 29 10:32:01 2010 +0100 ARM: iop13xx: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Dan Williams commit c3ef3ccadb0d8fc4f8de89a63edf0cee979a7235 Author: Lennert Buytenhek Date: Mon Nov 29 10:31:33 2010 +0100 ARM: integrator: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit c971ab0d9649d2bc0469da3c976297e91a3e2d35 Author: Lennert Buytenhek Date: Mon Nov 29 10:31:06 2010 +0100 ARM: h720x: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 413802b6c8114972d5a1520412e6241326882273 Author: Lennert Buytenhek Date: Mon Nov 29 10:30:40 2010 +0100 ARM: gemini: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Hans Ulli Kroll commit dc2caf6c691c30867fb9a725ab15f60f392c429a Author: Lennert Buytenhek Date: Mon Nov 29 10:30:13 2010 +0100 ARM: footbridge: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit c0afc916029c02a8650e533392893b3da6326d1e Author: Lennert Buytenhek Date: Mon Nov 29 10:29:50 2010 +0100 ARM: ep93xx: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Ryan Mallon commit c365e506d18154bf430da10679e427abe982a84c Author: Lennert Buytenhek Date: Mon Nov 29 10:29:25 2010 +0100 ARM: ebsa110: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit aa456a6eba197f0774d68531342ba7f85ccf2971 Author: Lennert Buytenhek Date: Mon Nov 29 10:27:47 2010 +0100 ARM: dove: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Nicolas Pitre commit 23265442b02b3cc3c0dd2bf89bc235970c629806 Author: Lennert Buytenhek Date: Mon Nov 29 10:27:27 2010 +0100 ARM: davinci: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 8ad357ca4dd99a0f277528e63746bb04629de213 Author: Lennert Buytenhek Date: Mon Nov 29 10:26:56 2010 +0100 ARM: clps711x: irq_data conversion. Signed-off-by: Lennert Buytenhek commit cf1d4d509903ede1379912c5c0587eea02d19106 Author: Lennert Buytenhek Date: Mon Nov 29 10:26:37 2010 +0100 ARM: bcmring: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Scott Branden commit da0f9403d41e6cb210459571afddfce3646181ca Author: Lennert Buytenhek Date: Mon Nov 29 10:26:19 2010 +0100 ARM: at91: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 54502602c13dd2e7d1244942b9b3638ebe944760 Author: Lennert Buytenhek Date: Mon Nov 29 10:25:51 2010 +0100 ARM: aaec2000: irq_data conversion. Signed-off-by: Lennert Buytenhek commit f013c98dd2dee05334ab48573a7b674e0ee63b9d Author: Lennert Buytenhek Date: Mon Nov 29 10:20:21 2010 +0100 ARM: vic: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 8231e74150cc3731f48879f804d47c8f061c8777 Author: Lennert Buytenhek Date: Mon Nov 29 10:20:06 2010 +0100 ARM: sa1111: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Kristoffer Ericson commit 680244df886face4d29d3f75d964c8e45e0e8bda Author: Lennert Buytenhek Date: Mon Nov 29 10:19:01 2010 +0100 ARM: LoCoMo: irq_data conversion. Signed-off-by: Lennert Buytenhek commit 8cdd4572ead14cb104aa6c3d8737ad2d77e4a20a Author: Lennert Buytenhek Date: Mon Nov 29 10:18:39 2010 +0100 ARM: ITE 8152: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Mike Rapoport commit 7d1f4288ac077b3fc734acd1e034b288b1b9d3d2 Author: Lennert Buytenhek Date: Mon Nov 29 10:18:20 2010 +0100 ARM: gic: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Abhijeet Dharmapurikar commit 595dad76a0d213adc3dbe4f463f7887e905082b9 Author: Chris Wilson Date: Thu Jan 13 11:03:48 2011 +0000 drm/i915/execbuffer: Clear domains before beginning reloc processing After reordering the sequence of relocating objects, commit 6fe4f1404, we can no longer rely on seeing all reloc targets prior to performing the relocation. As a result we were ignoring the need to flush objects from the render cache and invalidate the sampler caches, resulting in rendering glitches. So we need to clear the relocation domains earlier. Reported-by: Linus Torvalds Tested-by: Linus Torvalds Signed-off-by: Chris Wilson commit dd6864a4edb9b2d0055a7f30e17cbc521098b1be Author: Chris Wilson Date: Wed Jan 12 23:49:13 2011 +0000 drm/i915/execbuffer: Reorder relocations to match new object order On the fault path, commit 6fe4f140 introduction a regression whereby it changed the sequence of the objects but continued to use the original ordering of relocation entries. The result was that incorrect GTT offsets were being fed into the execbuffer causing lots of misrendering and potential hangs. Reported-by: Linus Torvalds Tested-by: Linus Torvalds Signed-off-by: Chris Wilson commit c37d9a5de94a6fe60a756af350cd21aa9bbbc8a1 Author: Chris Wilson Date: Wed Jan 12 20:33:01 2011 +0000 drm/i915: Fix error handler to capture the first batch after the seqno Whilst we had no older batches on the active list, everything was fine. However, if the GPU is free running and the requests are only being reaped by the periodic retirer, than the current seqno may not be at the start of the list. In this case we need to select the first batch after the last seqno written by the gpu and not inclusive of the seqno. Signed-off-by: Chris Wilson commit a76150302d6e7ebc43e1a1ddaee7fd51db8da3b3 Author: Chris Wilson Date: Wed Jan 12 17:04:08 2011 +0000 drm/i915: Add a module option to override the use of SSC In order to workaround the issue with LVDS not working on the Lenovo U160 apparently due to using the wrong SSC frequency, add an option to disable SSC. Suggested-by: Lukács, Árpád Bugzillla: https://bugs.freedesktop.org/show_bug.cgi?id=32748 Signed-off-by: Chris Wilson Cc: stable@kernel.org commit f31e8d4982653b39fe312f9938be0f49dd9ab5fa Author: Pablo Neira Ayuso Date: Thu Jan 13 14:19:55 2011 +0100 netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack() This patch fixes a loop in ctnetlink_get_conntrack() that can be triggered if you use the same socket to receive events and to perform a GET operation. Under heavy load, netlink_unicast() may return -EAGAIN, this error code is reserved in nfnetlink for the module load-on-demand. Instead, we return -ENOBUFS which is the appropriate error code that has to be propagated to user-space. Reported-by: Holger Eitzenberger Signed-off-by: Pablo Neira Ayuso commit 5cb2fad28fd8f95e911bed8c9342435a5b8e67de Author: Lasse Collin Date: Wed Jan 12 17:01:26 2011 -0800 decompressors: remove unused constant from inflate.h Signed-off-by: Lasse Collin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1da914e0648ace34e1c3738d9584e8b2cd6fe64a Author: Lasse Collin Date: Wed Jan 12 17:01:25 2011 -0800 decompressors: check input size in decompress_inflate.c Check for end of the input buffer when skipping over the filename field in the .gz file header. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 303148045aac34b70db722a54e5ad94a3a6625c6 Author: Lasse Collin Date: Wed Jan 12 17:01:24 2011 -0800 x86: support XZ-compressed kernel This integrates the XZ decompression code to the x86 pre-boot code. mkpiggy.c is updated to reserve about 32 KiB more buffer safety margin for kernel decompression. It is done unconditionally for all decompressors to keep the code simpler. The XZ decompressor needs around 30 KiB of heap, so the heap size is increased to 32 KiB on both x86-32 and x86-64. Documentation/x86/boot.txt is updated to list the XZ magic number. With the x86 BCJ filter in XZ, XZ-compressed x86 kernel tends to be a few percent smaller than the equivalent LZMA-compressed kernel. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ebe12439ba7fc62e1d6ecb569b7287771716ca1 Author: Lasse Collin Date: Wed Jan 12 17:01:23 2011 -0800 decompressors: add boot-time XZ support This implements the API defined in which is used for kernel, initramfs, and initrd decompression. This patch together with the first patch is enough for XZ-compressed initramfs and initrd; XZ-compressed kernel will need arch-specific changes. The buffering requirements described in decompress_unxz.c are stricter than with gzip, so the relevant changes should be done to the arch-specific code when adding support for XZ-compressed kernel. Similarly, the heap size in arch-specific pre-boot code may need to be increased (30 KiB is enough). The XZ decompressor needs memmove(), memeq() (memcmp() == 0), and memzero() (memset(ptr, 0, size)), which aren't available in all arch-specific pre-boot environments. I'm including simple versions in decompress_unxz.c, but a cleaner solution would naturally be nicer. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24fa0402a9b6a537e87e38341e78b7da86486846 Author: Lasse Collin Date: Wed Jan 12 17:01:22 2011 -0800 decompressors: add XZ decompressor module In userspace, the .lzma format has become mostly a legacy file format that got superseded by the .xz format. Similarly, LZMA Utils was superseded by XZ Utils. These patches add support for XZ decompression into the kernel. Most of the code is as is from XZ Embedded . It was written for the Linux kernel but is usable in other projects too. Advantages of XZ over the current LZMA code in the kernel: - Nice API that can be used by other kernel modules; it's not limited to kernel, initramfs, and initrd decompression. - Integrity check support (CRC32) - BCJ filters improve compression of executable code on certain architectures. These together with LZMA2 can produce a few percent smaller kernel or Squashfs images than plain LZMA without making the decompression slower. This patch: Add the main decompression code (xz_dec), testing module (xz_dec_test), wrapper script (xz_wrap.sh) for the xz command line tool, and documentation. The xz_dec module is enough to have a usable XZ decompressor e.g. for Squashfs. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb7fa589fd3ecc212fabd7867a4ecc3b175260c1 Author: Lasse Collin Date: Wed Jan 12 17:01:21 2011 -0800 Decompressors: fix callback-to-callback mode in decompress_unlzo.c Callback-to-callback decompression mode is used for initrd (not initramfs). The LZO wrapper is broken for this use case for two reasons: - The argument validation is needlessly too strict by requiring that "posp" is non-NULL when "fill" is non-NULL. - The buffer handling code didn't work at all for this use case. I tested with LZO-compressed kernel, initramfs, initrd, and corrupt (truncated) initramfs and initrd images. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a3f81a7029daff5f08aad146f4c4510e790da49 Author: Lasse Collin Date: Wed Jan 12 17:01:21 2011 -0800 Decompressors: check input size in decompress_unlzo.c The code assumes that the input is valid and not truncated. Add checks to avoid reading past the end of the input buffer. Change the type of "skip" from u8 to int to fix a possible integer overflow. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f9b54a35a70b604ebd2b2f2e7e04eabd0ff8a54 Author: Lasse Collin Date: Wed Jan 12 17:01:20 2011 -0800 Decompressors: check for write errors in decompress_unlzo.c The return value of flush() is not checked in unlzo(). This means that the decompressor won't stop even if the caller doesn't want more data. This can happen e.g. with a corrupt LZO-compressed initramfs image. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb0cf3e19b4940a2d26dcdea03510ae16a580fcd Author: Lasse Collin Date: Wed Jan 12 17:01:19 2011 -0800 Decompressors: validate match distance in decompress_unlzma.c Validate the newly decoded distance (rep0) in process_bit1(). This is to detect corrupt LZMA data quickly. The old code can run for long time producing garbage until it hits the end of the input. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 528941ca05734f24a7568c1c082125f2b635c4eb Author: Lasse Collin Date: Wed Jan 12 17:01:18 2011 -0800 Decompressors: check for write errors in decompress_unlzma.c The return value of wr->flush() is not checked in write_byte(). This means that the decompressor won't stop even if the caller doesn't want more data. This can happen e.g. with corrupt LZMA-compressed initramfs. Returning the error quickly allows the user to see the error message quicker. There is a similar missing check for wr.flush() near the end of unlzma(). Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 278208d9d631524d04152574f87b9b88919ce663 Author: Lasse Collin Date: Wed Jan 12 17:01:17 2011 -0800 Decompressors: check for read errors in decompress_unlzma.c Return value of rc->fill() is checked in rc_read() and error() is called when needed, but then the code continues as if nothing had happened. rc_read() is a void function and it's on the top of performance critical call stacks, so propagating the error code via return values doesn't sound like the best fix. It seems better to check rc->buffer_size (which holds the return value of rc->fill()) in the main loop. It does nothing bad that the code runs a little with unknown data after a failed rc->fill(). This fixes an infinite loop in initramfs decompression if the LZMA-compressed initramfs image is corrupt. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8218a437234309faa5725f82c33c3523788d5f68 Author: Lasse Collin Date: Wed Jan 12 17:01:17 2011 -0800 Decompressors: fix header validation in decompress_unlzma.c Validation of header.pos calls error() but doesn't make the function return to indicate an error to the caller. Instead the decoding is attempted with invalid header.pos. This fixes it. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22e4420820bdab66fee8c0b0a8acdd35c1000595 Author: Lasse Collin Date: Wed Jan 12 17:01:16 2011 -0800 Decompressors: remove unused function from lib/decompress_unlzma.c Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b6b5caa6d05579bd1501006e34feec1b2aef8c4 Author: Lasse Collin Date: Wed Jan 12 17:01:15 2011 -0800 Decompressors: include in Currently users of mm.h need to include to use the macros malloc() and free() provided by mm.h. This fixes it. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93685ad247ef65b7d6f90ffe97b44f5cfeaf40d3 Author: Lasse Collin Date: Wed Jan 12 17:01:14 2011 -0800 Decompressors: get rid of set_error_fn() macro set_error_fn() has become a useless complication after c1e7c3ae59 ("bzip2/lzma/gzip: pre-boot malloc doesn't return NULL on failure") fixed the use of error() in malloc(). Only decompress_unlzma.c had some use for it and that was easy to change too. This also gets rid of the static function pointer "error", which should have been marked as __initdata. Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b01ed64c19b52121a717274d271d9915f8d3e94 Author: Lasse Collin Date: Wed Jan 12 17:01:13 2011 -0800 Decompressors: add missing INIT (i.e. __init) Signed-off-by: Lasse Collin Cc: "H. Peter Anvin" Cc: Alain Knaff Cc: Albin Tonnerre Cc: Phillip Lougher Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d0a1decb4a07bcb8ef5c4d7f693eafdebc2c41b Author: Mike Frysinger Date: Wed Jan 12 17:01:12 2011 -0800 romfs: have romfs_fs.h pull in necessary headers This header uses things like __be32, so pull in linux/types.h. Further, it uses BLOCK_SIZE, so pull in linux/fs.h. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 264b795fbd055f57b445eb3d58cfc51d6b10b22e Author: Andrew Morton Date: Wed Jan 12 17:01:11 2011 -0800 ramoops: fix types, remove typecasts Cc: Ahmed S. Darwish Cc: Kyungmin Park Cc: Marco Stornelli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f772fe65c7aa1a4679739d885775f07492a6eea Author: Stefani Seibold Date: Wed Jan 12 17:01:10 2011 -0800 cramfs: generate unique inode number for better inode cache usage Generate a unique inode numbers for any entries in the cram file system. For files which did not contain data's (device nodes, fifos and sockets) the offset of the directory entry inside the cramfs plus 1 will be used as inode number. The + 1 for the inode will it make possible to distinguish between a file which contains no data and files which has data, the later one has a inode value where the lower two bits are always 0. It also reimplements the behavior to set the size and the number of block to 0 for special file, which is the right value for empty files, devices, fifos and sockets As a little benefit it will be also more compatible which older mkcramfs, because it will never use the cramfs_inode->offset for creating a inode number for special files. [akpm@linux-foundation.org: trivial comment fix] [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Stefani Seibold Cc: Al Viro Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beeae05138baf615a0284fc4a9022c33271ee37c Author: Alexander Shishkin Date: Wed Jan 12 17:01:09 2011 -0800 cramfs: hide function prototypes behind __KERNEL__ macro Currently, 3 kernel function prototypes are present in a header file exported to userland. This patch fixes it. Signed-off-by: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d3486f8b9eebcaa15ba8b72b63217e317f4f8635 Author: Jeff Moyer Date: Wed Jan 12 17:01:08 2011 -0800 aio: remove unused aio_run_iocbs() aio_run_iocbs() is not used at all, so get rid of it. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Jeff Moyer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e41025598ea7abb4330db98f78c5a084e25682f Author: Namhyung Kim Date: Wed Jan 12 17:01:08 2011 -0800 aio: remove unnecessary check 'nr >= min_nr >= 0' always satisfies 'nr >= 0' so the check is unnecesary. Signed-off-by: Namhyung Kim Acked-by: Jeff Moyer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27a0c06ec31aadc3582f50cd7b88855922e95ae Author: Dmitry Torokhov Date: Wed Jan 12 17:01:07 2011 -0800 VMware balloon: stop locking pages when hypervisor tells us enough When hypervisor decides to decrease target balloon size while the balloon driver tries to lock pages hypervisor may respond with VMW_BALLOON_PPN_NOTNEEDED. Use this data and immediately stop reserving pages and wait for the next update cycle to fetch new target instead of continuing trying to lock pages until size of refused list grows above VMW_BALLOON_MAX_REFUSED (16) pages. As a result the driver stops bothering the hypervisor with its attempts to lock more pages that are not needed anymore. Most likely next order from hypervisor will be to reduce ballon size anyway. It is a small optimization. Signed-off-by: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17fecb5582962c2ca5627a51ec9ab0979fb673ef Author: Mika Laitio Date: Wed Jan 12 17:01:06 2011 -0800 w1: DS2423 counter driver and documentation This is a 1-wire/w1 DS2423 slave driver for reading the values from all 4 counters available DS2423 devices by using standard w1_slave file. In ds2423 the counters are tied to ram pages 12-15 in and each of those ram-pages. Each of these counter values (and asoociated ram page values) are represented as a own line in w1_slave file. Driver has been tested on mips and x86. usage example: cat /sys/bus/w1/devices/1d-00000009b964/w1_slave 00 02 00 00 00 00 00 00 00 6d 38 00 ff ff 00 00 fe ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2 00 02 00 00 00 00 00 00 00 e0 1f 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=2 00 5a 0e 5f 18 00 00 00 00 0b 28 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff 00 00 ff ff crc=YES c=408882778 00 05 00 00 00 00 00 00 00 8d 39 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff crc=YES c=5 Patch includes also the documentation. [randy.dunlap@oracle.com: fix ds2423 build, needs to select CRC16] Signed-off-by: Mika Laitio Signed-off-by: Randy Dunlap Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 496fc1a68a45ae159d26331775411f6fea36d4d3 Author: Alex Dubov Date: Wed Jan 12 17:01:05 2011 -0800 memstick: factor out transfer initiating functionality in mspro_block.c Apart from currently used standard memstick data transfer method, Sony introduced several newer ones, to uncover full bandwidth/capacity of its Pro, HG and XC media formats. This patch lays a foundation to enable those methods as made possible by host/media capabilities. As a side effect of this patch, mspro_block_read_attributes became more streamlined and readable. [akpm@linux-foundation.org: fix printk warning] Signed-off-by: Alex Dubov Reported-by: Maxim Levitsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edb50b3b1d9bf6d51dc68f7f885e78285f8d6f18 Author: Alex Dubov Date: Wed Jan 12 17:01:04 2011 -0800 memstick: remove mspro_block_mutex mspro_block_mutex is identical in scope to mspro_block_disk_lock and therefore unnecessary. Signed-off-by: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8256d487840f9c2c372f8fc615a5d378bc133f1 Author: Alex Dubov Date: Wed Jan 12 17:01:04 2011 -0800 memstick: avert possible race condition between idr_pre_get and idr_get_new Implement the usual pattern around idr_pre_get() and idr_get_new() to handlethe situation where another thread concurrently steals this thread's idr_pre_get() preallocation. Signed-off-by: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8930c8aa740b12ad69f44a35137bcc39bfa3dc41 Author: Takashi Iwai Date: Wed Jan 12 17:01:03 2011 -0800 memstick: add support for JMicron JMB 385 and 390 controllers Signed-off-by: Aries Lee Signed-off-by: Takashi Iwai Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68860b96ebac0d56961cf80b94f65dab55e39069 Author: Takashi Iwai Date: Wed Jan 12 17:01:02 2011 -0800 memstick: set PMOS values propery for JMicron 38x controllers Add a function jmb38x_ms_pmos() to enable / disable PMOS setups for JMicron 38x controllers. Signed-off-by: Aries Lee Signed-off-by: Takashi Iwai Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 23c5947ac3f7a610bb4cb9e433802b36edc80fdf Author: Takashi Iwai Date: Wed Jan 12 17:01:01 2011 -0800 memstick: fix setup for JMicron 38x controllers This patch corrects the definition of clock values for JMicron 38x controllers and sets the value properly per interface type. Also, it adds a check for TPC errors in the interrupt handler. Signed-off-by: Aries Lee Signed-off-by: Takashi Iwai Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0193383a5833c1f082c738eaca868e4093a8df39 Author: Vasiliy Kulikov Date: Wed Jan 12 17:01:00 2011 -0800 memstick: core: fix device_register() error handling If device_register() fails then call put_device(). See comment to device_register. Signed-off-by: Vasiliy Kulikov Cc: Maxim Levitsky Cc: Alex Dubov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 563558b2c7350371551bf08348ac61be62200505 Author: Alexander Gordeev Date: Wed Jan 12 17:01:00 2011 -0800 pps: add parallel port PPS signal generator Add PPS signal generator which utilizes STROBE pin of a parallel port to send PPS signals. It uses parport abstraction layer and hrtimers to precisely control the signal. Signed-off-by: Alexander Gordeev Cc: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46b402a0e5e4b4d81b11c32dfb2312bf5828ecb5 Author: Alexander Gordeev Date: Wed Jan 12 17:00:59 2011 -0800 pps: add parallel port PPS signal generator Add PPS signal generator which utilizes STROBE pin of a parallel port to send PPS signals. It uses parport abstraction layer and hrtimers to precisely control the signal. [akpm@linux-foundation.org: fix build] Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a10203c691eac287664f531b149ddc23056c2f61 Author: Alexander Gordeev Date: Wed Jan 12 17:00:58 2011 -0800 pps: add parallel port PPS client Add parallel port PPS client. It uses a standard method for capturing timestamps for assert edge transitions: getting a timestamp soon after an interrupt has happened. This is not a very precise source of time information due to interrupt handling delays. However, timestamps for clear edge transitions are much more precise because the interrupt handler continuously polls hardware port until the transition is done. Hardware port operations require only about 1us so the maximum error should not exceed this value. This was my primary goal when developing this client. Clear edge capture could be disabled using clear_wait parameter. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 717c033669ed3ceaee8df57d4562fafcc1a6267a Author: Alexander Gordeev Date: Wed Jan 12 17:00:58 2011 -0800 pps: add kernel consumer support Add an optional feature of PPSAPI, kernel consumer support, which uses the added hardpps() function. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e2c18e49a0d4f822ffc29fb4958943beb1ff08b7 Author: Alexander Gordeev Date: Wed Jan 12 17:00:57 2011 -0800 pps: capture MONOTONIC_RAW timestamps as well MONOTONIC_RAW clock timestamps are ideally suited for frequency calculation and also fit well into the original NTP hardpps design. Now phase and frequency can be adjusted separately: the former based on REALTIME clock and the latter based on MONOTONIC_RAW clock. A new function getnstime_raw_and_real is added to timekeeping subsystem to capture both timestamps at the same time and atomically. Signed-off-by: Alexander Gordeev Acked-by: John Stultz Cc: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 025b40abe715d638e60516a657d354e8560c1a85 Author: Alexander Gordeev Date: Wed Jan 12 17:00:56 2011 -0800 ntp: add hardpps implementation This commit adds hardpps() implementation based upon the original one from the NTPv4 reference kernel code from David Mills. However, it is highly optimized towards very fast syncronization and maximum stickness to PPS signal. The typical error is less then a microsecond. To make it sync faster I had to throw away exponential phase filter so that the full phase offset is corrected immediately. Then I also had to throw away median phase filter because it gives a bigger error itself if used without exponential filter. Maybe we will find an appropriate filtering scheme in the future but it's not necessary if the signal quality is ok. Signed-off-by: Alexander Gordeev Acked-by: John Stultz Cc: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12f9b1f9c11700893a7b453705d95b260d78f268 Author: Alexander Gordeev Date: Wed Jan 12 17:00:55 2011 -0800 pps: timestamp is always passed to dcd_change() Remove the code that gatheres timestamp in pps_tty_dcd_change() in case passed ts parameter is NULL because it never happens in the current code. Fix comments as well. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 818b9eefe742cc29c6456e163e2c035cfb431e51 Author: Alexander Gordeev Date: Wed Jan 12 17:00:54 2011 -0800 pps: simplify conditions a bit Bitwise conjunction is distributive so we can simplify some conditions. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29f347c9faf53cfb953e4d529e6e632482214e62 Author: Alexander Gordeev Date: Wed Jan 12 17:00:54 2011 -0800 pps: use BUG_ON for kernel API safety checks This way less overhead is involved when running production kernel. If you want to debug a pps client module please define DEBUG to enable the checks. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a5cd6e2fb1984cc83f08b3645bf394830ac7825 Author: Alexander Gordeev Date: Wed Jan 12 17:00:53 2011 -0800 pps: make idr lock a mutex and protect idr_pre_get Now pps_idr_lock is never used in interrupt context so we can replace spin_lock_irq/spin_unlock_irq with plain spin_lock/spin_unlock. But there is also a potential race condition when someone can steal an id which was allocated by idr_pre_get before it is used. So convert spin lock to mutex and protect the whole id generation process. Signed-off-by: Alexander Gordeev Cc: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 083e58666ff5b3c5750d9a5c0560018b03cfb4b2 Author: Alexander Gordeev Date: Wed Jan 12 17:00:53 2011 -0800 pps: move idr stuff to pps.c Since now idr is only used to manage char device id's and not used in kernel API anymore it should be moved to pps.c. This also makes it possible to release id only at actual device freeing so nobody can register a pps device with the same id while our device is not freed yet. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f7cce74105adf714bdc9357da3b6f06e019958c Author: Alexander Gordeev Date: Wed Jan 12 17:00:52 2011 -0800 pps: convert printk/pr_* to dev_* Since we now have direct pointers to struct pps_device everywhere it's easy to use dev_* functions to print messages instead of plain printks. Where dev_* cannot be used printks are converted to pr_*. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e196d34a776420278e4117b4742cd9d3f2350ed Author: Alexander Gordeev Date: Wed Jan 12 17:00:51 2011 -0800 pps: access pps device by direct pointer Using device index as a pointer needs some unnecessary work to be done every time the pointer is needed (in irq handler for example). Using a direct pointer is much more easy (and safe as well). Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f4229b51106cbc859e9d8209b22c8a2ec749e64 Author: Alexander Gordeev Date: Wed Jan 12 17:00:50 2011 -0800 pps: unify timestamp gathering Add a helper function to gather timestamps. This way clients don't have to duplicate it. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3003d55b59aa98aeaff2773df69732b27c0cbf6a Author: Alexander Gordeev Date: Wed Jan 12 17:00:50 2011 -0800 pps: fix race in PPS_FETCH handler There was a race in PPS_FETCH ioctl handler when several processes want to obtain PPS data simultaneously using sleeping PPS_FETCH. They all sleep most of the time in the system call. With the old approach when the first process waiting on the pps queue is waken up it makes new system call right away and zeroes pps->go. So other processes continue to sleep. This is a clear race condition because of the global 'go' variable. With the new approach pps->last_ev holds some value increasing at each PPS event. PPS_FETCH ioctl handler saves current value to the local variable at the very beginning so it can safely check that there is a new event by just comparing both variables. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86d921f9ec06bc3fd357a77877d37a604d5674c3 Author: Alexander Gordeev Date: Wed Jan 12 17:00:49 2011 -0800 pps: declare variables where they are used in switch Move variable declarations where they are used in pps_cdev_ioctl. Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a21a3cc0be92e70474cc2ab06cb074f6a7c3f09 Author: Alexander Gordeev Date: Wed Jan 12 17:00:49 2011 -0800 pps: trivial fixes Here are some very trivial fixes combined: - add macro definitions to protect header file from including several times - remove declaration for an unexistent array - fix typos Signed-off-by: Alexander Gordeev Acked-by: Rodolfo Giometti Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ab020cf07e457a8b425bf5af17e704f90f86d8b Author: Jeff Mahoney Date: Wed Jan 12 17:00:48 2011 -0800 taskstats: use better ifdef for alignment Commit 4be2c95d ("taskstats: pad taskstats netlink response for aligment issues on ia64") added a null field to align the taskstats structure but the discussion centered around ia64. The issue exists on other platforms with inefficient unaligned access and adding them piecemeal would be an unmaintainable mess. This patch uses Dave Miller's suggestion of using a combination of CONFIG_64BIT && !CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS to determine whether alignment is needed. Note that this will cause breakage on those platforms with applications like iotop which had hard-coded offsets into the packet to access the taskstats structure. The message seen on systems without the alignment fixes looks like: kernel unaligned access to 0xe000023879dca9bc, ip=0xa000000100133d10 The addresses may vary but resolve to locations inside __delayacct_add_tsk. iotop makes what I'd call unreasonable assumptions about the contents of a netlink genetlink packet containing generic attributes. They're typed and have headers that specify value lengths, so the client can (should) identify and skip the ones the client doesn't understand. The kernel, as of version 2.6.36, presented a packet like so: +--------------------------------+ | genlmsghdr - 4 bytes | +--------------------------------+ | NLA header - 4 bytes | /* Aggregate header */ +-+------------------------------+ | | NLA header - 4 bytes | /* PID header */ | +------------------------------+ | | pid/tgid - 4 bytes | | +------------------------------+ | | NLA header - 4 bytes | /* stats header */ | + -----------------------------+ <- oops. aligned on 4 byte boundary | | struct taskstats - 328 bytes | +-+------------------------------+ The iotop code expects that the kernel will behave as it did then, assuming that the packet format is set in stone. The format is set in stone, but the packet offsets are not. There's nothing in the packet format that guarantees that the packet will be sent in exactly the same way. The attribute contents are set (or versioned) and the aggregate contents are set but they can be anywhere in the packet. The issue here isn't that an unaligned structure gets passed to userspace, it's that the NLA infrastructure has something of a weakness: The 4 byte attribute header may force the payload to be unaligned. The taskstats structure is created at an unaligned location and then 64-bit values are operated on inside the kernel, so the unaligned access warnings gets spewed everywhere. It's possible to use the unaligned access API to operate on the structure in the kernel but it seems like a wasted effort to work around userspace code that isn't following the packet format. Any new additions would also need the be worked around. It's a maintenance nightmare. The conclusion of the earlier discussion seemed to be "ok fine, if we have to break it, don't break it on arches that don't have the problem." Dave pointed out that the unaligned access problem doesn't only exist on ia64, but also on other 64-bit arches that don't have efficient unaligned access and it should be fixed there as well. The committed version of the patch and this addition keep with the conclusion of that discussion not to break it unnecessarily, which the pid padding and the packet padding fixes did do. x86_64 and powerpc don't suffer this problem so they shouldn't suffer the solution. Other 64-bit architectures do and will, though. Signed-off-by: Jeff Mahoney Reported-by: David S. Miller Acked-by: David S. Miller Cc: Dan Carpenter Cc: Balbir Singh Cc: Florian Mickler Cc: Guillaume Chazarain Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0329326e85aaa30fb8d427828c718d565c287385 Author: Matti J. Aaltonen Date: Wed Jan 12 17:00:47 2011 -0800 NFC: Driver for NXP Semiconductors PN544 NFC chip. Creates a new "Near Field Communication" subsystem in drivers/nfc. http://en.wikipedia.org/wiki/Near_Field_Communication is useful ;) This is a driver for the pn544 NFC device. The driver transfers ETSI messages between the device and the user space. Signed-off-by: Matti J. Aaltonen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6164281ab7a4d3bd42588d6b25984e960a2e032f Author: Pavel Emelyanov Date: Wed Jan 12 17:00:46 2011 -0800 user_ns: improve the user_ns on-the-slab packaging Currently on 64-bit arch the user_namespace is 2096 and when being kmalloc-ed it resides on a 4k slab wasting 2003 bytes. If we allocate a separate cache for it and reduce the hash size from 128 to 64 chains the packaging becomes *much* better - the struct is 1072 bytes and the hole between is 98 bytes. [akpm@linux-foundation.org: s/__initcall/module_init/] Signed-off-by: Pavel Emelyanov Acked-by: Serge E. Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e020e742e5dbd8c44d31706995dc13ddc732e274 Author: Jovi Zhang Date: Wed Jan 12 17:00:45 2011 -0800 sysctl: remove obsolete comments ctl_unnumbered.txt have been removed in Documentation directory so just also remove this invalid comments [akpm@linux-foundation.org: fix Documentation/sysctl/00-INDEX, per Dave] Signed-off-by: Jovi Zhang Cc: Dave Young Acked-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 556105000334cb440636ef61b862d22b03c24f70 Author: Jovi Zhang Date: Wed Jan 12 17:00:45 2011 -0800 sysctl: fix #ifdef guard comment Signed-off-by: Jovi Zhang Acked-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12a4dc43911785f51a596f771ae0701b18d436f1 Author: Thomas Taranowski Date: Wed Jan 12 17:00:44 2011 -0800 rapidio: fix hang on RapidIO doorbell queue full condition In fsl_rio_dbell_handler() the code currently simply acknowledges the QFI queue full interrupt, but does nothing to resolve the queue full condition. Instead, it jumps to the end of the isr. When a queue full condition occurs, the isr is then re-entered immediately and continually, forever. The fix is to just fall through and read out current doorbell entries. Signed-off-by: Thomas Taranowski Cc: Alexandre Bounine Cc: Kumar Gala Cc: Matt Porter Cc: Li Yang Cc: Thomas Moll Cc: Micha Nelissen Cc: Benjamin Herrenschmidt Cc: Grant Likely Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e9d4d84847b5b05c8a049b681f15906a91e0f78 Author: Alexandre Bounine Date: Wed Jan 12 17:00:43 2011 -0800 rapidio: add new idt sRIO switches Add new sRIO switch device IDs and enable a basic support for them. 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 558bda65775d740a97efae2b67f1d53da7a7b9a2 Author: Alexandre Bounine Date: Wed Jan 12 17:00:42 2011 -0800 rapidio: use Component Tag for unified switch identification Change the way how switchid value is set. Local counter variable does not provide unified way to identify switch devices in a system with multiple processors. Using local counter leads to the situation when the same RIO switch has different switch ID for each processor. Replacing local counter with unique portion of the Component Tag provides unified reference to the switch by every processor in the system. 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 17e9620563e25e759e677508068305e5d6ce44ff Author: Alexandre Bounine Date: Wed Jan 12 17:00:41 2011 -0800 rapidio: add device object linking into discovery Add setting links between rio_dev objects into the discovery process. This needed to report device connections on agent (non-host) processors that perform RIO discovery. Originally, these links have been introduced for enumerating host only to support error management. 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 e6536927e64a2511864f2141d3e5b198b3f25ba6 Author: Alexandre Bounine Date: Wed Jan 12 17:00:40 2011 -0800 rapidio: add definitions of Component Tag fields Add definition of the unique device identifier field in the component tag. RIO_CTAG_UDEVID does not take all 32 bits of the component tag value to allow future extensions to the component tag use. Selected size of the RIO_CTAG_UDEVID field (17 bits) is sufficient to accommodate maximum number of endpoints in large RIO network (16-bit id) plus switches. 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 ded05782719d0f7e79af98be7cf88c7e23a90435 Author: Alexandre Bounine Date: Wed Jan 12 17:00:39 2011 -0800 rapidio: integrate rio_switch into rio_dev Convert RIO switches device structures (rio_dev + rio_switch) into a single allocation unit. This change is based on the fact that RIO switches are using common RIO device objects anyway. Allocating RIO switch objects as RIO devices with added space for switch information simplifies handling of RIO switch devices. 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 a93192a5d245a262dc52fa426de5b20467308a77 Author: Alexandre Bounine Date: Wed Jan 12 17:00:38 2011 -0800 rapidio: use common destid storage for endpoints and switches Change code to use one storage location common for switches and endpoints. This eliminates unnecessary device type checks during basic access operations. Logic that assigns destid to RIO devices stays unchanged - as before, switches use an associated destid because they do not have their own. 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 e6d7202b66d99bf514c8e901db68386b1fcd6d56 Author: Namhyung Kim Date: Wed Jan 12 17:00:37 2011 -0800 fs/char_dev.c: remove unused cdev_index() Commit 66fa12c571d3 ("ieee1394: remove the old IEEE 1394 driver stack") eliminated the only user of cdev_index(). So it can be removed too. Signed-off-by: Namhyung Kim Cc: Stefan Richter Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ceff1a770933e2ca2bf995b453dade4ec47a9878 Author: Dave Anderson Date: Wed Jan 12 17:00:36 2011 -0800 /proc/kcore: fix seeking Commit 34aacb2920 ("procfs: Use generic_file_llseek in /proc/kcore") broke seeking on /proc/kcore. This changes it back to use default_llseek in order to restore the original behavior. The problem with generic_file_llseek is that it only allows seeks up to inode->i_sb->s_maxbytes, which is 2GB-1 on procfs, where the memory file offset values in the /proc/kcore PT_LOAD segments may exceed or start beyond that offset value. A similar revert was made for /proc/vmcore. Signed-off-by: Dave Anderson Acked-by: Frederic Weisbecker Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf33cbdf8acccf96de268fbfb347d94e72de81ef Author: Alexey Dobriyan Date: Wed Jan 12 17:00:36 2011 -0800 proc: move proc_console.c to fs/proc/consoles.c Filename is supposed to match procfile name for random junk. Add __init while I'm at it. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3740a20c4fe8697cb604a7d51395d23472b1768f Author: Alexey Dobriyan Date: Wed Jan 12 17:00:35 2011 -0800 proc: less LOCK/UNLOCK in remove_proc_entry() For the common case where a proc entry is being removed and nobody is in the process of using it, save a LOCK/UNLOCK pair. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a6fc86d2b43bf1086557f023a24adf91db915559 Author: Petr Holasek Date: Wed Jan 12 17:00:34 2011 -0800 kpagecount: add slab page checking because _mapcount is in a union Add a PageSlab() check before adding the _mapcount value to /kpagecount. page->_mapcount is in a union with the SLAB structure so for pages controlled by SLAB, page_mapcount() returns nonsense. Signed-off-by: Petr Holasek Cc: Wu Fengguang Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6a340584607f653e10549c76dd427d4780c8f2c Author: Jovi Zhang Date: Wed Jan 12 17:00:34 2011 -0800 proc: use single_open() correctly single_open()'s third argument is for copying into seq_file->private. Use that, rather than open-coding it. Signed-off-by: Jovi Zhang Acked-by: David Rientjes Acked-by: Alexey Dobriyan Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d1b6e4eff89475785f60fa00f65da780f869f36 Author: Alexey Dobriyan Date: Wed Jan 12 17:00:33 2011 -0800 proc: ->low_ino cleanup - ->low_ino is write-once field -- reading it under locks is unnecessary. - /proc/$PID stuff never reaches pde_put()/free_proc_entry() -- PROC_DYNAMIC_FIRST check never triggers. - in proc_get_inode(), inode number always matches proc dir entry, so save one parameter. Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d6de12f70d2fb1487c4f482a21fed25fe74e0fd Author: Alexey Dobriyan Date: Wed Jan 12 17:00:32 2011 -0800 proc: use seq_puts()/seq_putc() where possible For string without format specifiers, use seq_puts(). For seq_printf("\n"), use seq_putc('\n'). text data bss dec hex filename 61866 488 112 62466 f402 fs/proc/proc.o 61729 488 112 62329 f379 fs/proc/proc.o ---------------------------------------------------- -139 Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2ade7b6ca37c808128810687cd56e8a44443e65 Author: Alexey Dobriyan Date: Wed Jan 12 17:00:32 2011 -0800 proc: use unsigned long inside /proc/*/statm /proc/*/statm code needlessly truncates data from unsigned long to int. One needs only 8+ TB of RAM to make truncation visible. Signed-off-by: Alexey Dobriyan Reviewed-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e49d4f635d6a800c4089c40fd254e12e451449 Author: Joe Perches Date: Wed Jan 12 17:00:30 2011 -0800 fs/proc/base.c, kernel/latencytop.c: convert sprintf_symbol() to %ps Use temporary lr for struct latency_record for improved readability and fewer columns used. Removed trailing space from output. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Joe Perches Cc: Jiri Kosina Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bdcd78e2445f1ef7097a3ae7ef12e8f9c4fb05f Author: Trevor Woerner Date: Wed Jan 12 17:00:29 2011 -0800 cgroups: remove deprecated subsystem from examples. The 'ns' cgroup is considered deprecated. Change the cgroup subsystem used in the examples of the cgroup documentation from 'ns' to 'blkio'. Signed-off-by: Trevor Woerner Acked-by: Li Zefan Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0e34e977a7ca54bb2159169deefc0b6e033cc75 Author: Rob Landley Date: Wed Jan 12 17:00:29 2011 -0800 Documentation/email-clients.txt: update Thunderbird docs with wordwrap plugin Show how to install the "toggle wordwrap" extension in thunderbird. Signed-off-by: Rob Landley Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d3687d7fb861da4640e54b25c0746a159f415a4 Author: Lasse Collin Date: Wed Jan 12 17:00:28 2011 -0800 Documentation/email-clients.txt: warn about word wrap bug in KMail Signed-off-by: Lasse Collin Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 566538a6cf5bec260324dc37b6820dacd8631452 Author: Jesper Juhl Date: Wed Jan 12 17:00:27 2011 -0800 reiserfs: make sure va_end() is always called after va_start(). A call to va_start() must always be followed by a call to va_end() in the same function. In fs/reiserfs/prints.c::print_block() this is not always the case. If 'bh' is NULL we'll return without calling va_end(). One could add a call to va_end() before the 'return' statement, but it's nicer to just move the call to va_start() after the test for 'bh' being NULL. Signed-off-by: Jesper Juhl Acked-by: Edward Shishkin Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0e3d32bb40d28cf57a6a24e1e1d87ef03b913bd Author: Jesper Juhl Date: Wed Jan 12 17:00:26 2011 -0800 befs: don't pass huge structs by value 'struct befs_disk_data_stream' is huge (~144 bytes) and it's being passed by value in fs/befs/endian.h::cpu_to_fsrun(). It would be better to pass a pointer. Signed-off-by: Jesper Juhl Cc: Will Dyson Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 25f959d63d39c83fda09d93a052835ed35669b1a Author: Andrew Morton Date: Wed Jan 12 17:00:26 2011 -0800 drivers/telephony/ixj.c: fix warning CC drivers/telephony/ixj.o drivers/telephony/ixj.c:287: warning: \u2018ixj_pci_tbl\u2019 defined but not used Reported-by: Namhyung Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e462c448fdc89252d631b26ff0ed4f7ad6fe8ed2 Author: Davide Libenzi Date: Wed Jan 12 17:00:25 2011 -0800 pipe: use event aware wakeups Send the events the wakeup refers to, so that epoll, and even the new poll code in fs/select.c can avoid wakeups if the events do not match the requested set. Signed-off-by: Davide Libenzi Acked-by: David S. Miller Acked-by: Eric Dumazet Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f829e405ec4e96f711165a4a7b55c271d4363e2 Author: Wolfram Sang Date: Wed Jan 12 17:00:24 2011 -0800 gpiolib: add missing functions to generic fallback Signed-off-by: Wolfram Sang Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fdae42d361bbb431ca0ab0efed5126a94821177 Author: Wolfram Sang Date: Wed Jan 12 17:00:23 2011 -0800 gpiolib: annotate gpio-intialization with __must_check Because GPIOs can have crucial functions especially in embedded systems, we are better safe than sorry regarding their configuration. For gpio_request, the documentation is simply enforced: "The return value of gpio_request() must be checked." For gpio_direction_* and gpio_request_*, we now act accordingly. Signed-off-by: Wolfram Sang Cc: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49a367937fe4250144e24440e5a11ae4344202b1 Author: Tomoya MORINAGA Date: Wed Jan 12 17:00:22 2011 -0800 gpio/ml_ioh_gpio: ML7213 GPIO driver ML7213 is a companion chip for Intel Atom E6xx series. This driver can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/Output Hub) which is for IVI(In-Vehicle Infotainment) use. This driver can access the IOH's GPIO device. Signed-off-by: Tomoya MORINAGA Cc: Samuel Ortiz Cc: Rabin Vincent Cc: Marc Zyngier Cc: Linus Walleij Cc: Mark Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32518863b483d521edc813616a35601cad213d31 Author: Randy Dunlap Date: Wed Jan 12 17:00:22 2011 -0800 GPIO_VX855: eliminate kconfig dependency warning Fix kconfig dependency warning to satisfy dependencies: warning: (GPIO_VX855 && GPIOLIB) selects MFD_VX855 which has unmet direct dependencies (MFD_SUPPORT && PCI) Signed-off-by: Randy Dunlap Cc: Daniel Drake Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f7ab5246d63358033497f8cb4e0867bb7b0df1e Author: Randy Dunlap Date: Wed Jan 12 17:00:21 2011 -0800 GPIO_RDC321X: select MFD_SUPPORT to squelch kconfig warning Fix kconfig dependency warning to satisfy dependencies: warning: (GPIO_RDC321X && PCI && GPIOLIB) selects MFD_RDC321X which has unmet direct dependencies (MFD_SUPPORT && PCI) Signed-off-by: Randy Dunlap Cc: Florian Fainelli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67d15ed7dfba8df6c723623a50a96ed1a08ba834 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:20 2011 -0800 gpio: vr41xx_giu: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Cc: Yoichi Yuasa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1f5f22adc3206c47e70652c12671666c65b579f Author: Lennert Buytenhek Date: Wed Jan 12 17:00:19 2011 -0800 gpio: timbgpio: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Cc: Richard Röjfors Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33fcc1b80259a9c09074a3859c26772f3d595c20 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:19 2011 -0800 gpio: tc35892-gpio: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Acked-by: Rabin Vincent Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 673860c107d3adc3fb0c85d7b4c86f551e75dc01 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:18 2011 -0800 gpio: sx150x: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Cc: Gregory Bean Tested-by: Rohit Vaswani Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a866f39146a5613d5c2db9031c13c218a4c7402 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:17 2011 -0800 gpio: stmpe-gpio: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Acked-by: Rabin Vincent Cc: Luotao Fu Cc: Linus Walleij Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2221869dbd84994f07c91be73103d9f9cb7309f Author: Lennert Buytenhek Date: Wed Jan 12 17:00:16 2011 -0800 gpio: pl061: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Acked-by: Baruch Siach Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6f5cfc0e2d5feac9094a8b26b9ad1739c1e7d9df Author: Lennert Buytenhek Date: Wed Jan 12 17:00:15 2011 -0800 gpio: pca953x: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Cc: Alek Du Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbc4667ab08a1c43c6141ce844005c76883e1930 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:14 2011 -0800 gpio: max732x: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Acked-by: Marc Zyngier Cc: Eric Miao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ffd72c674a8332b37cfd62c364bc5492e8ea4c5 Author: Lennert Buytenhek Date: Wed Jan 12 17:00:13 2011 -0800 gpio: langwell_gpio: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Cc: Alan Cox Cc: Yin Kangkai Cc: Alek Du Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12401eeddd21a59357c9a34c39761a7d32ddd4cd Author: Lennert Buytenhek Date: Wed Jan 12 17:00:12 2011 -0800 gpio: adp5588-gpio: irq_data conversion Converts irq_chips and flow handlers over to the new struct irq_data based irq_chip functions. Signed-off-by: Lennert Buytenhek Acked-by: "Hennerich, Michael" Cc: Mark Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf8e9086de5daf14dbf0be9efef7d2793f256693 Author: Andres Salomon Date: Wed Jan 12 17:00:12 2011 -0800 cs5535: deprecate older cs5535_gpio driver The newer drivers/gpio/cs5535-gpio.c replaces drivers/misc/cs5535_gpio.c. The new driver has been in the tree for a little while, and has received some testing; it's time to mark the old one as deprecated. I'm thinking removal around 2.6.40 would be good, provided we're not missing critical functionality in the newer driver. Signed-off-by: Andres Salomon Cc: Daniel Drake Acked-by: Ben Gardner Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7637c9259f7b6dd841471ccf1120d484b7364f99 Author: Andres Salomon Date: Wed Jan 12 17:00:11 2011 -0800 drivers/staging/olpc_dcon: convert to new cs5535 gpio API Drop the old geode_gpio crud, as well as the raw outl() calls; instead, use the Linux GPIO API where possible, and the cs5535_gpio API in other places. Note that we don't actually clean up the driver properly yet (once loaded, it always remains loaded). That'll come later.. This patch is necessary for building the driver. Signed-off-by: Andres Salomon Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b912c1bca5c162e611384fe7d39c916e081701a Author: Andres Salomon Date: Wed Jan 12 17:00:10 2011 -0800 drivers/gpio/cs5535-gpio.c: add some additional cs5535-specific GPIO functionality This adds (well, re-adds actually) handling for events/IRQs through cs5535 GPIOs. In the wild and wooly world of CS5535, setup_event() is for assigning an IRQ to a GPIO filter/event pair, and set_irq() sets up the pair to trigger IRQs. These should really only be used in highly platform-specific drivers (such as OLPC's DCON driver). Sadly, because set_irq() uses MSRs, this causes the driver to become X86-specific. Signed-off-by: Andres Salomon Signed-off-by: Daniel Drake Cc: Grant Likely Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f003feba2a8761d2ee7b367df5a0fe6b729dc8f Author: Axel Lin Date: Wed Jan 12 17:00:09 2011 -0800 rtc: rtc-max6902 - set driver data in max6902_probe() Current implementation does not set driver data in max6902_probe(), thus calling platform_get_drvdata(spi) in max6902_remove() returns NULL. Signed-off-by: Axel Lin Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 81d350e013a9a4b743281e16d5fd29cd8955a746 Author: Paul Gortmaker Date: Wed Jan 12 17:00:08 2011 -0800 rtc: delete legacy MAINTAINERS entry People stumble across the entry for the legacy PC specific RTC driver entry in MAINTAINERS when they really want the multi-arch, multi-driver RTC subsystem. So just delete the old entry that is causing the confusion. Signed-off-by: Paul Gortmaker Cc: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2fb08e6ca9f00d1aedb3964983e9c8f84b36b807 Author: Paul Fox Date: Wed Jan 12 17:00:07 2011 -0800 rtc-cmos: fix suspend/resume rtc-cmos was setting suspend/resume hooks at the device_driver level. However, the platform bus code (drivers/base/platform.c) only looks for resume hooks at the dev_pm_ops level, or within the platform_driver. Switch rtc_cmos to use dev_pm_ops so that suspend/resume code is executed again. Paul said: : The user visible symptom in our (XO laptop) case was that rtcwake would : fail to wake the laptop. The RTC alarm would expire, but the wakeup : wasn't unmasked. : : As for severity, the impact may have been reduced because if I recall : correctly, the bug only affected platforms with CONFIG_PNP disabled. Signed-off-by: Paul Fox Signed-off-by: Daniel Drake Acked-by: Rafael J. Wysocki Cc: [2.6.37.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19412ce9fcc9ca2d0f5b62af15c63381f0ac9657 Author: Axel Lin Date: Wed Jan 12 17:00:05 2011 -0800 drivers/rtc/rtc-omap.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. Also add a missing iounmap() in omap_rtc_remove(). Signed-off-by: Axel Lin Cc: Alessandro Zummo Cc: Sekhar Nori Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Mark A. Greer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 554ec37aca8f5fbe4d70df462d7032aaa5d95ae9 Author: Yannick Heneault Date: Wed Jan 12 17:00:04 2011 -0800 vgacon: check for efi machine It seems there is a small problem of VGA palette corruption on EFI machine. When the kernel initializes the architecture, it checks if the machine is a EFI machine and assumes that a VGA console can exist. When it initializes the console in vgacon_startup it checks if it can really use the VGA console. I think this is where a check is missing. Currently, the function can fail if a VESA boot mode is detected but not if a EFI boot mode was used. Thus vgacon_startup() doesn't fail and initialize the video card for a real VGA mode. This function changes the first 16entries of the VGA palette. When the efifb driver kicks in, the palette is not restored to default ramp value, thus the 16 first entry remain in a modified state. The following patch prevent this corruption. Signed-off-by: Yannick Heneault Cc: Dave Airlie Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f670d0ecda73b7438eec9ed108680bc5f5362ad8 Author: Mikael Pettersson Date: Wed Jan 12 17:00:02 2011 -0800 binfmt_elf: cleanups This cleans up a few bits in binfmt_elf.c and binfmts.h: - the hasvdso field in struct linux_binfmt is unused, so remove it and the only initialization of it - the elf_map CPP symbol is not defined anywhere in the kernel, so remove an unnecessary #ifndef elf_map - reduce excessive indentation in elf_format's initializer - add missing spaces, remove extraneous spaces No functional changes, but tested on x86 (32 and 64 bit), powerpc (32 and 64 bit), sparc64, arm, and alpha. Signed-off-by: Mikael Pettersson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52bd19f7691b2ea6433aef0ef94c08c57efd7e79 Author: Robin Holt Date: Wed Jan 12 17:00:01 2011 -0800 epoll: convert max_user_watches to long On a 16TB machine, max_user_watches has an integer overflow. Convert it to use a long and handle the associated fallout. Signed-off-by: Robin Holt Cc: "Eric W. Biederman" Acked-by: Davide Libenzi Cc: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 65329bf46bf9ddc37845c9a6823a8e8022d305b9 Author: Vasiliy Kulikov Date: Wed Jan 12 17:00:00 2011 -0800 fs/select.c: fix information leak to userspace On some architectures __kernel_suseconds_t is int. On these archs struct timeval has padding bytes at the end. This struct is copied to userspace with these padding bytes uninitialized. This leads to leaking of contents of kernel stack memory. This bug was added with v2.6.27-rc5-286-gb773ad4. [akpm@linux-foundation.org: avoid the memset on architectures which don't need it] Signed-off-by: Vasiliy Kulikov Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d130fd03e06672f7700e2cb694b29f9a98227ca Author: Joe Perches Date: Wed Jan 12 17:00:00 2011 -0800 checkpatch.pl: add "prefer __packed" check There's a __packed #define for __attribute__((packed)). Add a checkpatch to tell people about it. Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88f8831c055858179a7844d9dd4ddd7d3621322e Author: Dave Jones Date: Wed Jan 12 16:59:59 2011 -0800 checkpatch: check for world-writeable sysfs/debugfs files Exporting world writable sysfs/debugfs files is usually a bad thing. Warn about it. Signed-off-by: Dave Jones Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c023e4734c3e8801e0ecb5e81b831d42a374d861 Author: Florian Mickler Date: Wed Jan 12 16:59:58 2011 -0800 checkpatch.pl: fix CAST detection We should only claim that something is a cast if we did not encouter a token before, that did set av_pending. This fixes the operator * in the line below to be detected as binary (vs unary). kmalloc(sizeof(struct alphatrack_ocmd) * true_size, GFP_KERNEL); Reported-by: Audun Hoem Signed-off-by: Florian Mickler Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caf2a54f101a55ec318c2a20253a1977802f7de4 Author: Joe Perches Date: Wed Jan 12 16:59:56 2011 -0800 scripts/checkpatch.pl: add check for multiple terminating semicolons and casts of vmalloc Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78c377d1b5e7ef15c8c307c2aa2511602a0829c3 Author: David Rientjes Date: Wed Jan 12 16:59:55 2011 -0800 flex_array: export symbols to modules Alex said: I want to use flex_array to store a sparse array of ATM cell re-assembly buffers for my ATM over Ethernet driver. Using the per-vcc user_back structure causes problems when stacked with things like br2684. Add EXPORT_SYMBOL() for all publically accessible flex array functions and move to obj-y so that modules may use this library. Signed-off-by: David Rientjes Cc: Dave Hansen Cc: Paul Mundt Reported-by: Alex Bennee Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 734825796446930c57f69677f2e6cf1683d012f2 Author: Stelian Pop Date: Wed Jan 12 16:59:54 2011 -0800 MAINTAINERS: remove Stelian from the AMS driver record This driver is PPC only, and I am no longer able to test it. Signed-off-by: Stelian Pop Cc: Michael Hanselmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7788e135d8b7b50ecf7bf7907fca9a18ba9be90 Author: Stelian Pop Date: Wed Jan 12 16:59:53 2011 -0800 MAINTAINERS: orphan the meye driver I don't even remember when it was that I sold this laptop, but it has been a few years... Signed-off-by: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b0071721525ca5b800a61f933395208f15c0d7d Author: Stelian Pop Date: Wed Jan 12 16:59:52 2011 -0800 CREDITS: update Stelian's entry Signed-off-by: Stelian Pop Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8578d7af9b2ce669eda32fc2684c85cc8df4c6af Author: Lennert Buytenhek Date: Wed Jan 12 16:59:51 2011 -0800 MAINTAINERS: openwrt-devel@ is subscribers-only Signed-off-by: Lennert Buytenhek Cc: Florian Fainelli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ab6c937dbadf4797484d00d2815e1e3b0ec54397 Author: Joe Perches Date: Wed Jan 12 16:59:50 2011 -0800 scripts/get_maintainer.pl: use --git-fallback more often On Fri, 2010-11-05 at 13:50 -0700, Andrew Morton wrote: > z:/usr/src/git26> perl scripts/get_maintainer.pl -file mm/mempolicy.c > linux-mm@kvack.org > linux-kernel@vger.kernel.org Turns out this is an arguable defect in the script. The MAINTAINERS entry for mm is: MEMORY MANAGEMENT L: linux-mm@kvack.org W: http://www.linux-mm.org S: Maintained F: include/linux/mm.h F: mm/ There's a maintainer entry, but no named individual, so the script doesn't use git history via --git-fallback. This is also a defect for MAINTAINERS with status entries marked "Orphan" or "Odd fixes". The script now checks a section for any "M:" entry and that an "S:" entry is supported or maintained. If both those conditions are not satisified, use --git-fallback as appropriate. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e1863af1636b304a5f59aab6fb78d38e4079875 Author: Joe Perches Date: Wed Jan 12 16:59:49 2011 -0800 scripts/get_maintainer.pl: make --rolestats the default This script now requires a user to add --norolestats to the command line so it's harder to feed the output of this script to programs that send mass emails. Update --help to correct command line defaults. Change version to 0.26. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b921c69fb262988ff7856493a8453661a1bac814 Author: Anton Arapov Date: Wed Jan 12 16:59:49 2011 -0800 lib/vsprintf.c: fix vscnprintf() if @size is == 0 vscnprintf() should return 0 if @size is == 0. Update the comment for it, as @size is unsigned. This change based on the code of commit b903c0b8899b46829a9b80ba55b61079b35940ec ("lib: fix scnprintf() if @size is == 0") moves the real fix into vscnprinf() from scnprintf() and makes scnprintf() call vscnprintf(), thus avoid code duplication. Signed-off-by: Anton Arapov Acked-by: Changli Gao Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a3f938bf6f5746d39e013d03ba13118a393fee96 Author: Joe Perches Date: Wed Jan 12 16:59:48 2011 -0800 include/linux/printk.h: use tab not spaces for indent Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ec42a56e258462cda510421aecc2680d3642e21 Author: Joe Perches Date: Wed Jan 12 16:59:47 2011 -0800 include/linux/printk.h: organize printk_ratelimited macros - Use no_printk for !CONFIG_PRINTK printk_ratelimited. - Whitespace cleanup. Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac83ed687837a44c6e46fb16411fb0d299fffd80 Author: Joe Perches Date: Wed Jan 12 16:59:47 2011 -0800 include/linux/printk.h lib/hexdump.c: neatening and add CONFIG_PRINTK guard - Move prototypes and align arguments. - Add CONFIG_PRINTK guard for print_hex functions Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 16cb839f13324978bd58082e69de81a711802b11 Author: Joe Perches Date: Wed Jan 12 16:59:46 2011 -0800 include/linux/printk.h: add pr__once macros - Move printk_once definitions and add an #ifdef CONFIG_PRINTK - Add pr__once so printks can use pr_fmt Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5264f2f75d8678f3e9683042a4639baa5884bda9 Author: Joe Perches Date: Wed Jan 12 16:59:45 2011 -0800 include/linux/printk.h: use and neaten no_printk - Move no_printk above first CONFIG_PRINTK block so it can be used by printk_once. - Convert statement expression if (0) printk macros to no_printk. - Convert printk_once(x...) to more normally used (fmt, ...) fmt, ##__VA_ARGS__. - Standardize __attribute__ use. - Expand single line inline functions. - Remove space before pointer. Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d1e91aeb317c3c747369d8594fc1b742c265a07 Author: Joe Perches Date: Wed Jan 12 16:59:45 2011 -0800 include/linux/printk.h: use space after #define Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9747cc3addf81e56ea9b8a4374fbdb9d1737eae Author: Joe Perches Date: Wed Jan 12 16:59:43 2011 -0800 include/linux/printk.h: move console functions and variables together There are many uses of printk_once(KERN_, so add pr__once macros to avoid printk_once(KERN_ pr_fmt(fmt). Add an #ifdef CONFIG_PRINTK for print_hex_dump and static inline void functions for the #else cases to reduce embedded code size. Neaten and organize the rest of the code. This patch: Move console functions and variables together. Signed-off-by: Joe Perches Cc: Matt Mackall Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fb842b00c5eab66ec361b31550aa8a922745ce9e Author: Huang Ying Date: Wed Jan 12 16:59:43 2011 -0800 printk: use RCU to prevent potential lock contention in kmsg_dump dump_list_lock is used to protect dump_list in kmsg_dumper implementation, kmsg_dump() uses it to traverse dump_list too. But if there is contention on the lock, kmsg_dump() will fail, and the valuable kernel message may be lost. This patch solves this issue with RCU. Because kmsg_dump() only read the list, no lock is needed in kmsg_dump(). So that kmsg_dump() will never fail because of lock contention. Signed-off-by: Huang Ying Cc: "Paul E. McKenney" Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f0f2c2b5b40b5e621a47a6a274117cce77841f1e Author: Dan Carpenter Date: Wed Jan 12 16:59:42 2011 -0800 dca: remove unneeded NULL check The return here doesn't release the locks or re-enable IRQs. But as Andrew Morton points out, domain is never NULL. list_first_entry() essentially never returns NULL and also we already verified that the list is not empty. Signed-off-by: Dan Carpenter Acked-by: Maciej Sosnowski Cc: David Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 455cd5ab305c90ffc422dd2e0fb634730942b257 Author: Dan Rosenberg Date: Wed Jan 12 16:59:41 2011 -0800 kptr_restrict for hiding kernel pointers from unprivileged users Add the %pK printk format specifier and the /proc/sys/kernel/kptr_restrict sysctl. The %pK format specifier is designed to hide exposed kernel pointers, specifically via /proc interfaces. Exposing these pointers provides an easy target for kernel write vulnerabilities, since they reveal the locations of writable structures containing easily triggerable function pointers. The behavior of %pK depends on the kptr_restrict sysctl. If kptr_restrict is set to 0, no deviation from the standard %p behavior occurs. If kptr_restrict is set to 1, the default, if the current user (intended to be a reader via seq_printf(), etc.) does not have CAP_SYSLOG (currently in the LSM tree), kernel pointers using %pK are printed as 0's. If kptr_restrict is set to 2, kernel pointers using %pK are printed as 0's regardless of privileges. Replacing with 0's was chosen over the default "(null)", which cannot be parsed by userland %p, which expects "(nil)". [akpm@linux-foundation.org: check for IRQ context when !kptr_restrict, save an indent level, s/WARN/WARN_ONCE/] [akpm@linux-foundation.org: coding-style fixup] [randy.dunlap@oracle.com: fix kernel/sysctl.c warning] Signed-off-by: Dan Rosenberg Signed-off-by: Randy Dunlap Cc: James Morris Cc: Eric Dumazet Cc: Thomas Graf Cc: Eugene Teo Cc: Kees Cook Cc: Ingo Molnar Cc: David S. Miller Cc: Peter Zijlstra Cc: Eric Paris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 351f8f8e6499ae4fff40f5e3a8fe16d9e1903646 Author: Amerigo Wang Date: Wed Jan 12 16:59:39 2011 -0800 kernel: clean up USE_GENERIC_SMP_HELPERS For arch which needs USE_GENERIC_SMP_HELPERS, it has to select USE_GENERIC_SMP_HELPERS, rather than leaving a choice to user, since they don't provide their own implementions. Also, move on_each_cpu() to kernel/smp.c, it is strange to put it in kernel/softirq.c. For arch which doesn't use USE_GENERIC_SMP_HELPERS, e.g. blackfin, only on_each_cpu() is compiled. Signed-off-by: Amerigo Wang Cc: David Howells Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Yinghai Lu Cc: Peter Zijlstra Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8cb464e4a8abc60ad5a43e0375fec8a3c728167 Author: Chris Ruffin Date: Wed Jan 12 16:59:38 2011 -0800 ihex: fix unused return value compiler warning Fix unusued return value compiler warnings due to unchecked write() calls. [akpm@linux-foundation.org: correctly handle short writes] Signed-off-by: Chris Ruffin Cc: Mark Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8369744fc4418743d3d84a8490d576e3dbf01594 Author: Shaohua Li Date: Wed Jan 12 16:59:38 2011 -0800 include/asm-generic/vmlinux.lds.h: make readmostly section correctly align The readmostly section should end at a cacheline aligned address, otherwise the last several data might share cachline with other data and make the readmostly data still have cache bounce. For example, in ia64, secpath_cachep is the last readmostly data, and it shares cacheline with init_uts_ns. a000000100e80480 d secpath_cachep a000000100e80488 D init_uts_ns Signed-off-by: Shaohua Li Cc: "H. Peter Anvin" Cc: Eric Dumazet Acked-by: Tejun Heo Cc: Ingo Molnar Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1725310324163f56fea71bb77c5d6e88f9ce4192 Author: Andrew Morton Date: Wed Jan 12 16:59:37 2011 -0800 include/linux/unaligned/packed_struct.h: use __packed Cc: Will Newton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 049763db6cd002cb447a5684b5a543a69d647d42 Author: Alexander Shishkin Date: Wed Jan 12 16:59:35 2011 -0800 toshiba.h: hide a function prototypes behind __KERNEL__ macro Currently, tosh_smm() prototype is present in a header file exported to userland. This patch fixes it. Signed-off-by: Alexander Shishkin Cc: Jonathan Buzzard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71a9048448de302d1e968f336de01060d02fae71 Author: Andrew Morton Date: Wed Jan 12 16:59:35 2011 -0800 include/linux/kernel.h: abs(): fix handling of 32-bit unsigneds on 64-bit Michal reports: In the framebuffer subsystem the abs() macro is often used as a part of the calculation of a Manhattan metric, which in turn is used as a measure of similarity between video modes. The arguments of abs() are sometimes unsigned numbers. This worked fine until commit a49c59c0 ("Make sure the value in abs() does not get truncated if it is greater than 2^32:) , which changed the definition of abs() to prevent truncation. As a result of this change, in the following piece of code: u32 a = 0, b = 1; u32 c = abs(a - b); 'c' will end up with a value of 0xffffffff instead of the expected 0x1. A problem caused by this change and visible by the end user is that framebuffer drivers relying on functions from modedb.c will fail to find high resolution video modes similar to that explicitly requested by the user if an exact match cannot be found (see e.g. Fix this by special-casing `long' types within abs(). This patch reduces x86_64 code size a bit - drivers/video/uvesafb.o shrunk by 15 bytes, presumably because it is doing abs() on 4-byte quantities, and expanding those to 8-byte longs adds code. testcase: #define oldabs(x) ({ \ long __x = (x); \ (__x < 0) ? -__x : __x; \ }) #define newabs(x) ({ \ long ret; \ if (sizeof(x) == sizeof(long)) { \ long __x = (x); \ ret = (__x < 0) ? -__x : __x; \ } else { \ int __x = (x); \ ret = (__x < 0) ? -__x : __x; \ } \ ret; \ }) typedef unsigned int u32; main() { u32 a = 0; u32 b = 1; u32 oldc = oldabs(a - b); u32 newc = newabs(a - b); printf("%u %u\n", oldc, newc); } akpm:/home/akpm> gcc t.c akpm:/home/akpm> ./a.out 4294967295 1 Reported-by: Michal Januszewski Cc: Rolf Eike Beer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e5c12409c54c30f1d1b16bba5d4d24e35aa283c Author: Stephen Hemminger Date: Wed Jan 12 16:59:31 2011 -0800 set_rtc_mmss: show warning message only once Occasionally the system gets into a state where the CMOS clock has gotten slightly ahead of current time and the periodic update of RTC fails. The message is a nuisance and repeats spamming the log. See: http://www.ntp.org/ntpfaq/NTP-s-trbl-spec.htm#Q-LINUX-SET-RTC-MMSS Rather than just removing the message, make it show only once and reduce severity since it indicates a normal and non urgent condition. Signed-off-by: Stephen Hemminger Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Ralf Baechle Cc: David Howells Cc: Paul Mundt Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04c6862c055fb687c90d9652f32c11a063df15cf Author: Seiji Aguchi Date: Wed Jan 12 16:59:30 2011 -0800 kmsg_dump: add kmsg_dump() calls to the reboot, halt, poweroff and emergency_restart paths We need to know the reason why system rebooted in support service. However, we can't inform our customers of the reason because final messages are lost on current Linux kernel. This patch improves the situation above because the final messages are saved by adding kmsg_dump() to reboot, halt, poweroff and emergency_restart path. Signed-off-by: Seiji Aguchi Cc: David Woodhouse Cc: Marco Stornelli Reviewed-by: Artem Bityutskiy Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc2d557c74dc58294b9acc7231a2113ae59af97c Author: Seiji Aguchi Date: Wed Jan 12 16:59:29 2011 -0800 kmsg_dump: constrain mtdoops and ramoops to perform their actions only for KMSG_DUMP_PANIC This series aims to develop logging facility for enterprise use. It is important to save kernel messages reliably on enterprise system because they are helpful for diagnosing system. This series add kmsg_dump() to the paths loosing kernel messages. The use case is the following. [Use case of reboot/poweroff/halt/emergency_restart] My company has often experienced the followings in our support service. - Customer's system suddenly reboots. - Customers ask us to investigate the reason of the reboot. We recognize the fact itself because boot messages remain in /var/log/messages. However, we can't investigate the reason why the system rebooted, because the last messages don't remain. And off course we can't explain the reason. We can solve above problem with this patch as follows. Case1: reboot with command - We can see "Restarting system with command:" or ""Restarting system.". Case2: halt with command - We can see "System halted.". Case3: poweroff with command - We can see " Power down.". Case4: emergency_restart with sysrq. - We can see "Sysrq:" outputted in __handle_sysrq(). Case5: emergency_restart with softdog. - We can see "Initiating system reboot" in watchdog_fire(). So, we can distinguish the reason of reboot, poweroff, halt and emergency_restart. If customer executed reboot command, you may think the customer should know the fact. However, they often claim they don't execute the command when they rebooted system by mistake. No message remains on the current Linux kernel, so we can't show the proof to the customer. This patch improves this situation. This patch: Alters mtdoops and ramoops to perform their actions only for KMSG_DUMP_PANIC, KMSG_DUMP_OOPS and KMSG_DUMP_KEXEC because they would like to log crashes only. Signed-off-by: Seiji Aguchi Cc: David Woodhouse Cc: Marco Stornelli Reviewed-by: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0388fae4115dcfc310ac7327a8ac72786987c26e Author: Akinobu Mita Date: Wed Jan 12 16:59:28 2011 -0800 uml: use simple_write_to_buffer() Simplify write file operation for mmapper by using simple_write_to_buffer(). Signed-off-by: Akinobu Mita Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 07ecb79f513fc126c56642caaf9efeeefaceffaa Author: Randy Dunlap Date: Wed Jan 12 16:59:27 2011 -0800 uml: mmapper_kern needs MODULE_LICENSE Add missing MODULE_LICENSE(): WARNING: modpost: missing MODULE_LICENSE() in arch/um/drivers/mmapper_kern.o Signed-off-by: Randy Dunlap Cc: Greg Lonnon Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48a0b7404db9b83799e97a7d599fceb8df66bf59 Author: Will Newton Date: Wed Jan 12 16:59:26 2011 -0800 arch/um/drivers/line.c: safely iterate over list of winch handlers unregister_winch() should use list_for_each_safe(), as it can delete from the list. Signed-off-by: Will Newton Cc: richard -rw- weinberger Acked-by: WANG Cong Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94295e2305b4f4bf538dbdf9870fe04777320b75 Author: Richard Weinberger Date: Wed Jan 12 16:59:25 2011 -0800 um: mark CONFIG_HIGHMEM as broken Currently CONFIG_HIGHMEM is broken on User Mode Linux. I'm not sure if it worked ever. It doesn't compile and this breaks randomconfig testing. Signed-off-by: Richard Weinberger Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aff5ce6ca8d25c7dbcd886e2e51dd081981af95e Author: Alberto Panizzo Date: Wed Jan 12 16:59:24 2011 -0800 drivers/video/backlight/l4f00242t03.c: fix reset sequence The reset command is part of the init sequence and it take effect only if the lcd is powered. The effect of the bug was that the sequence: set lcd power_state to FB_BLANK_POWERDOWN set lcd power_state to FB_BLANK_UNBLANK Did not produced a complete reboot of the LCD which was showing fuzzy colours. This was not experienced before implementing correctly all the LCD power states with the patch [1]. Since before the patch [1] the regulators were not touched and the LCD shutdown was reached with a register write. After the patch [1] a complete boot sequence with an initial reset is needed for the display every time the LCD is powered up. drivers-video-backlight-l4f00242t03c-full-implement-fb-power-states-for-this-lcd.patch Signed-off-by: Alberto Panizzo Cc: Richard Purdie Cc: Marek Vasut Cc: Tejun Heo Cc: Axel Lin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 26bbabc8e80b4b9e42aca13376a2c1609a880e21 Author: Alberto Panizzo Date: Wed Jan 12 16:59:23 2011 -0800 drivers/video/backlight/l4f00242t03.c: prevent unbalanced calls to regulator enable/disable Otherwise a double call to: $ echo 4 > /sys/class/lcd/l4f00242t03/lcd_power Will, the first power down the lcd and regulators correctly and the second produce an unbalanced call to regulator disable. Signed-off-by: Alberto Panizzo Cc: Richard Purdie Cc: Marek Vasut Cc: Tejun Heo Cc: Axel Lin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 95558ad15b2b679fb8b312d3fd637acea854ba2f Author: Alberto Panizzo Date: Wed Jan 12 16:59:22 2011 -0800 drivers/video/backlight/l4f00242t03.c: full implement fb power states for this lcd Complete the support of fb power states managing correctly the regulators bound to this driver. Signed-off-by: Alberto Panizzo Cc: Richard Purdie Cc: Marek Vasut Cc: Tejun Heo Cc: Axel Lin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c2202f9c8202b89ae9ba4233a0d281f300474b9 Author: Mariusz Kozlowski Date: Wed Jan 12 16:59:21 2011 -0800 drivers/video/backlight/l4f00242t03.c: make 1-bit signed field unsigned Fixes sparse warning: drivers/video/backlight/l4f00242t03.c:28:21: error: dubious one-bit signed bitfield Signed-off-by: Mariusz Kozlowski Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9f9455ae710786bd11625d501567f4f783fedea5 Author: Janusz Krzysztofik Date: Wed Jan 12 16:59:20 2011 -0800 leds: add output inversion option to backlight trigger Extend the LED backlight tirgger driver with an option that allows for inverting the trigger output polarity. With the invertion option provided, I (ab)use the backlight trigger for driving a LED that indicates LCD display blank condtition on my Amstrad Delta videophone. Since the machine has no dedicated power LED, it was not possible to distinguish if the display was blanked, or the machine was turned off, without touching it. The invert sysfs control is patterned after a similiar function of the GPIO trigger driver. [akpm@linux-foundation.org: make output match input, tighten input checking] [akpm@linux-foundation.org: make output match input, tighten input checking] Signed-off-by: Janusz Krzysztofik Cc: Paul Mundt Acked-by: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61a83932b8b3f1624d753e06aab2fdf0a119e100 Author: Arun Murthy Date: Wed Jan 12 16:59:20 2011 -0800 leds-lp5521: modify the way of setting led device name Currently the led device name is fetched from the device_type in I2C_BOARD_INFO which comes from the platform data. This name is in turn used to create an entry in sysfs. If there exists two or more lp5521 on a particular platform, the device_type in I2C_BOARD_INFO has to be the same, else lp5521 driver probe wont be called and if used so, results in run time warning "cannot create sysfs with same name" and hence a failure. The name that is used to create sysfs entry is to be passed by the struct led_platform_data. Hence adding an element of type const char * and change in lp5521 driver to use this name in creating the led device if present else use the name obtained by I2C_BOARD_INFO. Signed-off-by: Arun Murthy Acked-by: Samu Onkalo Cc: Ilkka Koskinen Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4e7ad03e84b2301be4f9a39ef2778126699ff0c Author: Samu Onkalo Date: Wed Jan 12 16:59:19 2011 -0800 leds: lp5521: fix circular locking Driver contained possibility for circular locking. One lock is held by sysfs-core and another one by the driver itself. This happened when the driver created or removed sysfs entries dynamically. There is no real need to do those operations. Now all the sysfs entries are created at probe and removed at removal. Engine load sysfs entries are now visible all the time. However, access to the entries fails if the engine is disabled or running. Signed-off-by: Samu Onkalo Cc: Arun Murthy Reviewed-by: Ilkka Koskinen Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbac0812de0455c6af3e1f29fccffc207073b7eb Author: Samu Onkalo Date: Wed Jan 12 16:59:18 2011 -0800 leds: lp5523: fix circular locking Driver contained possibility for circular locking. One lock is held by sysfs-core and another one by the driver itself. This happened when the driver created or removed sysfs entries dynamically. There is no real need to do those operations. Now all the sysfs entries are created at probe and removed at removal. Engine load and mux configuration sysfs entries are now visible all the time. However, access to the entries fails if the engine is disabled or running. Signed-off-by: Samu Onkalo Cc: Arun Murthy Reviewed-by: Ilkka Koskinen Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 278ad4fd0e7517f1d74b8fc1c8347cad34a09b02 Author: Samu Onkalo Date: Wed Jan 12 16:59:17 2011 -0800 leds: leds-lp5523: modify the way of setting led device name Currently all leds channels begins with string lp5523. Patch adds a possibility to provide name via platform data. This makes it possible to have several chips without overlapping sysfs names. Signed-off-by: Samu Onkalo Cc: Arun Murthy Cc: Ilkka Koskinen Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 125c7135251de3aea1429968aea9bdfcb6535fc7 Author: Axel Lin Date: Wed Jan 12 16:59:15 2011 -0800 leds: leds-pca9532 cleanups - Remove unneeded input_free_device() after input_unregister_device(). - Add pca9532_destroy_devices() function for destroy devices. Signed-off-by: Axel Lin Acked-by: Dmitry Torokhov Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2260209c4973e3eeb1e48abaa9e639373a0d4fb7 Author: Vasiliy Kulikov Date: Wed Jan 12 16:59:14 2011 -0800 drivers/leds/leds-lp5521.c: fix potential buffer overflow The code doesn't check first sscanf() return value. If first sscanf() failed then c contains some garbage. It might lead to reading uninitialised stack data in the second sscanf() call. Signed-off-by: Vasiliy Kulikov Cc: Richard Purdie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6db26ffc917b609402619e03df5af8d1cd371ce7 Author: Andrew Morton Date: Wed Jan 12 16:59:13 2011 -0800 fs/ext4/inode.c: use pr_warn_ratelimited() pr_warning_ratelimited() doesn't exist. Also include printk.h, which defines these things. Cc: Theodore Ts'o Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7d4ca85a53bab1f6f9911411be38e0486a11187a Author: Tony Lindgren Date: Tue Jan 11 15:31:45 2011 -0800 omap4: Fix ULPI PHY init for ES1.0 SDP Commit 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4 (omap4: 4430sdp: enable the ehci port on 4430SDP) added code to enable EHCI support on 4430sdp board. Looks like the ULPI pin does not seem to be muxed properly on ES1.0 SDP and this causes the system to reboot when the ULPI PHY is enabled. Fix this by muxing the pin, this is the same setting for both ES1.0 and ES2.0. Also add checking for gpio_request. Cc: Keshava Munegowda commit 1427130425c1239d977e8891c3a8923f53a6e352 Author: Clemens Ladisch Date: Thu Jan 13 10:12:17 2011 +0100 firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO PAGE_KERNEL_RO is not available on all architectures, so its use in the new AR code broke compilation on sparc64. Because the read-only mapping was just a debugging aid, just use PAGE_KERNEL instead. Signed-off-by: Clemens Ladisch James Bottomley wrote: > On Thu, 2011-01-13 at 08:27 +0100, Clemens Ladisch wrote: >> firewire: ohci: fix compilation on arches without PAGE_KERNEL_RO, e.g. sparc >> >> PAGE_KERNEL_RO is not available on all architectures, so its use in the >> new AR code broke compilation on sparc64. >> >> Because the R/O mapping is only used to catch drivers that try to write >> to the reception buffer and not actually required for correct operation, >> we can just use a normal PAGE_KERNEL mapping where _RO is not available. [...] >> +/* >> + * For archs where PAGE_KERNEL_RO is not supported; >> + * mapping the AR buffers readonly for the CPU is just a debugging aid. >> + */ >> +#ifndef PAGE_KERNEL_RO >> +#define PAGE_KERNEL_RO PAGE_KERNEL >> +#endif > > This might cause interesting issues on sparc64 if it ever acquired a > PAGE_KERNEL_RO. Sparc64 has extern pgprot_t for it's PAGE_KERNEL types > rather than #defines, so the #ifdef check wouldn't see this. > > I think either PAGE_PROT_RO becomes part of our arch API (so all > architectures are forced to add it), or, if it's not part of the API, > ohci isn't entitled to use it. The latter seems simplest since you have > no real use for write protection anyway. Reported-by: Andrew Morton Signed-off-by: Stefan Richter commit 5870112021fb38e73b25dad3baec4ca0819c594a Author: Takashi Iwai Date: Thu Jan 13 15:41:45 2011 +0100 ALSA: hda - Add fixup-call in init callback In some cases, the fix-up is required in the init callback to be called both at the first initialization and at the resume. The new action type ALC_FIXUP_ACT_INIT is used for this case. So far, only ALC275_FIXUP_SONY_HWEQ uses this. Signed-off-by: Takashi Iwai commit b5bfbc670283d1ff21df4cd3f9f036cc47e34ce4 Author: Takashi Iwai Date: Thu Jan 13 14:22:32 2011 +0100 ALSA: hda - Reorganize fixup structure for Realtek Instead of keeping various data types in a single record, put the type field and keep a single value in each entry, but allows chaining multiple fixup entries. This allows more flexible data management (see ALC275_FIXUP_SONY_HWEQ for example). Signed-off-by: Takashi Iwai commit 81c5e2ae33c4b19e53966b427e33646bf6811830 Merge: 797a455 fcc5704 Author: Jens Axboe Date: Thu Jan 13 14:47:54 2011 +0100 Merge branch 'for-2.6.38/event-handling' into for-2.6.38/core commit 9fb1ef25f4d31f07cdaf7c6075b40bbcb00c1f92 Author: Takashi Iwai Date: Thu Jan 13 14:40:43 2011 +0100 ALSA: hda - Apply Sony VAIO hweq fixup only once This should be applied also only once as a part of the initialization. Signed-off-by: Takashi Iwai commit acac03fa15a8684bb60489ed87b5aae5258c0838 Author: Kirill Smelkov Date: Wed Jan 12 17:59:36 2011 +0300 perf record: Add "nodelay" mode, disabled by default Sometimes there is a need to use perf in "live-log" mode. The problem is, for seldom events, actual info output is largely delayed because perf-record reads sample data in whole pages. So for such scenarious, add flag for perf-record to go in "nodelay" mode. To track e.g. what's going on in icmp_rcv while ping is running Use it with something like this: (1) $ perf probe -L icmp_rcv | grep -U8 '^ *43\>' goto error; } 38 if (!pskb_pull(skb, sizeof(*icmph))) goto error; icmph = icmp_hdr(skb); 43 ICMPMSGIN_INC_STATS_BH(net, icmph->type); /* * 18 is the highest 'known' ICMP type. Anything else is a mystery * * RFC 1122: 3.2.2 Unknown ICMP messages types MUST be silently * discarded. */ 50 if (icmph->type > NR_ICMP_TYPES) goto error; $ perf probe icmp_rcv:43 'type=icmph->type' (2) $ cat trace-icmp.py [...] def trace_begin(): print "in trace_begin" def trace_end(): print "in trace_end" def probe__icmp_rcv(event_name, context, common_cpu, common_secs, common_nsecs, common_pid, common_comm, __probe_ip, type): print_header(event_name, common_cpu, common_secs, common_nsecs, common_pid, common_comm) print "__probe_ip=%u, type=%u\n" % \ (__probe_ip, type), [...] (3) $ perf record -a -D -e probe:icmp_rcv -o - | \ perf script -i - -s trace-icmp.py Thanks to Peter Zijlstra for pointing how to do it. Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Ingo Molnar , Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: <20110112140613.GA11698@tugrik.mns.mnsspb.ru> Signed-off-by: Kirill Smelkov Signed-off-by: Arnaldo Carvalho de Melo commit 6fc398cb306b0441436c93d6ddead3109b99f884 Author: Takashi Iwai Date: Thu Jan 13 14:36:37 2011 +0100 ALSA: hda - Apply mario fixup only once The amp-override is necessary only once at initialization time. Also fixed a coding style issue. Signed-off-by: Takashi Iwai commit 9710118bd4e7f3406865171cb9b9c94547c1c2f9 Author: Stephane Eranian Date: Wed Jan 12 10:29:05 2011 +0100 perf sched: Fix list of events, dropping unsupported ':r' modifier Looks to me like the :r modifier is not supported anymore, so remove it from the list of events. Cc: Corey Ashford Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Robert Richter LKML-Reference: Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 74dc8909c1ce38098e6689239ed6ae6b6bf9f92b Author: Takashi Iwai Date: Thu Jan 13 14:14:41 2011 +0100 ALSA: hda - Remove unused fixup entry for ALC262 ... and a minor cleanup. Signed-off-by: Takashi Iwai commit dd027b00eb5cc8580452fe66447eacdce2d57db6 Author: Arnaud Patard (Rtp) Date: Thu Jan 13 12:26:40 2011 +0100 mx51: add support for pwm This patch is adding support for pwm1 and pwm2 devices found on mx51. [ this patch has been tested with pwm-backlight driver ] Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 01c0761cc13a72c5aca5eab5870be8341eed214b Author: Arnaud Patard (Rtp) Date: Thu Jan 13 12:26:39 2011 +0100 Fix pwm-related build failure Commit 076762aa52de48688f6e1b6999fe58d736479f37 is adding a macro whis is calling imx_add_mxc_pwm() but gives it 2 parameters while it's taking only one parameters. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 4a87bac4c9b3291ade91fe4fc1382f22dd9e9e91 Author: Lennert Buytenhek Date: Mon Nov 29 10:21:01 2010 +0100 ARM: ecard: irq_data conversion. Signed-off-by: Lennert Buytenhek Acked-by: Russell King commit f64305a68b3cc688a20970cd6317f96c5778ea6f Author: Lennert Buytenhek Date: Mon Nov 29 10:21:48 2010 +0100 ARM: core irq_data conversion. Signed-off-by: Lennert Buytenhek commit e2a93ecc7fc469dab52323c11a2d8ceaa62aac7b Author: Lennert Buytenhek Date: Mon Nov 29 10:06:57 2010 +0100 ARM: Use genirq definitions from kernel/irq/Kconfig. Signed-off-by: Lennert Buytenhek commit 8b6f08eaef16dfcfebc32fa9a017bf70336ad9ec Merge: 4ae26f4 8a453ca Author: Paul Mundt Date: Thu Jan 13 18:38:28 2011 +0900 Merge branch 'sh/alphaproject' into sh-latest commit 8a453cac94803910305f7e95cbd157b6bbd88811 Author: Paul Mundt Date: Thu Jan 13 18:36:21 2011 +0900 sh: Add support for AP-SH4AD-0A board. This adds preliminary support for the alpha project AP-SH4AD-0A reference platform (SH7786 based). Additional platform information available at: http://www.apnet.co.jp/product/superh/ap-sh4ad-0a.html Signed-off-by: Paul Mundt commit bc34b0850be0aa99a49b714ea8a495fbe9a8c273 Author: Paul Mundt Date: Thu Jan 13 18:32:42 2011 +0900 sh: Add support for AP-SH4A-3A board. This adds preliminary support for the alpha project AP-SH4A-3A reference platform (SH7785 based). Additional paltform information available at: http://www.apnet.co.jp/product/superh/ap-sh4a-3a.html Signed-off-by: Paul Mundt commit 704bf317fd21683e5c71a542f5fb5f65271a1582 Author: Paul Mundt Date: Thu Jan 13 18:31:25 2011 +0900 sh: Add a new mach type for alpha project boards. Signed-off-by: Paul Mundt commit 3b18c349285a534755e8f84c273aeafac41fdf3b Author: Yong Shen Date: Wed Jan 12 17:14:47 2011 +0800 ARM i.MX53 enable LOCO board bootup 1. Add Kconfig and Makefile entries 2. Add board definition 3. enable uart and fec for LOCO board Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 6f12ea4e54b7f213a463e2e03768cf02f0cd77a9 Author: Yong Shen Date: Wed Jan 12 17:14:46 2011 +0800 ARM i.MX53 enable SMD board bootup 1. Add Kconfig and Makefile entries 2. Add board definition 3. enable uart and fec for SMD board Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 65e2e9c8c3eab03f123d6852d14c0a65785c4e51 Author: Yong Shen Date: Thu Jan 13 11:39:53 2011 +0800 ARM: i.MX53 EVK: add spi nor device add spi board information for spi nor device Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 6b2837dc6d7f923bd622049823284b7277ff0558 Author: Yong Shen Date: Thu Jan 13 11:39:52 2011 +0800 ARM: i.MX53 EVK: add ecspi IOMUX setting add ecspi IOMUX setting, also fix a bug of chip select pin order Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 467ae1e47fd44c44dd4972780c7a804f45be0fe8 Author: Yong Shen Date: Thu Jan 13 11:39:51 2011 +0800 ARM: i.MX53: add IOMUX pad for ecspi Add IOMUX pad entry for ecspi Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 6db9a0f326d3144d790d9479309df480a8f562e4 Merge: c400c9e 18b022e Author: Takashi Iwai Date: Thu Jan 13 08:37:24 2011 +0100 Merge branch 'topic/asoc' into for-linus commit c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 Merge: e38302f 80c6785 Author: Takashi Iwai Date: Thu Jan 13 08:37:19 2011 +0100 Merge branch 'topic/hda' into for-linus commit e38302f78284e3e80ffc2eef54001fce7d183bd4 Merge: 3c0eee3 c386735 Author: Takashi Iwai Date: Thu Jan 13 08:37:14 2011 +0100 Merge branch 'topic/misc' into for-linus commit 80c678526d7da73bde4d46a4622449c2b3c88409 Author: Takashi Iwai Date: Thu Jan 13 08:08:08 2011 +0100 ALSA: hda - Fix NULL-derefence with a single mic in STAC auto-mic detection When only one mic is available and it's an analog mic, the current IDT/STAC parser may give an Oops. Reference: bko#25692 https://bugzilla.kernel.org/show_bug.cgi?id=25692 Signed-off-by: Takashi Iwai Cc: commit 4ae26f46c98f58ef19ad34f475617b40740d2faa Author: Paul Mundt Date: Thu Jan 13 15:46:35 2011 +0900 serial: sh-sci: build fixes. This fixes up the port_rx_irq_mask() REIE flag definition as well as a debug printk blowing up on the SCSCR_INIT having gone away. Signed-off-by: Paul Mundt commit ceb50f33d478ca42baf72257381a923c797b418b Author: Magnus Damm Date: Wed Jan 12 10:43:07 2011 +0000 ARM: mach-shmobile: Kill off unused !gpio_is_valid() case The Card Detect GPIOs used on AP4EVB and Mackerel are alwayws valid, so kill off the unused !gpio_is_valid() case. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit ef7fc9026fe6adef13870c6b2cb4642b6193af67 Merge: fac6c2a f43dc23 Author: Paul Mundt Date: Thu Jan 13 15:21:27 2011 +0900 Merge branch 'common/serial-rework' into sh-latest commit fac6c2a891a3e7255e4440f09a4c7da954043ba9 Author: Magnus Damm Date: Wed Jan 12 10:54:21 2011 +0000 sh: sh7372 SH4AL-DSP probe support Add probe support for the sh7372 SH4AL-DSP core. The most common use case for this is when the system boots from the ARM core in the sh7372 and uses the SH core for application offload as a slave CPU. May also be used to boot the sh7372 from the SH core. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f43dc23d5ea91fca257be02138a255f02d98e806 Merge: f8e5355 4162cf6 Author: Paul Mundt Date: Thu Jan 13 15:06:28 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework Conflicts: arch/sh/kernel/cpu/sh2/setup-sh7619.c arch/sh/kernel/cpu/sh2a/setup-mxg.c arch/sh/kernel/cpu/sh2a/setup-sh7201.c arch/sh/kernel/cpu/sh2a/setup-sh7203.c arch/sh/kernel/cpu/sh2a/setup-sh7206.c arch/sh/kernel/cpu/sh3/setup-sh7705.c arch/sh/kernel/cpu/sh3/setup-sh770x.c arch/sh/kernel/cpu/sh3/setup-sh7710.c arch/sh/kernel/cpu/sh3/setup-sh7720.c arch/sh/kernel/cpu/sh4/setup-sh4-202.c arch/sh/kernel/cpu/sh4/setup-sh7750.c arch/sh/kernel/cpu/sh4/setup-sh7760.c arch/sh/kernel/cpu/sh4a/setup-sh7343.c arch/sh/kernel/cpu/sh4a/setup-sh7366.c arch/sh/kernel/cpu/sh4a/setup-sh7722.c arch/sh/kernel/cpu/sh4a/setup-sh7723.c arch/sh/kernel/cpu/sh4a/setup-sh7724.c arch/sh/kernel/cpu/sh4a/setup-sh7763.c arch/sh/kernel/cpu/sh4a/setup-sh7770.c arch/sh/kernel/cpu/sh4a/setup-sh7780.c arch/sh/kernel/cpu/sh4a/setup-sh7785.c arch/sh/kernel/cpu/sh4a/setup-sh7786.c arch/sh/kernel/cpu/sh4a/setup-shx3.c arch/sh/kernel/cpu/sh5/setup-sh5.c drivers/serial/sh-sci.c drivers/serial/sh-sci.h include/linux/serial_sci.h commit 77e7bc6194655c36d43707ea53b4f86d1f1c8cf5 Author: Yong Shen Date: Tue Jan 11 17:21:53 2011 +0800 spi/imx: Add i.MX53 support 1. Change the Kconfig to include i.MX53 2. add devtype entry for i.MX53 Signed-off-by: Yong Shen Acked-by: Sascha Hauer Acked-by: Uwe Kleine-König Signed-off-by: Grant Likely commit ccbc87693dcb428443a72d644e63484676517c2d Author: Donguk Ryu Date: Thu Jan 13 13:40:29 2011 +0900 ARM: S5PV310: Add Support System MMU This patch adds support System MMU for S5PV310 and S5PC210. Signed-off-by: Donguk Ryu Signed-off-by: Sangbeom Kim [kgene.kim@samsung.com: changed SYSMMU config name] Signed-off-by: Kukjin Kim commit b55f685e973ae952cbff5bd0d57cd8cb91aa8daa Author: Donguk Ryu Date: Thu Jan 13 13:35:31 2011 +0900 ARM: S5P: Add Support System MMU This patch adds support System MMU which supports address transition from virtual address to physical address. Basically, each hardware block is connected System MMU block can use directly vitrual address when it accesses physical memory not using physical address. Signed-off-by: Donguk Ryu Signed-off-by: Sangbeom Kim [kgene.kim@samsung.com: removed useless codes] Signed-off-by: Kukjin Kim commit f00117a78341e330eecebdfe74cce345ed068802 Author: Dmitry Eremin-Solenikov Date: Wed Jan 12 15:19:35 2011 +0000 video: move SH_MIPI_DSI/SH_LCD_MIPI_DSI to the top of menu Kconfig entries SH_MIPI_DSI and SH_LCD_MIPI_DSI while being invisible to the user, broke the FrameBuffer menu (at least in menuconfig), as they aren't depending on respective menuconfig item (FB). In result several items got moved to the main "Graphics support" menu. Move these two problematic items to the top of drivers/video/Kbuild to restore nice display of FB menu. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Paul Mundt commit e41f1a98940824ad0c95271e69939acdc6092e5f Author: Alexey Charkov Date: Wed Jan 12 22:14:44 2011 +0000 fbdev: Implement simple blanking in pseudocolor modes for vt8500lcdfb Implement simple blanking in pseudocolor modes for vt8500lcdfb This follows the style of some other in-tree drivers by just setting the hardware palette colors to all black. True Color modes are not affected, but this at least allows to run xf86-video-fbdev without errors due to blanking being unimplemented. Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit 3806b4f3b6115ce324b7125844f9e6acc80d34ec Author: Randy Dunlap Date: Wed Jan 12 14:50:51 2011 +0000 eth: fix new kernel-doc warning Fix new kernel-doc warning (copy-paste typo): Warning(net/ethernet/eth.c:366): No description found for parameter 'rxqs' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 838b4dc6d8a6bd83a93077ebc6873712c65bf85e Author: stephen hemminger Date: Wed Jan 12 15:42:32 2011 +0000 sched: remove unused backlog in RED stats The RED statistics structure includes backlog field which is not set or used by any code. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 35ab7b798a2dc4a9b19bd85833f83a19736bcfd8 Author: Joe Perches Date: Wed Jan 12 11:21:18 2011 +0000 bna: Remove unnecessary memset(,0,) kzalloc'd memory doesn't need a memset to 0. Signed-off-by: Joe Perches Acked-by: Rasesh Mody Signed-off-by: David S. Miller commit 464143c911df98d4913932534485113a0a14aa74 Merge: bb12310 2fc72c7 Author: David S. Miller Date: Wed Jan 12 18:58:40 2011 -0800 Merge branch 'master' of git://1984.lsi.us.es/net-2.6 commit bb1231052e265e960d902ab32e67c5ccdabc9434 Merge: 72b43d0 4e5518c Author: David S. Miller Date: Wed Jan 12 18:52:31 2011 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 72b43d0898e97f588293b4a24b33c58c46633d81 Author: Alexey Kuznetsov Date: Wed Jan 12 08:34:08 2011 +0000 inet6: prevent network storms caused by linux IPv6 routers Linux IPv6 forwards unicast packets, which are link layer multicasts... The hole was present since day one. I was 100% this check is there, but it is not. The problem shows itself, f.e. when Microsoft Network Load Balancer runs on a network. This software resolves IPv6 unicast addresses to multicast MAC addresses. Signed-off-by: Alexey Kuznetsov Signed-off-by: David S. Miller commit 12252771691aaf4935206367e0917a8f697acfcb Author: Tobias Klauser Date: Tue Jan 11 23:30:11 2011 +0000 netdev: bfin_mac: Use is_multicast_ether_addr helper Signed-off-by: Tobias Klauser Acked-by: Mike Frysinger Signed-off-by: David S. Miller commit 6c64b0c696d7a650f52d75ea59375983ec0d5e33 Author: Tobias Klauser Date: Tue Jan 11 23:31:01 2011 +0000 netdev: ucc_geth: Use is_multicast_ether_addr helper Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 924241575a85249b9d410e38f5b2fcad9035e45c Author: Josef Bacik Date: Wed Jan 5 15:00:07 2011 -0500 fs: add documentation on fallocate hole punching This patch simply adds documentation on how to handle the hole punching mode of fallocate for any filesystem wishing to use it. Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit 9ecf639a9686c9c7e3fd2cd72817ca490c658e6f Author: Josef Bacik Date: Wed Nov 17 20:46:20 2010 -0500 Gfs2: fail if we try to use hole punch Gfs2 doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit 23a8519b55235660f6fb7d6f394a912de9d23208 Author: Josef Bacik Date: Wed Nov 17 20:46:19 2010 -0500 Btrfs: fail if we try to use hole punch Btrfs doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit d6dc8462f471f7bbb49c42c147bf84de0c977099 Author: Josef Bacik Date: Wed Nov 17 20:46:18 2010 -0500 Ext4: fail if we try to use hole punch Ext4 doesn't have the ability to punch holes yet, so make sure we return EOPNOTSUPP if we try to use hole punching through fallocate. This support can be added later. Thanks, Acked-by: Jan Kara Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit db47fef2cd9aab76ab976e8b45a06a1b3ad0e3e4 Author: Josef Bacik Date: Wed Nov 17 20:46:17 2010 -0500 Ocfs2: handle hole punching via fallocate properly This patch just makes ocfs2 use its UNRESERVP ioctl when we get the hole punch flag in fallocate. I didn't test it, but it seems simple enough. Thanks, Acked-by: Jan Kara Acked-by: Joel Becker Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit c25d246715b87ad37e69e7abd1a0fed781423fa2 Author: Josef Bacik Date: Wed Nov 17 20:46:16 2010 -0500 XFS: handle hole punching via fallocate properly This patch simply allows XFS to handle the hole punching flag in fallocate properly. I've tested this with a little program that does a bunch of random hole punching with FL_KEEP_SIZE and without it to make sure it does the right thing. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit 79124f18b335172e1916075c633745e12dae1dac Author: Josef Bacik Date: Wed Nov 17 20:46:15 2010 -0500 fs: add hole punching to fallocate Hole punching has already been implemented by XFS and OCFS2, and has the potential to be implemented on both BTRFS and EXT4 so we need a generic way to get to this feature. The simplest way in my mind is to add FALLOC_FL_PUNCH_HOLE to fallocate() since it already looks like the normal fallocate() operation. I've tested this patch with XFS and BTRFS to make sure XFS did what it's supposed to do and that BTRFS failed like it was supposed to. Thank you, Signed-off-by: Josef Bacik Signed-off-by: Al Viro commit e1181ee6575d7970bad15aaa852784b4972d2af8 Author: Jeff Layton Date: Tue Dec 7 16:19:50 2010 -0500 vfs: pass struct file to do_truncate on O_TRUNC opens (try #2) When a file is opened with O_TRUNC, the truncate processing is handled by handle_truncate(). This function however doesn't receive any info about the newly instantiated filp, and therefore can't pass that info along so that the setattr can use it. This makes NFSv4 misbehave. The client does an open and gets a valid stateid, and then doesn't use that stateid on the subsequent truncate. It uses the zero-stateid instead. Most servers ignore this fact and just do the truncate anyway, but some don't like it (notably, RHEL4). It seems more correct that since we have a fully instantiated file at the time that handle_truncate is called, that we pass that along so that the truncate operation can properly use it. Signed-off-by: Jeff Layton Signed-off-by: Al Viro commit cccb5a1e698535fa5a734ffe21c7061c97f8d8c5 Author: Al Viro Date: Fri Dec 17 07:44:05 2010 -0500 fix signedness mess in rw_verify_area() on 64bit architectures ... and clean the unsigned-f_pos code, while we are at it. Signed-off-by: Al Viro commit 208898c17a97610ce1c01b1cc58e51802a1d52c3 Author: Randy Dunlap Date: Thu Nov 18 15:02:49 2010 -0800 fs: fix kernel-doc for dcache::prepend_path Fix function kernel-doc warning for prepend_path(): Warning(fs/dcache.c:1924): missing initial short description on line: Signed-off-by: Randy Dunlap Cc: Alexander Viro Signed-off-by: Al Viro commit 1c977540fda4bf65ab467d110f5d840fc27e7608 Author: Randy Dunlap Date: Thu Nov 18 15:02:45 2010 -0800 fs: fix kernel-doc for dcache::d_validate Fix function parameter kernel-doc for d_validate(): Warning(fs/dcache.c:1495): No description found for parameter 'parent' Warning(fs/dcache.c:1495): Excess function parameter 'dparent' description in 'd_validate' Signed-off-by: Randy Dunlap Cc: Alexander Viro Signed-off-by: Al Viro commit 66cb76666d69502fe982990b2cff5b6d607fd3b1 Author: Al Viro Date: Wed Jan 12 20:04:37 2011 -0500 sanitize ecryptfs ->mount() kill ecryptfs_read_super(), reorder code allowing to use normal d_alloc_root() instead of opencoding it. Signed-off-by: Al Viro commit d61dcce2977d9abe855a5fe3570a81242209c23b Author: Al Viro Date: Wed Jan 12 20:04:20 2011 -0500 switch afs Signed-off-by: Al Viro commit 32c419d95f3d1da891ab9bd032a214ee05b94ed4 Author: Al Viro Date: Wed Jan 12 17:37:47 2011 -0500 move internal-only parts of ncpfs headers to fs/ncpfs Signed-off-by: Al Viro commit 0378c4051a621303ae919f1cee832206a4c1aa68 Author: Al Viro Date: Wed Jan 12 17:25:03 2011 -0500 switch ncpfs merge dentry_operations for root and non-root Signed-off-by: Al Viro commit 98cd3fb0a2c376f583216ec35f66175a71b2ef67 Author: Al Viro Date: Wed Jan 12 17:10:55 2011 -0500 switch 9p here we actually *want* ->d_op for root; setting it allows to get rid of kludge in v9fs_kill_super() since now we have proper ->d_release() for root and don't need to call it manually. Signed-off-by: Al Viro commit c74a1cbb3cac348f276fabc381758f5b0b4713b2 Author: Al Viro Date: Wed Jan 12 16:59:34 2011 -0500 pass default dentry_operations to mount_pseudo() Signed-off-by: Al Viro commit f772c4a6a320ec25d94ba951881474eeef1b7f48 Author: Al Viro Date: Wed Jan 12 16:47:00 2011 -0500 switch hostfs ->d_delete() doesn't matter for s_root anyway Signed-off-by: Al Viro commit a129880dafaa3c80eb0bae714da38088ccc2ce21 Author: Al Viro Date: Wed Jan 12 16:45:19 2011 -0500 switch affs either d_op instance would work for root, actually... Signed-off-by: Al Viro commit d463a0c4b53a8fab505fd9aa3a1a04cb9f411b78 Author: Al Viro Date: Wed Jan 12 16:41:05 2011 -0500 switch configfs Signed-off-by: Al Viro commit 31a203df9c109480fc6d48ba0a68763e89199acb Author: Al Viro Date: Wed Jan 12 16:36:09 2011 -0500 take coda-private headers out of include/linux Signed-off-by: Al Viro commit 9501e4c48e1561443e1a16c2c9917ec6c63118a4 Author: Al Viro Date: Wed Jan 12 16:25:02 2011 -0500 switch coda Coda ->d_revalidate() actually checks for root, ->d_delete() is irrelevant. So we can use the same d_op for all coda dentries Signed-off-by: Al Viro commit b5c7d208ca48e7769aa38731665283790de49840 Author: Al Viro Date: Wed Jan 12 16:19:20 2011 -0500 convert smbfs Signed-off-by: Al Viro commit 43d344d7722f9b914849ba0014342111a9a0b03e Author: Al Viro Date: Wed Jan 12 16:12:05 2011 -0500 switch hpfs Signed-off-by: Al Viro commit 0df6a63f8735a7c8a877878bc215d4312e41ef81 Author: Al Viro Date: Tue Dec 21 13:29:29 2010 -0500 switch cgroup switching it to s_d_op allows to kill the cgroup_lookup() kludge. Signed-off-by: Al Viro commit af53d29ac13a97304d44343dc3b26154ca595268 Author: Al Viro Date: Mon Dec 20 10:56:06 2010 -0500 switch btrfs, close races Signed-off-by: Al Viro commit ba87167c06ed0049260d9ca36405c0f8af609e07 Author: Al Viro Date: Sat Dec 18 12:10:00 2010 -0500 switch ocfs2, close races Signed-off-by: Al Viro commit 41ced6dcf3dc6b901716fda0dc8de3536da4d39b Author: Al Viro Date: Sat Dec 18 12:06:56 2010 -0500 switch gfs2, close races Signed-off-by: Al Viro commit 1c929cfe6d8f2087a337a868fbf6c38d56bb4889 Author: Al Viro Date: Sat Dec 18 11:43:51 2010 -0500 switch cifs Signed-off-by: Al Viro commit 8b244ff2fa58f81f84aa03c82c2c23307a778ce7 Author: Al Viro Date: Sat Dec 18 11:29:39 2010 -0500 switch nfs to ->s_d_op Signed-off-by: Al Viro commit 96e1391414f80a8a3bae74ddf58d3c2870e304f0 Author: Al Viro Date: Sat Dec 18 11:20:57 2010 -0500 switch adfs Signed-off-by: Al Viro commit eddf790bd41aa153922df223b4692cc606cadb7b Author: Al Viro Date: Sat Dec 18 11:19:23 2010 -0500 switch hfsplus Signed-off-by: Al Viro commit 518c79d28e22f657fec399ef5bf0d50b13f7e9b0 Author: Al Viro Date: Sat Dec 18 11:19:14 2010 -0500 switch hfs Signed-off-by: Al Viro commit c6cb412366e8f338baae7300b9f1961f3e559a24 Author: Al Viro Date: Sat Dec 18 11:17:44 2010 -0500 minixfs: kill dead code ->d_op of root stays NULL these days on minixfs Signed-off-by: Al Viro commit 30304aba6a053f114092cea6643a96ac2902bc5a Author: Al Viro Date: Sat Dec 18 11:16:30 2010 -0500 switch sysv Signed-off-by: Al Viro commit c35eebe9939f55b9d51631d03301a7af19090dcc Author: Al Viro Date: Sat Dec 18 11:15:22 2010 -0500 switch fuse Signed-off-by: Al Viro commit d93e34faf924bd98f158712d63085662e648e389 Author: Al Viro Date: Fri Dec 17 07:41:48 2010 -0500 pohmelfs: double-free and leak wrong dentry dropped... Signed-off-by: Al Viro commit 94b77bd86f8ad458fa7870def78ec3a8a7caa986 Author: Al Viro Date: Sat Dec 18 10:59:31 2010 -0500 switch jfs to ->s_d_op, close exportfs races Signed-off-by: Al Viro commit 3d23985d6cfa7908e46fd0c62a2ee84faffe4d8b Author: Al Viro Date: Sat Dec 18 10:44:00 2010 -0500 switch fat to ->s_d_op, close exportfs races there don't bother with lock_super() in fat_fill_super() callers, while we are at it - there won't be any concurrency anyway. Signed-off-by: Al Viro commit 6cc9c1d2c1414ef67f465462aa96a5d1fed12f5d Author: Al Viro Date: Sat Dec 18 10:29:26 2010 -0500 fix isofs d_op handling switch to ->s_d_op; d_obtain_alias() will DTRT now Signed-off-by: Al Viro commit c8aebb0c9f8c7471643d5f8ba68328de8013005f Author: Al Viro Date: Sat Dec 18 10:22:30 2010 -0500 per-superblock default ->d_op Signed-off-by: Al Viro commit 766fc43973b16f9becb6b7402b3e052dbb84adee Author: Yehuda Sadeh Date: Fri Jan 7 14:58:42 2011 -0800 rbd: fix cleanup when trying to mount inexistent image Previously we didn't clean up the sysfs entry that was just created. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit f363e45fd1184219b472ea549cb7e192e24ef4d2 Author: Tejun Heo Date: Mon Jan 3 14:49:46 2011 +0100 net/ceph: make ceph_msgr_wq non-reentrant ceph messenger code does a rather complex dancing around multithread workqueue to make sure the same work item isn't executed concurrently on different CPUs. This restriction can be provided by workqueue with WQ_NON_REENTRANT. Make ceph_msgr_wq non-reentrant workqueue with the default concurrency level and remove the QUEUED/BUSY logic. * This removes backoff handling in con_work() but it couldn't reliably block execution of con_work() to begin with - queue_con() can be called after the work started but before BUSY is set. It seems that it was an optimization for a rather cold path and can be safely removed. * The number of concurrent work items is bound by the number of connections and connetions are independent from each other. With the default concurrency level, different connections will be executed independently. Signed-off-by: Tejun Heo Cc: Sage Weil Cc: ceph-devel@vger.kernel.org Signed-off-by: Sage Weil commit 01e6acc4ea4c284c44bfb3d46c76f4ae580c6435 Author: Tejun Heo Date: Mon Jan 3 14:49:45 2011 +0100 ceph: fsc->*_wq's aren't used in memory reclaim path fsc->*_wq's aren't depended upon during memory reclaim. Convert to alloc_workqueue() w/o WQ_MEM_RECLAIM. Signed-off-by: Tejun Heo Cc: Sage Weil Cc: ceph-devel@vger.kernel.org Signed-off-by: Sage Weil commit b0aee3516d84c05240065a53f238ba7a718f56b9 Author: Jesper Juhl Date: Fri Dec 24 23:01:12 2010 +0100 ceph: Always free allocated memory in osdmap_decode() Always free memory allocated to 'pi' in net/ceph/osdmap.c::osdmap_decode(). Signed-off-by: Jesper Juhl Signed-off-by: Sage Weil commit 582c86e69045f37da8be445c265f72a7a73b18c6 Author: Tracey Dent Date: Tue Dec 14 19:32:37 2010 -0500 ceph: Makefile: Remove unnessary code Remove the if and else conditional because the code is in mainline and there is no need in it being there. Also, Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: Sage Weil commit dc69e2e9fcd7c613eb744ea3b9c4ee9ca554e822 Author: Sage Weil Date: Tue Nov 2 13:49:00 2010 -0700 ceph: associate requests with opening sessions Associate request with sessions that aren't yep open. This makes the debugfs mdsc request list more informative. Signed-off-by: Sage Weil commit 4af25fdda6943f311a63034f80933e4d6d6e3a19 Author: Sage Weil Date: Tue Nov 2 13:41:47 2010 -0700 ceph: drop redundant r_mds field The r_mds field is redundant, since we can find the same information at r_session->s_mds, and when r_session is NULL then r_mds is meaningless. Signed-off-by: Sage Weil commit 14303d20f3ae3e6ab626c77a4aac202b3bafd377 Author: Sage Weil Date: Tue Dec 14 17:37:52 2010 -0800 ceph: implement DIRLAYOUTHASH feature to get dir layout from MDS This implements the DIRLAYOUTHASH protocol feature, which passes the dir layout over the wire from the MDS. This gives the client knowledge of the correct hash function to use for mapping dentries among dir fragments. Note that if this feature is _not_ present on the client but is on the MDS, the client may misdirect requests. This will result in a forward and degrade performance. It may also result in inaccurate NFS filehandle generation, which will prevent fh resolution when the inode is not present in the client cache and the parent directories have been fragmented. Signed-off-by: Sage Weil commit 6c0f3af72cb1622a66962a1180c36ef8c41be8e2 Author: Sage Weil Date: Tue Nov 16 11:14:34 2010 -0800 ceph: add dir_layout to inode Add a ceph_dir_layout to the inode, and calculate dentry hash values based on the parent directory's specified dir_hash function. This is needed because the old default Linux dcache hash function is extremely week and leads to a poor distribution of files among dir fragments. Signed-off-by: Sage Weil commit 43952886f0b8b3c344c3392b88de067d5fa5419a Merge: 56dbed1 f77cfe4 Author: Len Brown Date: Wed Jan 12 18:06:19 2011 -0500 Merge branch 'cpuidle-perf-events' into idle-test commit 56dbed129df3fdd4caf9018b6e7599ee258a5420 Merge: 2a2d31c f878133 Author: Len Brown Date: Wed Jan 12 18:06:06 2011 -0500 Merge branch 'linus' into idle-test commit f77cfe4ea21760268c0277fa3e4b02dfd2a2c2f4 Author: Thomas Renninger Date: Fri Jan 7 11:29:44 2011 +0100 cpuidle/x86/perf: fix power:cpu_idle double end events and throw cpu_idle events from the cpuidle layer Currently intel_idle and acpi_idle driver show double cpu_idle "exit idle" events -> this patch fixes it and makes cpu_idle events throwing less complex. It also introduces cpu_idle events for all architectures which use the cpuidle subsystem, namely: - arch/arm/mach-at91/cpuidle.c - arch/arm/mach-davinci/cpuidle.c - arch/arm/mach-kirkwood/cpuidle.c - arch/arm/mach-omap2/cpuidle34xx.c - arch/drivers/acpi/processor_idle.c (for all cases, not only mwait) - arch/x86/kernel/process.c (did throw events before, but was a mess) - drivers/idle/intel_idle.c (did throw events before) Convention should be: Fire cpu_idle events inside the current pm_idle function (not somewhere down the the callee tree) to keep things easy. Current possible pm_idle functions in X86: c1e_idle, poll_idle, cpuidle_idle_call, mwait_idle, default_idle -> this is really easy is now. This affects userspace: The type field of the cpu_idle power event can now direclty get mapped to: /sys/devices/system/cpu/cpuX/cpuidle/stateX/{name,desc,usage,time,...} instead of throwing very CPU/mwait specific values. This change is not visible for the intel_idle driver. For the acpi_idle driver it should only be visible if the vendor misses out C-states in his BIOS. Another (perf timechart) patch reads out cpuidle info of cpu_idle events from: /sys/.../cpuidle/stateX/*, then the cpuidle events are mapped to the correct C-/cpuidle state again, even if e.g. vendors miss out C-states in their BIOS and for example only export C1 and C3. -> everything is fine. Signed-off-by: Thomas Renninger CC: Robert Schoene CC: Jean Pihet CC: Arjan van de Ven CC: Ingo Molnar CC: Frederic Weisbecker CC: linux-pm@lists.linux-foundation.org CC: linux-acpi@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: linux-perf-users@vger.kernel.org CC: linux-omap@vger.kernel.org Signed-off-by: Len Brown commit da995a8aee044bc5d0847e19e351cd48a2cb8bcc Author: Aleksey Senin Date: Thu Dec 2 11:44:49 2010 +0000 IB/mlx4: Handle protocol field in multicast table The newest device firmware stores IB vs. Ethernet protocol in two bits in members_count field of multicast group table (0: Infiniband, 1: Ethernet). When changing the QP members count for a multicast group, it important not to reset this information. When calling multicast attach first time, the protocol type should be specified. In this patch we always set it IB, but in the future we will handle Ethernet too. When looking for a QP, the protocol type shoud be checked too. Signed-off-by: Aleksey Senin Signed-off-by: Roland Dreier commit bf542a4e7b634c2adcba4241a29082f69b0f45dc Author: Sascha Silbe Date: Wed Jan 12 23:23:23 2011 +0100 olpc_battery: Fix up XO-1.5 properties list The patches adding support for CURRENT_NOW, VOLTAGE_NOW, CHARGE_NOW and CHARGE_FULL_DESIGN were based on a tree not including c566d299 ("olpc_battery: Ambient temperature is not available on XO-1.5") and therefore only modified the then-common, now-XO-1 properties list. This patch adds the new properties to XO-1.5 as well. Signed-off-by: Sascha Silbe Signed-off-by: Anton Vorontsov commit dad92924ea4c9167e64a2835ec9310c73570b10b Merge: adeaf46 74f56c4 Author: Ben Dooks Date: Wed Jan 12 22:26:12 2011 +0000 Merge branch 'for-2638/i2c/bfin2' into for-linus/i2c-2638 commit adeaf46d311715deee9ae38ef1edb0d6b6fb0d55 Merge: 428dcc1 6d779a4 Author: Ben Dooks Date: Wed Jan 12 22:25:32 2011 +0000 Merge branch 'for-2638/i2c/nomadik' into for-linus/i2c-2638 commit 428dcc19374c9ebcf8fee057057c9023174c1b2a Merge: c5ba47b e9bc8fa Author: Ben Dooks Date: Wed Jan 12 22:24:56 2011 +0000 Merge branch 'for-2638/i2c/intel' into for-linus/i2c-2638 commit c5ba47ba7f3810adf4974ed4fe7134327333130d Merge: 084b7c8 d9240e6 Author: Ben Dooks Date: Wed Jan 12 22:24:51 2011 +0000 Merge branch 'for-2638/i2c/ocores' into for-linus/i2c-2638 commit 084b7c83830fab95bd686e2b0b5321dec0300a96 Merge: 7f42f9f 747fcc9 Author: Ben Dooks Date: Wed Jan 12 22:24:46 2011 +0000 Merge branch 'for-2638/i2c/iop' into for-linus/i2c-2638 commit 7f42f9fef7bbc4f3250a33bf58170c640cd3db18 Merge: cc3feac 6a91b55 Author: Ben Dooks Date: Wed Jan 12 22:24:36 2011 +0000 Merge branch 'for-2638/i2c/omap' into for-linus/i2c-2638 commit cc3feac34617ec685551905507cd8d909be6431f Merge: f878133 eda6bee Author: Ben Dooks Date: Wed Jan 12 22:24:30 2011 +0000 Merge branch 'for-2638/i2c/mv64xx' into for-linus/i2c-2638 commit 74f56c4ad4e4627862bddb0b8c3ab394e3c004f7 Author: Michael Hennerich Date: Tue Jan 11 00:25:09 2011 -0500 i2c-bfin-twi: move setup to the earlier subsys initcall Some systems using this bus sometimes have very basic devices such as regulators on the bus, so the I2C bus master needs to be loaded early. This also matches the behavior of many other I2C bus master drivers. Therefore initialize via subsys_initcall(). Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit 540ac5553e8169413a90a8e68b3a10f801640eb7 Author: Michael Hennerich Date: Tue Jan 11 00:25:08 2011 -0500 i2c-bfin-twi: handle faulty slave devices better Faulty slave devices might drive SDA low after a transfer finishes. So, when this scenario is detected, have the master generate up to 9 extra clocks until the SDA is properly released. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Ben Dooks commit 4263d9a3ae4d15785897d0543bb59316c84ee605 Merge: eab001b 6fed05c Author: Len Brown Date: Wed Jan 12 16:11:46 2011 -0500 Merge branch 'suspend-ioremap-cache' into release commit 6fed05c9c9812b5882bc708f4da4fa8d5df2875c Author: Rafael J. Wysocki Date: Wed Jan 12 22:03:20 2011 +0100 ACPI / PM: Fix build problems for !CONFIG_ACPI related to NVS rework The recent rework of the NVS saving/restoring code introduced two build issues for !CONFIG_ACPI, a warning in drivers/acpi/internal.h and an error in arch/x86/kernel/e820.c. Fix them by providing suitable static inline definitions of the relevant functions. Signed-off-by: Rafael J. Wysocki Acked-by: Randy Dunlap Signed-off-by: Len Brown commit 06f3d9fb4a7d3528121446e94ee37b95bba4d106 Author: Juerg Haefliger Date: Wed Jan 12 21:55:13 2011 +0100 hwmon: (dme1737) Minor cleanups Minor cleanups. Mostly removing assignments in if statements to get rid of checkpatch errors. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit d4b94e1fa6c69fd74abca5b7db1ab350d65ce89b Author: Juerg Haefliger Date: Wed Jan 12 21:55:13 2011 +0100 hwmon: (dme1737) Add support for in7 for SCH5127 Add support for the 1.5V voltage monitoring input (in7) of the SMSC SCH5127 chip. Signed-off-by: Juerg Haefliger Signed-off-by: Jean Delvare commit 7a1b76f2a46016809c7bcacf81e89948cc306703 Author: Jekyll Lai Date: Wed Jan 12 21:55:12 2011 +0100 hwmon: (emc1403) Add EMC1423 support EMC1423 uses the similar register and adds a hardware shutdown pin to protect exceed temperature. This function is set by resistor; it's not necessary to do anything in the driver except add the emc1423 pid of 0x23. Signed-off-by: Jekyll Lai [Updated Kconfig/comments and minor further changes asked for by the hwmon maintainers] Signed-off-by: Alan Cox [Fixed checkpatch warning] Signed-of--by: Jean Delvare commit 3ea1bd58b999ec77c28834aa8be671168dfb7b79 Author: Jean Delvare Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (w83627hf) Document W83627THF voltage pin mapping I had to look it up for one user, so we might as well store it in the driver documentation. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit 36c7fe133e29a0b2558edaef18b2401e99765417 Author: Jean Delvare Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (w83793) Drop useless mutex This is the same case as fschmd, from which the code was copied as far as I can see. So the same clean-up applies: The WDIOC_GETSUPPORT ioctl only needs a mutex because it operates on a static variable. There is no good reason to keep this variable static, so let's just make it non-static and drop the now useless mutex altogether. See the discussion at: http://marc.info/?l=lm-sensors&m=125563869402323&w=2 Signed-off-by: Jean Delvare Cc: Hans de Goede Acked-by: Guenter Roeck Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner commit 1b7243e8f51157103dcca33236163a191c8afd01 Author: Jean Delvare Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (fschmd) Drop useless mutex As discussed one year ago, the WDIOC_GETSUPPORT ioctl only needs a mutex because it operates on a static variable. There is no good reason to keep this variable static, so let's just make it non-static and drop the now useless mutex altogether. See the discussion at: http://marc.info/?l=lm-sensors&m=125563869402323&w=2 Signed-off-by: Jean Delvare Cc: Hans de Goede Acked-by: Guenter Roeck Acked-by: Arnd Bergmann Acked-by: Thomas Gleixner commit 1ca28218eb57143d9ae6298f10c8a193696458a8 Author: Joe Perches Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (w83781d) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats [JD: Optimize repeated debug messages] Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit 5e24e0c365e0f83f9a6f5adb3bd0cf5ca5cd8ab1 Author: Joe Perches Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (pc87427) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit 9e991c6fad4618a9158437f1f650225f9ec485c3 Author: Joe Perches Date: Wed Jan 12 21:55:11 2011 +0100 hwmon: (pc87360) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats [JD: Also convert debug messages] Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit ce47da742ddd950197c29df6f9f89cf8adb5a0a1 Author: Joe Perches Date: Wed Jan 12 21:55:10 2011 +0100 hwmon: (lm78) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit a8ca103793350bd66280d56ee58870c682b54e75 Author: Joe Perches Date: Wed Jan 12 21:55:10 2011 +0100 hwmon: (it87) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit 632bdb24d717f1b24841b9dc31efb6837afe0c55 Author: Jean Delvare Date: Wed Jan 12 21:55:10 2011 +0100 hwmon: Schedule the removal of the old intrusion detection interfaces Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit a516dc3e9b19adbcaa9aeda0100ee8ee2938748a Author: Jean Delvare Date: Wed Jan 12 21:55:10 2011 +0100 hwmon: (w83793) Implement the standard intrusion detection interface We have a standard intrusion detection interface now, drivers should implement it. I've left the old interface in place for the time being, with a deprecation warning, it will be removed later. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit c32301b5957bb77579eb80ff5a84324d34b97346 Author: Jean Delvare Date: Wed Jan 12 21:55:09 2011 +0100 hwmon: (w83792d) Implement the standard intrusion detection interface We have a standard intrusion detection interface now, drivers should implement it. I've left the old interface in place for the time being, with a deprecation warning, it will be removed later. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit 0de2b244800b2c0d88d0a85bbe4a0b95fee13332 Author: Jean Delvare Date: Wed Jan 12 21:55:09 2011 +0100 hwmon: (adm9240) Implement the standard intrusion detection interface We have a standard intrusion detection interface now, drivers should implement it. I've left the old interface in place for the time being, with a deprecation warning, it will be removed later. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit f790674d3f87df6390828ac21a7d1530f71b59c8 Author: Jean Delvare Date: Wed Jan 12 21:55:09 2011 +0100 hwmon: (via686a) Initialize fan_div values Functions set_fan_min() and set_fan_div() assume that the fan_div values have already been read from the register. The driver currently doesn't initialize them at load time, they are only set when function via686a_update_device() is called. This means that set_fan_min() and set_fan_div() misbehave if, for example, "sensors -s" is called before any monitoring application (e.g. "sensors") is has been run. Fix the problem by always initializing the fan_div values at device bind time. Signed-off-by: Jean Delvare Cc: stable@kernel.org Acked-by: Guenter Roeck commit 014bcd28a04ec085940ea3125f5ea91b16a1945d Author: Jean Delvare Date: Wed Jan 12 21:55:09 2011 +0100 hwmon: (w83795) Silent false warning from gcc The code triggers a false warning with older versions of gcc: w83795.c: In function 'w83795_update_device': w83795.c:475: warning: 'lsb' may be used uninitialized in this function I admit that the code is a little tricky, but I see no way to write it differently without hurting performance. So let's just silent the warning with a needless initialization. Signed-off-by: Jean Delvare Acked-by: Guenter Roeck commit 5d84291da3a594ac391c85296e28f41ff92da0cf Author: Steven Hardy Date: Wed Jan 12 21:55:08 2011 +0100 hwmon: (ads7828) Update email contact details Trivial patch updating my email contact details due to change of employer, and because I no longer have access to the previously used domain. Unfortunately I also no longer have access to any ads7828 hardware, but am happy to support/maintain the driver if others are able to test changes. Signed-off-by: Steve Hardy Signed-off-by: Jean Delvare commit c8303e7f3f3093c16ef0fa5f73280637c89d4368 Author: Indan Zupancic Date: Wed Jan 12 11:59:19 2011 +0000 drm/i915/panel: The backlight is enabled if the current value is non-zero ... and not if the maximum is non-zero. This fixes the typo introduced in 47356eb6728501452 and preserves the backlight value from boot. [ickle: My thanks also to Indan Zupancic for diagnosing the original regression and suggesting the appropriate fix.] Signed-off-by: Chris Wilson Cc: stable@kernel.org # after 47356eb6728501452 commit 833bcb00c478c674fda0aaea089c1a92abd2da01 Author: Chris Wilson Date: Wed Jan 12 12:14:13 2011 +0000 drm/i915/debugfs: Correct format after changing type of err object 'size' Signed-off-by: Chris Wilson commit 0adfca6ff2131c7c67dffe094611097bbc9f5005 Author: Linus Walleij Date: Wed Jan 12 18:50:37 2011 +0100 ARM: 6622/1: fix dma_unmap_sg() documentation The kerneldoc for this function is at odds with the DMA-API document, which holds, so fix it. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 2fc72c7b84002ffb3c66918e2a7b0ee607d8b5aa Author: KOVACS Krisztian Date: Wed Jan 12 20:25:08 2011 +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 Acked-by: Randy Dunlap Signed-off-by: KOVACS Krisztian Signed-off-by: Pablo Neira Ayuso commit 948579cd8c6ea7c8c98c52b79f4470952e182ebd Author: Joe Perches Date: Fri Nov 5 03:07:36 2010 +0000 RDMA: Use vzalloc() to replace vmalloc()+memset(0) Signed-off-by: Joe Perches Signed-off-by: Roland Dreier commit dff0092bcdb7b21ba2e862fed7c92e79dfb26806 Author: Tony Luck Date: Wed Jan 12 11:02:43 2011 -0800 [IA64] Fix format warning in arch/ia64/kernel/acpi.c arch/ia64/kernel/acpi.c:481: warning: format ‘%d’ expects type ‘int’, but argument 2 has type ‘long unsigned int’ Introduced by commit 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510 [IA64] Avoid array overflow if there are too many cpus in SRAT table Signed-off-by: Tony Luck commit e528db5b392ab2a624258a667fed0e65af6e411b Author: Konrad Rzeszutek Wilk Date: Wed Jan 12 12:58:06 2011 -0500 xen-platform: Fix compile errors if CONFIG_PCI is not enabled. drivers/xen/platform-pci.c:127: error: implicit declaration of function 'pci_request_region' drivers/xen/platform-pci.c:165: error: implicit declaration of function 'pci_release_region' Signed-off-by: Konrad Rzeszutek Wilk commit 4979d18fe105297f8f065743f31f8f735da8df2d Author: Roland Dreier Date: Wed Jan 12 09:50:36 2011 -0800 mlx4_{core, ib, en}: Fix driver when sizeof (phys_addr_t) > sizeof (long) Some systems have PCI addresses that don't fit in unsigned long (eg some 32-bit PowerPC 440 systems have 36-bit bus addresses). Fix up mlx4 drivers by using phys_addr_t where appropriate, so we don't truncate any PCI resource addresses before ioremapping them. Signed-off-by: Roland Dreier commit 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c Author: Shaohua Li Date: Mon Jan 10 09:38:12 2011 +0800 intel_idle: open broadcast clock event Intel_idle driver uses CLOCK_EVT_NOTIFY_BROADCAST_ENTER CLOCK_EVT_NOTIFY_BROADCAST_EXIT for broadcast clock events. The _ENTER/_EXIT doesn't really open broadcast clock events, please see processor_idle.c for an example. In some situation, this will cause boot hang, because some CPUs enters idle but local APIC timer stalls. Reported-and-tested-by: Yan Zheng Signed-off-by: Shaohua Li cc: stable@kernel.org Signed-off-by: Len Brown commit 5392083748a340f68052c0b83a7ce28b10324972 Author: Len Brown Date: Wed Jan 12 02:56:15 2011 -0500 cpuidle: CPUIDLE_FLAG_CHECK_BM is omap3_idle specific Signed-off-by: Len Brown commit 956d033fb2eb3f8818260cdf01644bf4dc1a9e33 Author: Len Brown Date: Wed Jan 12 02:51:20 2011 -0500 cpuidle: CPUIDLE_FLAG_TLB_FLUSHED is specific to intel_idle Signed-off-by: Len Brown commit 642f11c53f17aee991d97d14e6922172849ef227 Author: Len Brown Date: Wed Jan 12 02:45:00 2011 -0500 cpuidle: delete unused CPUIDLE_FLAG_SHALLOW, BALANCED, DEEP definitions Signed-off-by: Len Brown commit 03d8b083511a7be2c69b750b8a4e412a21189291 Author: Len Brown Date: Wed Jan 12 02:43:26 2011 -0500 SH, cpuidle: delete use of NOP CPUIDLE_FLAGS_SHALLOW set but not checked. Signed-off-by: Len Brown commit d247632c08c674864d438733280422ddb7130ff8 Author: Len Brown Date: Wed Jan 12 02:34:59 2011 -0500 cpuidle: delete NOP CPUIDLE_FLAG_POLL it serves no purpose Signed-off-by: Len Brown commit 0aae9f923bcc476a8e4725dd3ac37547b9816ee5 Author: Len Brown Date: Wed Jan 12 02:22:56 2011 -0500 ACPI: processor_idle: delete use of NOP CPUIDLE_FLAGs CPUIDLE_FLAG_SHALLOW CPUIDLE_FLAG_BALANCED CPUIDLE_FLAG_DEEP CPUIDLE_FLAG_CHECK_BM were set by acpi_processor_setup_cpuidle(), but never used by cpuidle or by acpi_idle. So stop setting them. Signed-off-by: Len Brown commit 720f1c3010db6a411358b962a2007969117840bc Author: Thomas Renninger Date: Fri Jan 7 11:29:43 2011 +0100 cpuidle: Rename X86 specific idle poll state[0] from C0 to POLL C0 means and is well know as "not idle". All documentation out there uses this term as "running"/"not idle" state. Also Linux userspace tools (e.g. cpufreq-aperf and turbostat) show C0 residency which there is correct, but means something totally else than cpuidle "POLL" state. Signed-off-by: Thomas Renninger Signed-off-by: Len Brown commit d18960494f65ca4fa0d67c865aaca99452070d15 Author: Thomas Renninger Date: Wed Nov 3 17:06:14 2010 +0100 ACPI, intel_idle: Cleanup idle= internal variables Having four variables for the same thing: idle_halt, idle_nomwait, force_mwait and boot_option_idle_overrides is rather confusing and unnecessary complex. if idle= boot param is passed, only set up one variable: boot_option_idle_overrides Introduces following functional changes/fixes: - intel_idle driver does not register if any idle=xy boot param is passed. - processor_idle.c will also not register a cpuidle driver and get active if idle=halt is passed. Before a cpuidle driver with one (C1, halt) state got registered Now the default_idle function will be used which finally uses the same idle call to enter sleep state (safe_halt()), but without registering a whole cpuidle driver. That means idle= param will always avoid cpuidle drivers to register with one exception (same behavior as before): idle=nomwait may still register acpi_idle cpuidle driver, but C1 will not use mwait, but hlt. This can be a workaround for IO based deeper sleep states where C1 mwait causes problems. Signed-off-by: Thomas Renninger cc: x86@kernel.org Signed-off-by: Len Brown commit d8c216cfa57e8a579f41729cbb88c97835d9ac8d Author: Rafael J. Wysocki Date: Sat Jan 8 00:29:20 2011 +0100 cpuidle: Make cpuidle_enable_device() call poll_idle_init() The following scenario is possible with the current cpuidle code and the ACPI cpuidle driver: (1) acpi_processor_cst_has_changed() is called, (2) cpuidle_disable_device() is called, (3) cpuidle_remove_state_sysfs() is called to remove the (presumably outdated) states info from sysfs, (3) acpi_processor_get_power_info() is called, the first entry in the pr->power.states[] table is filled with zeros, (4) acpi_processor_setup_cpuidle() is called and it doesn't fill the first entry in pr->power.states[], (5) cpuidle_enable_device() is called, (6) __cpuidle_register_device() is _not_ called, since the device has already been registered, (7) Consequently, poll_idle_init() is _not_ called either, (8) cpuidle_add_state_sysfs() is called to create the sysfs attributes for the new states and it uses the bogus first table entry from acpi_processor_get_power_info() for creating state0. This problem is avoided if cpuidle_enable_device() unconditionally calls poll_idle_init(). Reported-by: Len Brown Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown cc: stable@kernel.org commit ddbd550d503c9cdefcd6674a0ef168d57d3f0917 Author: Len Brown Date: Mon Dec 13 18:28:22 2010 -0500 intel_idle: update Sandy Bridge core C-state residency targets Signed-off-by: Len Brown commit 22fadd766b2a222b273df9f2264b72e4b3bbe921 Author: Sascha Silbe Date: Fri Dec 10 23:05:21 2010 +0100 olpc_battery: Add support for CURRENT_NOW and VOLTAGE_NOW {CURRENT,VOLTAGE}_AVG are actually {CURRENT,VOLTAGE}_NOW (the EC code directly passes through the value from the gas gauge instead of the internally used average). We retain {CURRENT,VOLTAGE}_AVG as an alias for compatibility reasons, it will be removed later. Signed-off-by: Sascha Silbe [ pgf@laptop.org: added VOLTAGE_NOW, aliased to VOLTAGE_AVG ] Signed-off-by: Paul Fox Signed-off-by: Anton Vorontsov commit 20fd9830ccc685adce65ba89ffc3ca5426a2b064 Author: Sascha Silbe Date: Fri Dec 10 23:05:20 2010 +0100 olpc_battery: Add support for CHARGE_NOW CHARGE_NOW is needed by some user space software (read: UPower) for internal calculations. This patch violates the power supply class definition (as we already do for CAPACITY though it isn't as obvious there), but this is the best we can do without adding rather sophisticated algorithms to either the EC or UPower. Signed-off-by: Sascha Silbe Signed-off-by: Paul Fox Signed-off-by: Anton Vorontsov commit b202a5e6c94d8c43ade5adb97e87734cc4f4f228 Author: Sascha Silbe Date: Fri Dec 10 23:05:19 2010 +0100 olpc_battery: Add support for CHARGE_FULL_DESIGN Some user space software (read: UPower) uses CHARGE_FULL_DESIGN for internal calculations. The design capacity of the OLPC batteries is effectively fixed and only needs to be exported. Signed-off-by: Sascha Silbe Signed-off-by: Paul Fox Signed-off-by: Anton Vorontsov commit c566d299f91bdb622046126dbcb040f9e52572ba Author: Daniel Drake Date: Wed Dec 29 19:12:01 2010 +0000 olpc_battery: Ambient temperature is not available on XO-1.5 The XO-1.5 does not support the ambient temperature property. Create a separate list of properties for that configuration where ambient temperature is not included, and apply the correct property list at runtime. Signed-off-by: Daniel Drake Signed-off-by: Anton Vorontsov commit eab001bf88f68653e87a7d90124a2241131dbeda Merge: 156d821 106d1a0 Author: Len Brown Date: Wed Jan 12 12:16:14 2011 -0500 Merge branch 'misc' into test commit 106d1a0ab2a354b97df3e232be7dedbfaf8e901d Author: Thomas Renninger Date: Mon Dec 20 12:11:45 2010 +0100 ACPI: fix resource check message printk("%pR",...) is for formatting struct resource only. But the list built up in drivers/acpi/osl.c uses it's own struct: struct acpi_res_list {} Without this patch you can see wrongly formatted resources (SMRG is of IO type): ACPI: resource 0000:00:1f.3 [io 0x0400-0x041f] conflicts with AC PI region SMRG [mem 0x00000400-0x0000040f 64bit pref disabled] https://bugzilla.kernel.org/show_bug.cgi?id=26342 Signed-off-by: Thomas Renninger CC: Matthew Wilcox Signed-off-by: Len Brown commit f878133bf022717b880d0e0995b8f91436fd605c Merge: 1b38627 d15eda5 Author: Linus Torvalds Date: Wed Jan 12 08:40:25 2011 -0800 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (39 commits) i915/gtt: fix ordering causing DMAR errors on object teardown. i915/gtt: fix ordering issues with status setup and DMAR drm/i915/execbuffer: Reorder binding of objects to favour restrictions drm/i915: If we hit OOM when allocating GTT pages, clear the aperture drm/i915/evict: Ensure we completely cleanup on failure drm/i915/execbuffer: Correctly clear the current object list upon EFAULT drm/i915/debugfs: Show all objects in the gtt drm/i915: Record AGP memory type upon error drm/i915: Periodically flush the active lists and requests drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT drm/i915: Record the error batchbuffer on each ring drm/i915: Include TLB miss overhead for computing WM drm/i915: Propagate error from flushing the ring drm/i915: detect & report PCH display error interrupts drm/i915: cleanup rc6 code drm/i915: fix rc6 enabling around suspend/resume drm/i915: re-enable rc6 support for Ironlake+ drm/i915: Make the ring IMR handling private drm/i915/ringbuffer: Simplify the ring irq refcounting drm/i915/debugfs: Show the per-ring IMR ... commit 1b3862798cf4390b9110e54e405646e156f47c83 Merge: 968a851 eca0bdd Author: Linus Torvalds Date: Wed Jan 12 08:39:15 2011 -0800 Merge branch 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 * 'tools' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6: tools: create power/x86/x86_energy_perf_policy tools: create power/x86/turbostat commit 968a8516a4f6d76e022842ba774458044d80d12c Merge: 94d4c4c 8d1491b Author: Linus Torvalds Date: Wed Jan 12 08:38:08 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest * git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest: (30 commits) ktest: Ask for the manditory config options instead of just failing ktest: Copy the last good and bad configs in config_bisect ktest: For grub reboot, use run_ssh instead of run_command ktest: Added force stop after success and failure ktest: Parse off the directory name in useconfig for failures ktest: Use different temp config name for minconfig ktest: Updated the sample.conf for the latest options ktest: Added compare script to test ktest.pl to sample.conf ktest: Added config_bisect test type ktest/cleanups: Added version 0.2, ssh as options ktest: Output something easy to parse for failure or success ktest: Allow a test case to undefine a default value ktest: Use $output_config instead of typing $outputdir/.config ktest: Write to stdout if no log file is given ktest: Use oldnoconfig instead of yes command ktest: Update the sample config file with more documentation ktest: New TEST_START instead of using [], and use real SHA1s ktest: Add poweroff after halt and powercycle after reboot ktest: Add POST_INSTALL to allow initrds to be created ktest: Added sample.conf, new %default option format ... commit 94d4c4cd563aeff4d498168f1c8444074160d0e7 Merge: 2818ef5 329620a Author: Linus Torvalds Date: Wed Jan 12 08:37:35 2011 -0800 Merge branch 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/xenbus' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/xenbus: making backend support modular is too complex xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND xen/xenbus: fixup checkpatch issues in xenbus_probe* xen/netfront: select XEN_XENBUS_FRONTEND xen/xenbus: clean up noise in xenbus_probe_frontend.c xen/xenbus: clean up noise in xenbus_probe_backend.c xen/xenbus: clean up noise in xenbus_probe.c xen/xenbus: cleanup debug noise in xenbus_comms.c xen/xenbus: clean up error handling xen/xenbus: make frontend bus GPL xen/xenbus: make sure backend bus is registered earlier xenbus/frontend: register bus earlier xen: remove xen/evtchn.h xen: add backend driver support xen: separate out frontend xenbus commit 2818ef50c4dc103ce52e12d14ce2dfbde5268120 Author: Anton Altaparmakov Date: Wed Jan 12 10:34:35 2011 +0000 NTFS: writev() fix and maintenance/contact details update Fix writev() to not keep writing the first segment over and over again instead of moving onto subsequent segments and update the NTFS entry in MAINTAINERS to reflect that Tuxera Inc. now supports the NTFS driver. Signed-off-by: Anton Altaparmakov Signed-off-by: Linus Torvalds commit 7c8c06c5bb2dcc9fd0d2eeac4e9c10bf77ffed1a Author: Ian Campbell Date: Tue Jan 11 11:51:14 2011 +0000 xen: rename platform-pci module to xen-platform-pci. platform-pci is rather generic for a modular distro style kernel. Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 00f28e4037c8d5782fa7a1b2666b0dca21522d69 Author: Ian Campbell Date: Tue Jan 11 11:50:28 2011 +0000 xen-platform: use PCI interfaces to request IO and MEM resources. This is the correct interface to use and something has broken the use of the previous incorrect interface (which fails because the request conflicts with the resources assigned for the PCI device itself instead of nesting like the PCI interfaces do). Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk Cc: stable@kernel.org # 2.6.37 only commit 73efe4a4ddf8eb2b1cc7039e8a66a23a424961af Author: Dave Chinner Date: Wed Jan 12 00:35:42 2011 +0000 xfs: prevent NMI timeouts in cmn_err We currently have a global error message buffer in cmn_err that is protected by a spin lock that disables interrupts. Recently there have been reports of NMI timeouts occurring when the console is being flooded by SCSI error reports due to cmn_err() getting stuck trying to print to the console while holding this lock (i.e. with interrupts disabled). The NMI watchdog is seeing this CPU as non-responding and so is triggering a panic. While the trigger for the reported case is SCSI errors, pretty much anything that spams the kernel log could cause this to occur. Realistically the only reason that we have the intemediate message buffer is to prepend the correct kernel log level prefix to the log message. The only reason we have the lock is to protect the global message buffer and the only reason the message buffer is global is to keep it off the stack. Hence if we can avoid needing a global message buffer we avoid needing the lock, and we can do this with a small amount of cleanup and some preprocessor tricks: 1. clean up xfs_cmn_err() panic mask functionality to avoid needing debug code in xfs_cmn_err() 2. remove the couple of "!" message prefixes that still exist that the existing cmn_err() code steps over. 3. redefine CE_* levels directly to KERN_* 4. redefine cmn_err() and friends to use printk() directly via variable argument length macros. By doing this, we can completely remove the cmn_err() code and the lock that is causing the problems, and rely solely on printk() serialisation to ensure that we don't get garbled messages. A series of followup patches is really needed to clean up all the cmn_err() calls and related messages properly, but that results in a series that is not easily back portable to enterprise kernels. Hence this initial fix is only to address the direct problem in the lowest impact way possible. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit fa63bd4aa53aecc38956cbdd50f8ff9ed0d6d5ba Author: roel kluin Date: Fri Dec 31 16:26:47 2010 +0100 regulator: missing index in PTR_ERR() in isl6271a_probe() The index is missing so the return is wrong. Signed-off-by: Roel Kluin Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 923430cfee112c5f8223a313f5ec148a27dfed7f Author: Axel Lin Date: Mon Jan 3 23:57:38 2011 +0800 regulator: Assign return value of mc13xxx_reg_rmw to ret Otherwise, we will not return error if write to MC13892_SWITCHERS5 failed. Signed-off-by: Axel Lin Acked-by: Yong Shen Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1130e5b3ff4a7f3f54a48d46e9d0d81b47765bd8 Author: Mark Brown Date: Tue Dec 21 23:49:31 2010 +0000 regulator: Add initial per-regulator debugfs support We only expose the use and open counts to userspace, providing a tiny bit of insight into what the API is up to. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 21cf891a47ff5e7bd77fdc524a25072c447d56bb Author: Mark Brown Date: Tue Dec 21 23:30:07 2010 +0000 regulator: Make regulator_has_full_constraints a bool It's a boolean value so use the type. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 13ce29f80fe3f61d3865b90244b1d1430f553e9f Author: Mark Brown Date: Fri Dec 17 16:04:12 2010 +0000 regulator: Clean up logging a bit The recent introduction of standard regulator API logging macros means that all our log messages have at least the function name in them and logging that the constraints are for the regulator API is probably a bit much. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 95a3c23ae620c1b4c499746e70f4034bdc067737 Author: Mark Brown Date: Thu Dec 16 15:49:37 2010 +0000 regulator: Optimise out noop voltage changes If a consumer sets the same voltage range as is currently configured for that consumer there's no need to run through setting the voltage again. This pattern may occur with some CPUfreq implementations where the same voltage range is used for multiple frequencies. Reported-by: Saravana Kannan Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 606a25628187ce863b48d43ca42bc0cbe8342de9 Author: Mark Brown Date: Thu Dec 16 15:49:36 2010 +0000 regulator: Add API to re-apply voltage to hardware When cooperating with an external control source the regulator setup may be changed underneath the API. Currently consumers can just redo the regulator_set_voltage() to restore a previously set configuration but provide an explicit API for doing this as optimsations in the regulator_set_voltage() implementation will shortly prevent that. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 27315cf61fb813b3916cecfbfa6932dc9447f3f4 Author: Mark Brown Date: Thu Dec 16 15:29:56 2010 +0000 regulator: Staticise non-exported functions in mc13892 No point exposing functions that aren't used elsewhere to the global namespace and sparse warns about doing so. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit ded06a5270ddd6c3c3e25d9ddcaaaa4cb8385c2f Author: Mark Brown Date: Thu Dec 16 13:59:10 2010 +0000 regulator: Only notify voltage changes when they succeed Currently we notify a voltage change whenever we exit set_voltage(), even if the change failed for some reason (eg, a constraints issue). This shouldn't cause any substantial ill effects but is wasteful as listeners get notified on noops. Fix this by moving the notification into _do_set_voltage() and only notifying if we don't return an error. Reported-by: Saravana Kannan Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit e8eef82b2c652d031bee9dff9762325672f5a1e0 Author: Mark Brown Date: Sun Dec 12 14:36:17 2010 +0000 regulator: Provide a selector based set_voltage_sel() operation Many regulator drivers implement voltage setting by looping through a table of possible values, normally because the set of available voltages can't be mapped onto selectors with simple calcuation. Factor out these loops by providing a variant of set_voltage() which takes a selector rather than a voltage range as an argument and implementing a loop through the available selectors in the core. This is not going to be suitable for use with all devices as when the regulator voltage can be mapped onto selector values with a simple calculation the linear scan through the available values will be more expensive than just doing the calculation, especially for regulators that provide fine grained voltage control. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 757902513019e6ee469791ff76f954b19ca8d036 Author: Mark Brown Date: Sun Dec 12 14:25:50 2010 +0000 regulator: Factor out voltage set operation into a separate function Push all the callers of the chip set_voltage() operation out into a single function to facilitiate future refactoring. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit d9f0f287179f76ec71a50a96d553dfd1dbb41711 Author: Mark Brown Date: Sun Dec 12 14:07:06 2010 +0000 regulator: Convert WM8994 to use get_voltage_sel() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit c24516a1d674b1d9d847fd736feca444bc249b12 Author: Mark Brown Date: Sun Dec 12 14:06:51 2010 +0000 regulator: Convert WM835x to use get_voltage_sel() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 4d7071f1fdc9c27e15e8aaede27bef9f4feccafe Author: Mark Brown Date: Wed Dec 15 14:10:25 2010 +0000 regulator: Allow modular build of mc13xxx-core Since the MFD core for this device and the regulator drivers for these devices can be built modular we should also support modular build of the shared code for the regulator drivers, otherwise we try to link built in code against modular code with unfortunate results. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 5e428d5cecc3f109b52e993a1bd91f82137867b3 Author: Yong Shen Date: Tue Dec 14 14:00:55 2010 +0800 regulator: support PMIC mc13892 add support for mc13892, tested on mx51 babbage board Signed-off-by: Arnaud Patard Signed-off-by: Yong Shen Acked-by: Sascha Hauer Acked-by: Samuel Ortiz Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 167e3d8af98a111994c4d6b3c5cbc589aedbbc2a Author: Yong Shen Date: Tue Dec 14 14:00:54 2010 +0800 make mc13783 regulator code generic move some common functions and micros of mc13783 regulaor driver to a seperate file, which makes it possible for mc13892 to share code. Signed-off-by: Yong Shen Acked-by: Sascha Hauer Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 57c78e359a35c69eca4c88f107500f74ef7f0acf Author: Yong Shen Date: Tue Dec 14 14:00:53 2010 +0800 Change the register name definitions for mc13783 To make mc13783 and mc13892 share code, the register names should be changed to fit the new macro definitions in the comming patch. Signed-off-by: Yong Shen Acked-by: Sascha Hauer Acked-by: Samuel Ortiz Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit a1e516e3a5552519a01e8a7636569d2d1b68431f Author: Bengt Jonsson Date: Fri Dec 10 11:08:48 2010 +0100 mach-ux500: Updated and connected ab8500 regulator board configuration The ab8500 regulator board configuration is updated and put in an array which can easily be used in the MFD board configuration. The regulator board configuration is also added to the MFD configuration in this patch. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 6909b4522e0fc459d344fd42db444ca8b3106b8c Author: Bengt Jonsson Date: Fri Dec 10 11:08:47 2010 +0100 regulators: Removed macros for initialization of ab8500 regulators This patch removes the macros for initializing the regulators. The purpose is to remove one layer of abstraction and make the code easier to read. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 09aefa12ac3c023e2db2315b0e229be98ef6bf23 Author: Bengt Jonsson Date: Fri Dec 10 11:08:46 2010 +0100 regulators: Added verbose debug messages to ab8500 regulators The verbose debug outputs register writes and reads that can be used to debug the driver. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit fc24b426fff45ddaf5663a11daa31ba74f6b6b4f Author: Bengt Jonsson Date: Fri Dec 10 11:08:45 2010 +0100 regulators: Modified ab8500 error handling Error handling is updated to catch NULL pointer errors. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit e1159e6d9ac5faf42abedd2fc02234e3d946585a Author: Bengt Jonsson Date: Fri Dec 10 11:08:44 2010 +0100 regulators: Updated ab8500 variable names, macro names and comments The regulator enumeration is used for putting the regulator data in correct place in the info array. This should be matched in the board configuration. Variable names are updated to be more consistent, comments are corrected and macros have been edited to be consistent. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 2b75151a1041f200ee3f36475ba389da43664bb4 Author: Bengt Jonsson Date: Fri Dec 10 11:08:43 2010 +0100 regulators: Added ab8500 v2 support The AUX3 regulator voltage setting is changed in ab8500 v2 compared to ab8500 v1. This patch adds v2 support while keeping support for v1. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit deaca1ee8250e204cab6ca9390e43ac63b46959c Author: Bengt Jonsson Date: Fri Dec 10 11:08:42 2010 +0100 regulators: Clean out unused code in ab8500 regulators The find_regulator function was unused so it has been removed. The ab8500 pointer in the regulator info structure was unused and so it has also been removed. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 65e03ed2d0cd49259c527e488b94e93fcf23f62e Author: Bengt Jonsson Date: Fri Dec 10 11:08:41 2010 +0100 regulators: Fixed errors in ab8500 register mapping For INTCORE and TVOUT regulators, the low power register bit is included in the mask so that enable will set the regulator in normal (high power) mode. ANAMIC1, ANAMIC2, DMIC regulator settings are swapped with each other so that the correct regulator gets enabled/disabled. ANA regulator register address is corrected. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit cb189b07d57b574cc14382e2130960b0a0193c23 Author: Bengt Jonsson Date: Fri Dec 10 11:08:40 2010 +0100 regulators: Moved define for number of regulators in ab8500 The define for number of regulators is moved from ab8500-core to ab8500-regulator so that the regulator driver can be updated independently of ab8500-core. This also changes the platform configuration structure of ab8500-core so that it contains a pointer to the regulator_init_data array plus number of regulators instead of an fixed size array of pointers to regulator_init_data. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1394fd2826afb2adf7f6c4833d36a0feba22e665 Author: Cyril Chemparathy Date: Tue Dec 7 12:04:11 2010 -0500 regulator: add driver for tps6524x regulator TPS6524X provides three step-down converters and two general-purpose LDO voltage regulators. This device is interfaced using SPI. Signed-off-by: Cyril Chemparathy Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit afb8bb805bb9336ec1f7b74e7b5c0e9baceb42c1 Author: Mark Brown Date: Fri Dec 10 17:28:08 2010 +0000 regulator: Convert WM831x drivers to use get_voltage_sel() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 476c2d83c7ffb2429b2a504fbdb4326fc8a9d0e8 Author: Mark Brown Date: Fri Dec 10 17:28:07 2010 +0000 regulator: Allow drivers to report voltages as selectors Since drivers already have to provide an API for translating selectors into voltages they may as well just report the selector values directly to the core API rather than implement the lookup themselves. The old interface is left in place for now, but may be removed in future. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 1bf5a1f86a328122714680cd59951074b4f31e07 Author: Mark Brown Date: Fri Dec 10 17:28:06 2010 +0000 regulator: Use _regulator_get_voltage() consistently Rather than referencing the get_voltage() operation directly in the ops struct use the internal _regulator_get_voltage() API call to do so, facilitating refactoring. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 43e7ee33f2a8d20238267b789791386739247478 Author: Joe Perches Date: Mon Dec 6 14:05:19 2010 -0800 drivers/regulator: Update WARN uses Align arguments. Signed-off-by: Joe Perches Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 05fda3b1abc23d832144e9497fb218870927d645 Author: Thomas Petazzoni Date: Fri Dec 3 11:31:07 2010 +0100 regulator: Take into account the requirements of all consumers Extend the regulator_set_voltage() function to take into account the voltage requirements of all consumers of the regulator being changed, in order to set the voltage to the minimum voltage acceptable to all consumers. The existing behaviour was that the latest regulator_set_voltage() call would win over previous regulator_set_voltage() calls even if setting the voltage to a non-acceptable level from other consumers. Signed-off-by: Thomas Petazzoni Cc: Liam Girdwood Cc: Mark Brown Cc: Kevin Hilman Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 5da84fd99bb1ab1c7cd39d0cf7c08bb63931a59a Author: Joe Perches Date: Tue Nov 30 05:53:48 2010 -0800 regulator: Add and use rdev_ macros On Tue, 2010-11-30 at 10:52 +0000, Mark Brown wrote: > On Mon, Nov 29, 2010 at 05:12:56PM -0800, Joe Perches wrote: > > Just to please broonie... > > Signed-off-by: Joe Perches > As usual when fixing review issues please revise your original patch > rather than posting a fresh patch. Here's an earlier comment: On Thu, 2010-11-18 at 13:30 +0000, Mark Brown wrote: > This looks reasonable, please rebase on top of Daniel's patches and > submit it properly (with changelog and so on). Sometimes it's simpler for an upstream maintainer to do something like: git am -s patch -p1 < patch2.mbox git commit --amend file instead of back and forthing. Signed-off-by: Liam Girdwood commit 6220b87bfd60d77bf9b19e18aa093110b0f34d41 Author: Mark Brown Date: Mon Nov 29 15:57:48 2010 +0000 regulator: Remove duplicate consts from mc13873 driver voltage tables They're not needed and sparse is verbosely upset about them. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit f8c12fe329c8da9f50d8b2b1183eeaa4d587e747 Author: Mark Brown Date: Mon Nov 29 15:55:17 2010 +0000 regulator: Copy constraints from regulators when initialising them Currently the regulator API uses the constraints structure passed in to the core throughout the lifetime of the object. This means that it is not possible to mark the constraints as __initdata so if the kernel supports many boards the constraints for all of them are kept around throughout the lifetime of the system, consuming memory needlessly. By copying constraints that are actually used we allow the use of __initdata, saving memory when multiple boards are supported. This also means the constraints can be const. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit f4d6adf11b0a596ac4fee2fb2591f286de35c088 Author: Mark Brown Date: Fri Nov 19 12:07:44 2010 +0000 regulator: Fix prototype for MAX8998 buck set_voltage() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 50ba5ca4be30674517ca33425648ec43d93f9a69 Author: Mark Brown Date: Mon Nov 22 13:51:19 2010 +0000 regulator: Remove regulator core version announcement The version hasn't been updated since the regulator API was merged in 2.6.27 so just remove it - now we're in mainline the kernel version is much more useful. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 4c35508fc0b7883820923b3b8eb9fea25d35cf72 Author: Mark Brown Date: Mon Nov 22 13:51:18 2010 +0000 regulator: Fix obfuscated log messages Don't use %s to format fixed static strings into log messages, it just makes searching for and reading the message in the kernel source needlessly hard. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 1d7372e15ebd7f56a336fabe6ee31f8e692cd9cb Author: Daniel Walker Date: Wed Nov 17 15:30:28 2010 -0800 drivers: regulator: core: convert to using pr_ macros The regulator framework uses a lot of printks with a specific formatting using __func__. This converts them to use pr_ calls with a central format string. Cc: bleong@codeaurora.org Signed-off-by: Daniel Walker Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit c5e28ed78274468b92522e7f1e9a5e6080559100 Author: Daniel Walker Date: Wed Nov 17 15:30:27 2010 -0800 drivers: regulator: core: use pr_fmt This adds a pr_fmt line which uses the __func__ macro. I also convert the current pr_ lines to remove their __func__ usage. Cc: bleong@codeaurora.org Signed-off-by: Daniel Walker Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7bed08c56540825ab9c7909a12e9b5bcdafa62ba Author: Mark Brown Date: Thu Nov 11 11:57:17 2010 +0000 regulator: Fix typo in PCAP regulator_set_voltage() Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit acaf6ffefdf65188071f88664435b86651d70e7c Author: Bengt Jonsson Date: Wed Nov 10 11:06:22 2010 +0100 regulator: enable supply regulator only when use count is zero Supply regulators are disabled only when the last reference count is removed on the child regulator (the use count goes from 1 to 0). This patch changes the behaviour of enable so the supply regulator is enabled only when the use count of the child regulator goes from 0 to 1. Signed-off-by: Bengt Jonsson Acked-by: Linus Walleij Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 02fa3ec01a0df7a8ccc356d8e245a9a1423b3596 Author: Mark Brown Date: Wed Nov 10 14:38:30 2010 +0000 regulator: Add basic trace facilities Provide some basic trace facilities to the regulator API. We generate events on regulator enable, disable and voltage setting over the actual hardware operations (which are assumed to be the expensive ones which require interaction with the actual device). This is intended to facilitate debug of the performance and behaviour with consumers allowing unified traces to be generated including the regulator operations within the context of the other components of the system. For enable we log the explicit delay for the voltage ramp separately to the interaction with the hardware to highlight the time consumed in I/O. We should add a similar delay for voltage changes, though there the relatively small magnitude of the changes in the context of the I/O costs makes it much less critical for most regulators. Only hardware interactions are currently traced as the primary focus is on the performance and synchronisation of actual hardware interactions. Additional tracepoints for debugging of the logical operations can be added later if required. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 3a93f2a9f4d8f73d74c0e552feb68a10f778a219 Author: Mark Brown Date: Wed Nov 10 14:38:29 2010 +0000 regulator: Report actual configured voltage to set_voltage() Change the interface used by set_voltage() to report the selected value to the regulator core in terms of a selector used by list_voltage(). This allows the regulator core to know the voltage that was chosen without having to do an explict get_voltage(), which would be much more expensive as it will generally access hardware. Signed-off-by: Mark Brown Signed-off-by: Liam Girdwood commit 63cee946148821bca42be10130b061c2d0f5af7e Author: Mattias Wallin Date: Thu Nov 4 11:01:31 2010 +0100 regulator: lock supply in regulator enable This patch add locks around regulator supply enable. Signed-off-by: Mattias Wallin Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit e163d529ad7ab449db36ee88dab16170de711f34 Author: Rabin Vincent Date: Wed Jan 12 14:38:52 2011 +0100 ARM: 6621/1: bitops: remove condition code clobber for CLZ The CLZ instruction does not alter the condition flags, so remove the "cc" clobber from the inline asm for fls(). Acked-by: Nicolas Pitre Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 22eeb8f6e0214a83ac6958a29a83572137f174bb Author: Alexander Holler Date: Wed Jan 12 14:08:37 2011 +0100 ARM: 6620/1: Change misleading warning when CONFIG_CMDLINE_FORCE is used When CONFIG_CMDLINE_FORCE is used, the warning Ignoring unrecognised tag 0x54410009 was displayed. Change this to Ignoring tag cmdline (using the default kernel command line) Signed-off-by: Alexander Holler Signed-off-by: Russell King commit 88cce427626070f7d7eb33994e3ff7b4db3292c5 Author: Philippe De Muyter Date: Wed Nov 3 15:07:28 2010 +0100 watchdog: Add MCF548x watchdog driver. Add watchdog driver for MCF548x. Signed-off-by: Philippe De Muyter Signed-off-by: Wim Van Sebroeck commit f8394f61c66f48b1fe9d6964ddce492d7f9a4cd9 Author: Gabor Juhos Date: Tue Jan 4 21:28:19 2011 +0100 watchdog: add driver for the Atheros AR71XX/AR724X/AR913X SoCs This patch adds a driver for the built-in hardware watchdog device of the Atheros AR71XX/AR724X/AR913X SoCs. Signed-off-by: Gabor Juhos Signed-off-by: Imre Kaloz Signed-off-by: Wim Van Sebroeck commit 456c730153fe33134fe93742510a96e46a9217c4 Author: Mike Waychison Date: Mon Oct 25 17:58:05 2010 -0700 watchdog: Add TCO support for nVidia chipsets This driver adds support for /dev/watchdog for boards using either the MCP51 or MCP55 chipsets. These are also known as the nForce 430 and nForce 550. This driver is likely to work on other chipsets as well, though those are the only two that have been tested. Signed-off-by: Mike Waychison Signed-off-by: Wim Van Sebroeck commit 15e28bf130081a574192fb934b832ac7d07739f7 Author: Priyanka Gupta Date: Mon Oct 25 17:58:04 2010 -0700 watchdog: Add support for sp5100 chipset TCO This driver adds /dev/watchdog support for the AMD sp5100 aka SB7x0 chipsets. It follows the same conventions found in other /dev/watchdog drivers. Signed-off-by: Priyanka Gupta Signed-off-by: Mike Waychison Signed-off-by: Wim Van Sebroeck commit e13752a1de02044bfda352cbc834e3c9541f148b Author: Lutz Ballaschke Date: Wed Jan 12 01:09:02 2011 +0100 watchdog: f71808e_wdt: add F71862FG, F71869 to Kconfig Update Kconfig with the additional Fintek hardware that we support. Signed-off-by: Lutz Ballaschke Acked-by: Giel van Schijndel Signed-off-by: Wim Van Sebroeck commit a5fcfef0b8db574098f2e42827117bc4accf2efd Author: Fabio Estevam Date: Wed Dec 1 11:11:47 2010 -0200 ARM: mx5: dynamically allocate imx-keypad devices Add support for dynamical allocation of imx-keypad on mx5 platform. After moving to dynamically registration of the keypad, the keypad clock name needs to change accordingly. The reason is that the original mx5 keypad platform_device id was 0, now we use id=-1 as per arch/arm/plat-mxc/devices/platform-imx-keypad.c. Tested keypad successfully on a MX51_3DS board. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 076762aa52de48688f6e1b6999fe58d736479f37 Author: Fabio Estevam Date: Wed Dec 1 11:11:46 2010 -0200 ARM: mx5: dynamically allocate pwm devices Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit dbc4245bb520580fc1b01105727fde7d7cbe452d Author: Shawn Guo Date: Tue Jan 4 14:20:52 2011 +0800 ARM: mxs: Change duart device to use amba-pl011 The mxs duart is actually an amba-pl011 device. This commit changes the duart device code to dynamically allocate amba-pl011 device, so that drivers/serial/amba-pl011.c can be used on mxs. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit 18b022eb117e7f70c191267551ff865f278a9258 Merge: 2f55eaa 04f8fd1 Author: Takashi Iwai Date: Wed Jan 12 12:26:24 2011 +0100 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit afa14e7c553ebe45844d76208f66017a43abd0e2 Author: H Hartley Sweeten Date: Tue Jan 11 17:59:38 2011 -0600 timekeeping: Make local variables static Signed-off-by: H Hartley Sweeten Cc: John Stultz LKML-Reference: <0D753D10438DA54287A00B027084269764CE0E54B7@AUSP01VMBX24.collaborationhost.net> Signed-off-by: Thomas Gleixner commit 5fdade95f26372154459347dfb9f60721d22cfc7 Author: Nicolas Pitre Date: Tue Jan 11 12:18:12 2011 -0500 time: Rename misnamed minsec argument of clocks_calc_mult_shift() The minsec argument to clocks_calc_mult_shift() is misnamed. It is used to clamp the magnitude of the mult factor so that a multiplication with any value in the given range won't overflow a 64 bit result. Let's rename it to match the actual usage. Signed-off-by: Nicolas Pitre Acked-by: John Stultz LKML-Reference: Signed-off-by: Thomas Gleixner commit 9378b63ccb32b9c071dab155c96357ad1e52a709 Author: Tony Luck Date: Wed Jan 12 00:50:37 2011 -0800 x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c As pointed out by Linus CONFIG_X86 in drivers/acpi/numa.c is ugly. Builds and boots on ia64 (both normally and with maxcpus=8 to limit the number of cpus). Signed-off-by: Tony Luck Acked-by: Yinghai Lu Cc: Linus Torvalds Cc: Wu Fengguang Cc: Bjorn Helgaas Cc: Len Brown LKML-Reference: <4D2D6B5D.4080208@kernel.org> Signed-off-by: Ingo Molnar commit 203f8d893ed772ec8589cfd3c7d1af312643b703 Author: Seth Heasley Date: Fri Jan 7 17:11:08 2011 -0800 watchdog: iTCO_wdt: TCO Watchdog patch for Intel DH89xxCC PCH This patch adds the DeviceIDs for TCO Watchdog on the Intel DH89xxCC PCH. Signed-off-by: Seth Heasley Signed-off-by: Wim Van Sebroeck commit d38bd479a10d1981816061da0a8ba27384dc3c35 Author: Wim Van Sebroeck Date: Fri Dec 31 14:10:45 2010 +0000 watchdog: iTCO_wdt: TCO Watchdog patch for Intel NM10 DeviceIDs This patch adds the Intel NM10 DeviceIDs for iTCO Watchdog. Reported-by: Dan Weinlader Signed-off-by: Wim Van Sebroeck commit 568dba66ac307532b6703331df71c17373c17a4a Author: Yegor Yefremov Date: Tue Dec 14 16:29:31 2010 +0100 watchdog: ks8695_wdt: include mach/hardware.h instead of mach/timex.h. ks8695_wdt needs KS8695_CLOCK_RATE, which is defined in mach/hardware.h, which is pulled in by the include of mach/timex.h, but the latter is going away, so just include mach/hardware.h directly. Signed-off-by: Yegor Yefremov Signed-off-by: Lennert Buytenhek Signed-off-by: Wim Van Sebroeck commit 6ae98ed186cbe6909105c536c24419e52af8fc66 Author: Randy Vinson Date: Mon Dec 6 14:02:23 2010 -0700 watchdog: Propagate Book E WDT period changes to all cores When the watchdog period is changed, it needs to be propagated to all cores in addition to the core that performed the change. Signed-off-by: Randy Vinson Signed-off-by: Wim Van Sebroeck commit 5d63c13415db2819590bba975dd023eaa593ddc3 Author: Timur Tabi Date: Fri Dec 3 10:51:43 2010 -0600 watchdog: add CONFIG_WATCHDOG_NOWAYOUT support to PowerPC Book-E watchdog driver Normally, the watchdog is disabled when dev/watchdog is closed, but if CONFIG_WATCHDOG_NOWAYOUT is defined, then it means that the watchdog should remain enabled. So we should disable it only if CONFIG_WATCHDOG_NOWAYOUT is not defined. Also ensure that /dev/watchdog is only opened by one process at a time. That way, a second process can't accidentally disable the watchdog while the first process has it open. There shouldn't be any need for more than one process to open /dev/watchdog anyway. Signed-off-by: Timur Tabi Acked-by: Josh Boyer Signed-off-by: Wim Van Sebroeck commit a787e71068d7c2e438d8a5a38a7e1385389819f0 Author: Namhyung Kim Date: Wed Dec 8 01:27:36 2010 +0900 watchdog: alim7101_wdt: fix compiler warning on alim7101_pci_tbl Annotate alim7101_pci_tbl as '__used' to fix following warning: CC drivers/watchdog/alim7101_wdt.o drivers/watchdog/alim7101_wdt.c:433: warning: ‘alim7101_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Wim Van Sebroeck commit 202af5b307b0ccdad5e960a1f87fac322d8cdb02 Author: Namhyung Kim Date: Wed Dec 8 01:27:35 2010 +0900 watchdog: alim1535_wdt: fix compiler warning on ali_pci_tbl Annotate ali_pci_tbl as '__used' to fix following warning: CC drivers/watchdog/alim1535_wdt.o drivers/watchdog/alim1535_wdt.c:304: warning: ‘ali_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Wim Van Sebroeck commit 6d106e0cac842bc17c87aadd5fa01730694c987a Author: Herman Morsink Vollenbroek Date: Mon Dec 6 21:24:56 2010 +0100 watchdog: Fix reboot on W83627ehf chipset. The watchdog driver for the SUPERIO chip winbond w83627ehf does not work. If you open /dev/watchdog and write a character to /dev/watchdog then the watchdog will be triggered. However the watchdog will not trigger the hardware RESET after the timeout, because the watchdog has never been enabled. Signed-off-by: Herman Morsink Vollenbroek Signed-off-by: Wim Van Sebroeck commit 9c67bea419c384561eeb84bdf251d521a3234e45 Author: Benny Loenstrup Ammitzboell Date: Thu Nov 11 16:08:41 2010 +0100 watchdog: Add watchdog support for W83627DHG chip The following adds watchdog support for the Winbond W83627DHG chip. I have tested it on a PQ7-M102XL (Intel Atom) board. Signed-off-by: Benny Lønstrup Ammitzbøll Signed-off-by: Wim Van Sebroeck commit df278dac2070e677cf22c30e1c78c5a753191375 Author: Michel Arboi Date: Mon Dec 6 20:53:45 2010 +0100 watchdog: f71808e_wdt: Add Fintek F71869 watchdog Add Fintek f71869 as a supported watchdog device. Signed-off-by: Michel Arboi Acked-by: Giel van Schijndel Signed-off-by: Wim Van Sebroeck commit 7977ff6e3deb042b29370e52607df20d1ee33b9d Author: Lutz Ballaschke Date: Sun Sep 26 16:25:35 2010 +0200 watchdog: add f71862fg support Watchdog support for Fintek F71862fg Super-I/O added. Two different hardware reset pins of the F71862fg chip can be configured by an additional module parameter. Signed-off-by: Lutz Ballaschke Signed-off-by: Wim Van Sebroeck commit f9a9f096d25bbc54dc3147613ee1d86b35cce691 Author: Lutz Ballaschke Date: Sun Sep 26 16:38:20 2010 +0200 watchdog: clean-up f71808e_wdt.c Cleaned up and replaced some magic numbers by constants. Signed-off-by: Lutz Ballaschke Signed-off-by: Wim Van Sebroeck commit 156d821270e131dee7d89fc4aa385f0f9b1900ea Merge: 3e09898 5b275ce Author: Len Brown Date: Wed Jan 12 05:14:15 2011 -0500 Merge branch 'misc' into release commit 3e098984073795bff5e5e3edbc1f5b0514c47c92 Merge: da8aeb9 99fd189 Author: Len Brown Date: Wed Jan 12 05:09:35 2011 -0500 Merge branch 'bugzilla-21212' into release commit da8aeb92d4853f37e281f11fddf61f9c7d84c3cd Author: Rafael J. Wysocki Date: Thu Jan 6 23:42:27 2011 +0100 ACPI / Battery: Update information on info notification and resume A notification event 0x81 from an ACPI battery device requires us to re-read the battery information structure. Follow this requirement and remove and re-create the battery's attibutes in sysfs so that they reflect the reporting units used by the battery at the moment (those units may actually change sometimes at run time, which happens on some Thinkpads). The approach used in this patch was suggested by Matthew Garrett. Signed-off-by: Rafael J. Wysocki Reported-by: Matthew Garrett Signed-off-by: Len Brown commit d57d09a480e1db38eeee7629c81289b00f338a15 Author: Rafael J. Wysocki Date: Thu Jan 6 23:41:27 2011 +0100 ACPI: Drop device flag wake_capable The wake_capable ACPI device flag is not necessary, because it is only used in scan.c for recording the information that _PRW is present for the given device. That information is only used by acpi_add_single_object() to decide whether or not to call acpi_bus_get_wakeup_device_flags(), so the flag may be dropped if the _PRW check is moved to acpi_bus_get_wakeup_device_flags(). Moreover, acpi_bus_get_wakeup_device_flags() always returns 0, so it really should be void. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 86e4e20e8a5301ff7104a4f40f35fd5bee408186 Author: Rafael J. Wysocki Date: Thu Jan 6 23:40:00 2011 +0100 ACPI: Always check if _PRW is present before trying to evaluate it Before evaluating _PRW for devices that are reported as inactive or not present by their _STA control methods we should check if those methods are actually present (otherwise the evaulation of _PRW will obviously fail and a scary message will be printed unnecessarily). Reported-by: Andreas Mohr Reported-by: Maciej Rutecki Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit d0515d9fec68bace144fda57a69f4268fb875209 Author: Rafael J. Wysocki Date: Thu Jan 6 23:38:57 2011 +0100 ACPI / PM: Check status of power resources under mutexes It certainly is not a good idea to execute _ON or _OFF and _STA for the same power resource at the same time which may happen in some circumstances in theory. To prevent that from happening, read the power state of each power resource under its mutex, as that will prevent the state from being changed at the same time. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 36237fa0a711c309a38d7a7a9aed727e0eb76449 Author: Rafael J. Wysocki Date: Thu Jan 6 23:38:04 2011 +0100 ACPI / PM: Rename acpi_power_off_device() Rename acpi_power_off_device() to acpi_power_off() in analogy with acpi_power_on(). Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 63e8078a12ed287f40f39082ff87e8db6621dab9 Merge: 4b63bd3 4464ed3 Author: Len Brown Date: Wed Jan 12 05:03:39 2011 -0500 Merge branch 'kconfig-text' into release commit 4b63bd35eb4e7959b0f7be17634689d34311524b Merge: 03b6e6e e92b297 Author: Len Brown Date: Wed Jan 12 05:03:13 2011 -0500 Merge branch 'ipmi' into release commit e5c301428294cb8925667c9ee39f817c4ab1c2c9 Author: Avi Kivity Date: Tue Jan 11 12:15:54 2011 +0200 KVM: Initialize fpu state in preemptible context init_fpu() (which is indirectly called by the fpu switching code) assumes it is in process context. Rather than makeing init_fpu() use an atomic allocation, which can cause a task to be killed, make sure the fpu is already initialized when we enter the run loop. KVM-Stable-Tag. Reported-and-tested-by: Kirill A. Shutemov Acked-by: Pekka Enberg Reviewed-by: Christoph Lameter Signed-off-by: Avi Kivity commit 03b6e6e58d9dd5f3068288653810db3c15fde929 Merge: 9e0c20b 81e88fd Author: Len Brown Date: Wed Jan 12 05:02:22 2011 -0500 Merge branch 'apei' into release commit 9e0c20bceb611917a7546172ac617d07e5af0cfa Merge: fe3ded5 8206955 Author: Len Brown Date: Wed Jan 12 05:02:10 2011 -0500 Merge branch 'acpi-video' into release commit fe3ded5078e957d80c43837e1966429cf0029c10 Merge: 77cff3b 5a344a5 Author: Len Brown Date: Wed Jan 12 05:01:08 2011 -0500 Merge branch 'throttling' into release commit 77cff3b0d6349cc0212056238108b827b3cc353b Merge: c1b2dab 4cb1872 Author: Len Brown Date: Wed Jan 12 05:00:44 2011 -0500 Merge branch 'thermal' into release commit c1b2dab96f3c1cb051b85d82d7e70e12e9b930f2 Merge: 6d1f23f 6d855fc Author: Len Brown Date: Wed Jan 12 05:00:07 2011 -0500 Merge branch 'procfs-cleanup' into release commit 6d1f23f204c9e4638bd30ff3a768c47e40cd3ac0 Merge: 633379a cdefba0 Author: Len Brown Date: Wed Jan 12 04:59:44 2011 -0500 Merge branch 'pnp' into release commit 633379a0f9f16362835d7a3fde141d3a95fd6c97 Merge: d16675e cc8e7a3 Author: Len Brown Date: Wed Jan 12 04:58:51 2011 -0500 Merge branch 'bugzilla-15100' into release commit d16675e1f1de98cc73ae77c6df26154ffae6230a Merge: fb4af41 6d5bbf0 Author: Len Brown Date: Wed Jan 12 04:56:08 2011 -0500 Merge branch 'suspend-ioremap-cache' into release commit fb4af417cce9ff87abf33a6bb9a0cf613e285364 Merge: 07bf280 7b33070 Author: Len Brown Date: Wed Jan 12 04:55:46 2011 -0500 Merge branch 'wakeup-etc-rafael' into release commit 07bf280521bb06bc8e64f0b998fc391253fcb959 Merge: 1ae5ec9 53eac70 Author: Len Brown Date: Wed Jan 12 04:55:28 2011 -0500 Merge branch 'power-resource' into release commit 53eac700b0df1fef8c957b9eedfd7f48120425e3 Author: Rafael J. Wysocki Date: Sat Dec 11 23:45:30 2010 +0100 ACPI / PM: Drop acpi_power_nocheck Since acpi_bus_set_power() should not use __acpi_bus_get_power() to update the device's device->power.state field before changing its power state (this may cause device->power.state to be inconsistent with the device power resources' reference counters), remove this call from it. In consequence, the acpi_power_nocheck variable is not necessary any more, so it can be dropped along with the DMI table used for setting that variable for HP Pavilion 05. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit f6767dcf2a4f6e62960912d0affec1e15a246191 Author: Rafael J. Wysocki Date: Sat Dec 11 23:44:39 2010 +0100 ACPI / PM: Drop acpi_bus_get_power() There are no more users of acpi_bus_get_power(), so it can be dropped. Moreover, it should be dropped, because it modifies the device->power.state field of an ACPI device without updating the reference counters of the device's power resources, which is wrong. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 40b7397579e006c0f9cf4de58e9ccc350e06308f Author: Rafael J. Wysocki Date: Sat Dec 11 23:43:26 2010 +0100 Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() Use the new function acpi_bus_update_power(), which is safer than acpi_bus_get_power(), for getting device power state in acpi_fujitsu_add() and acpi_fujitsu_hotkey_add(). Signed-off-by: Rafael J. Wysocki Reported-and-Tested-by: Sedat Dilek Signed-off-by: Len Brown commit 488a76c52606199100adf09c8eb7cbedbd94e9d9 Author: Rafael J. Wysocki Date: Thu Nov 25 00:11:24 2010 +0100 ACPI / Fan: Rework the handling of power resources Use the new function acpi_bus_update_power() for manipulating power resources used by ACPI fan devices, which allows them to be put into the right state during initialization and resume. Consequently, remove the flags.force_power_state field from struct acpi_device, which is not necessary any more. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit bf325f9538d8c89312be305b9779edbcb436af00 Author: Rafael J. Wysocki Date: Thu Nov 25 00:10:44 2010 +0100 ACPI / PM: Register power resource devices as soon as they are needed Depending on the organization of the ACPI namespace, power resource device objects may generally be scanned after the "regular" device objects that they are referred from through _PRn. This, in turn, may cause acpi_bus_get_power_flags() to attempt to access them through acpi_bus_init_power() before they are registered (and initialized by acpi_power_driver). [This is not a theoretical issue, it actually happens for one PnP device on my testbed HP nx6325.] To fix this problem, make acpi_bus_get_power_flags() attempt to register power resource devices as soon as they have been found in the _PRn output for any other devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 97d9a9e9f5ee68f20005ca5aa77c6b684e7cace8 Author: Rafael J. Wysocki Date: Thu Nov 25 00:10:02 2010 +0100 ACPI / PM: Register acpi_power_driver early The ACPI device driver used for handling power resources, acpi_power_driver, creates a struct acpi_power_resource object for each ACPI device representing a power resource. These objects are then used when setting and reading the power states of devices using the corresponding power resources. Unfortunately, acpi_power_driver is registered after acpi_scan_init() that may add devices using the power resources before acpi_power_driver has a chance to create struct acpi_power_resource objects for them (specifically, the power resources may be referred to during the scanning process through acpi_bus_get_power() before they have been initialized). As the first step towards fixing this issue, move the registration of acpi_power_driver into acpi_scan_init() so that power resource devices can be initialized by it as soon as they have been found in the namespace. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 25eed40720fc9005c63a1f436e5f8a78836c26ff Author: Rafael J. Wysocki Date: Thu Nov 25 00:09:15 2010 +0100 ACPI / PM: Add function for updating device power state consistently Add function acpi_bus_update_power() for reading the actual power state of an ACPI device and updating its device->power.state field in such a way that its power resources' reference counters will remain consistent with that field. For this purpose introduce __acpi_bus_set_power() setting the power state of an ACPI device without updating its device->power.state field and make acpi_bus_set_power() and acpi_bus_update_power() use it (acpi_bus_set_power() retains the current behavior for now). Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit ade3e7fef794781c0798d0cf0f046123842ba550 Author: Rafael J. Wysocki Date: Thu Nov 25 00:08:36 2010 +0100 ACPI / PM: Add function for device power state initialization Add function acpi_bus_init_power() for getting the initial power state of an ACPI device and reference counting its power resources as appropriate. Make acpi_bus_get_power_flags() use the new function instead of acpi_bus_get_power() that updates device->power.state without reference counting the device's power resources. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 5e6d4fe4296782f1f095575b8213a97c3e925a16 Author: Rafael J. Wysocki Date: Thu Nov 25 00:07:56 2010 +0100 ACPI / PM: Introduce __acpi_bus_get_power() It sometimes is necessary to get the power state of an ACPI device without updating its device->power.state field, for example to avoid inconsistencies between device->power.state and the reference counters of the device's power resources. For this purpose introduce __acpi_bus_get_power() that will return the given device's power state via a pointer (instead of modifying device->power.state) and make acpi_bus_get_power() use it. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 30d3df41b32b1ea63d3ebc52ef5644cbe41520f4 Author: Rafael J. Wysocki Date: Thu Nov 25 00:06:55 2010 +0100 ACPI / PM: Introduce function for refcounting device power resources Introduce function acpi_power_on_resources() that reference counts and possibly turns on ACPI power resources for a given device and a given power state of it. This function will be used for reference counting device power resources during initialization. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit d2ef555b57292cd818934636ac8e3414cc2a6762 Author: Rafael J. Wysocki Date: Thu Nov 25 00:06:09 2010 +0100 ACPI / PM: Add functions for manipulating lists of power resources ACPI device power resources should be reference counted during device initialization, so that their reference counters are always up to date. It is convenient to do that with the help of a function that will reference count and possibly turn on power resources in a given list, so introduce that function, acpi_power_on_list(). For symmetry, introduce acpi_power_off_list() for performing the reverse operation and use the both of them to simplify acpi_power_transition(). Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 32a00d274e877eab3ea7ab196b75c9be5170d25e Author: Rafael J. Wysocki Date: Thu Nov 25 00:05:17 2010 +0100 ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes acpi_power_get_inferred_state() should not update device->power.state behind the back of its caller, so make it return the state via a pointer instead. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 444e863d13373b958ec6b133dcecf140d6c6c2ab Author: Gleb Natapov Date: Mon Dec 27 17:25:04 2010 +0200 KVM: VMX: when entering real mode align segment base to 16 bytes VMX checks that base is equal segment shifted 4 bits left. Otherwise guest entry fails. Signed-off-by: Gleb Natapov Signed-off-by: Avi Kivity commit f8e453b00cf1d90a047eb0ef8eefe6200e0f4512 Author: Xiao Guangrong Date: Thu Dec 23 16:09:29 2010 +0800 KVM: MMU: handle 'map_writable' in set_spte() function Move the operation of 'writable' to set_spte() to clean up code [avi: remove unneeded booleanification] Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit b034cf0105235e65ee1b0161dbe8fef0338d06e7 Author: Xiao Guangrong Date: Thu Dec 23 16:08:35 2010 +0800 KVM: MMU: audit: allow audit more guests at the same time It only allows to audit one guest in the system since: - 'audit_point' is a glob variable - mmu_audit_disable() is called in kvm_mmu_destroy(), so audit is disabled after a guest exited this patch fix those issues then allow to audit more guests at the same time Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit aff48baa34c033318ad322ecbf2e4bcd891b29ca Author: Avi Kivity Date: Sun Dec 5 18:56:11 2010 +0200 KVM: Fetch guest cr3 from hardware on demand Instead of syncing the guest cr3 every exit, which is expensince on vmx with ept enabled, sync it only on demand. [sheng: fix incorrect cr3 seen by Windows XP] Signed-off-by: Sheng Yang Signed-off-by: Avi Kivity commit 9f8fe5043fd26627c2fa2e9a41896885e675000b Author: Avi Kivity Date: Sun Dec 5 17:30:00 2010 +0200 KVM: Replace reads of vcpu->arch.cr3 by an accessor This allows us to keep cr3 in the VMCS, later on. Signed-off-by: Avi Kivity commit e49146dce8c3dc6f4485c1904b6587855f393e71 Author: Marcelo Tosatti Date: Wed Dec 22 09:01:57 2010 -0200 KVM: MMU: only write protect mappings at pagetable level If a pagetable contains a writeable large spte, all of its sptes will be write protected, including non-leaf ones, leading to endless pagefaults. Do not write protect pages above PT_PAGE_TABLE_LEVEL, as the spte fault paths assume non-leaf sptes are writable. Tested-by: Alex Williamson Signed-off-by: Marcelo Tosatti commit 16d8f72f70a85ce333788204a69318827130ca75 Author: Avi Kivity Date: Tue Dec 21 16:51:50 2010 +0200 KVM: VMX: Correct asm constraint in vmcs_load()/vmcs_clear() 'error' is byte sized, so use a byte register constraint. Acked-by: Randy Dunlap Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit c445f8ef43bd9d2fb28213920d9b21f2465d22df Author: Avi Kivity Date: Tue Dec 21 16:26:01 2010 +0200 KVM: MMU: Initialize base_role for tdp mmus Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 110312c84b5fbd4daf5de2417fa8ab5ec883858d Author: Avi Kivity Date: Tue Dec 21 12:54:20 2010 +0200 KVM: VMX: Optimize atomic EFER load When NX is enabled on the host but not on the guest, we use the entry/exit msr load facility, which is slow. Optimize it to use entry/exit efer load, which is ~1200 cycles faster. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 07c116d2f53d721377fe428d067e2cecf80c906e Author: Avi Kivity Date: Tue Dec 21 12:54:19 2010 +0200 KVM: VMX: Add definitions for more vm entry/exit control bits Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit dc25e89e07d5ef31c476117d2c76b34dbb22196c Author: Andre Przywara Date: Tue Dec 21 11:12:07 2010 +0100 KVM: SVM: copy instruction bytes from VMCB In case of a nested page fault or an intercepted #PF newer SVM implementations provide a copy of the faulting instruction bytes in the VMCB. Use these bytes to feed the instruction emulator and avoid the costly guest instruction fetch in this case. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit df4f3108562dc6f6ae6648f2698df7f4c9acf52d Author: Andre Przywara Date: Tue Dec 21 11:12:06 2010 +0100 KVM: SVM: implement enhanced INVLPG intercept When the DecodeAssist feature is available, the linear address is provided in the VMCB on INVLPG intercepts. Use it directly to avoid any decoding and emulation. This is only useful for shadow paging, though. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit cae3797a4639898f339fad57c7e12d270ec91a6c Author: Andre Przywara Date: Tue Dec 21 11:12:05 2010 +0100 KVM: SVM: enhance mov DR intercept handler Newer SVM implementations provide the GPR number in the VMCB, so that the emulation path is no longer necesarry to handle debug register access intercepts. Implement the handling in svm.c and use it when the info is provided. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit 7ff76d58a9dc03a38b86d283abcaae2ac3c74fe3 Author: Andre Przywara Date: Tue Dec 21 11:12:04 2010 +0100 KVM: SVM: enhance MOV CR intercept handler Newer SVM implementations provide the GPR number in the VMCB, so that the emulation path is no longer necesarry to handle CR register access intercepts. Implement the handling in svm.c and use it when the info is provided. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit ddce97aac5405e0b2b8b2191cb65b5a48eb14145 Author: Andre Przywara Date: Tue Dec 21 11:12:03 2010 +0100 KVM: SVM: add new SVM feature bit names the recent APM Vol.2 and the recent AMD CPUID specification describe new CPUID features bits for SVM. Name them here for later usage. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit 51d8b66199e94284e7725a79eae4a38de4b80d54 Author: Andre Przywara Date: Tue Dec 21 11:12:02 2010 +0100 KVM: cleanup emulate_instruction emulate_instruction had many callers, but only one used all parameters. One parameter was unused, another one is now hidden by a wrapper function (required for a future addition anyway), so most callers use now a shorter parameter list. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit db8fcefaa704ccb40b6dcd24e3b75bad3ce7dde3 Author: Andre Przywara Date: Tue Dec 21 11:12:01 2010 +0100 KVM: move complete_insn_gp() into x86.c move the complete_insn_gp() helper function out of the VMX part into the generic x86 part to make it usable by SVM. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit eea1cff9ab732ea56358ff5e1bd8b99db2e8402d Author: Andre Przywara Date: Tue Dec 21 11:12:00 2010 +0100 KVM: x86: fix CR8 handling The handling of CR8 writes in KVM is currently somewhat cumbersome. This patch makes it look like the other CR register handlers and fixes a possible issue in VMX, where the RIP would be incremented despite an injected #GP. Signed-off-by: Andre Przywara Signed-off-by: Marcelo Tosatti commit a63512a4d711c9bd6a5d03847f45fcf88cdea0c6 Author: Avi Kivity Date: Thu Dec 16 11:27:23 2010 +0200 KVM guest: Fix kvm clock initialization when it's configured out Signed-off-by: Avi Kivity commit 175504cdbfef6a0fde3bafb6c38b4929049ac8ea Author: Takuya Yoshikawa Date: Thu Dec 16 01:41:37 2010 +0900 KVM: Take missing slots_lock for kvm_io_bus_unregister_dev() In KVM_CREATE_IRQCHIP, kvm_io_bus_unregister_dev() is called without taking slots_lock in the error handling path. Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit a355c85c5f137d93c4e9274c50e26c20f1ebc1c9 Author: Lai Jiangshan Date: Tue Dec 14 17:57:47 2010 +0800 KVM: return true when user space query KVM_CAP_USER_NMI extension userspace may check this extension in runtime. Signed-off-by: Lai Jiangshan Signed-off-by: Avi Kivity commit 61cfab2e83263ea294a034b12079476a917299f4 Author: Avi Kivity Date: Mon Dec 13 17:24:53 2010 +0200 KVM: Correct kvm_pio tracepoint count field Currently, we record '1' for count regardless of the real count. Fix. Signed-off-by: Avi Kivity commit d3c422bd33388e6fe6777bde0e9bd20152133083 Author: Avi Kivity Date: Sun Dec 12 19:30:55 2010 +0200 KVM: MMU: Fix incorrect direct page write protection due to ro host page If KVM sees a read-only host page, it will map it as read-only to prevent breaking a COW. However, if the page was part of a large guest page, KVM incorrectly extends the write protection to the entire large page frame instead of limiting it to the normal host page. This results in the instantiation of a new shadow page with read-only access. If this happens for a MOVS instruction that moves memory between two normal pages, within a single large page frame, and mapped within the guest as a large page, and if, in addition, the source operand is not writeable in the host (perhaps due to KSM), then KVM will instantiate a read-only direct shadow page, instantiate an spte for the source operand, then instantiate a new read/write direct shadow page and instantiate an spte for the destination operand. Since these two sptes are in different shadow pages, MOVS will never see them at the same time and the guest will not make progress. Fix by mapping the direct shadow page read/write, and only marking the host page read-only. Signed-off-by: Avi Kivity commit 5c663a1534d27d817e17eed06a83d08f497f9f4f Author: Avi Kivity Date: Wed Dec 8 18:04:51 2010 +0200 KVM: Fix build error on s390 due to missing tlbs_dirty Make it available for all archs. Signed-off-by: Avi Kivity commit 81dd35d42c9aef3c1f7ae6ce4cf6a0d382661db5 Author: Joerg Roedel Date: Tue Dec 7 17:15:06 2010 +0100 KVM: SVM: Add xsetbv intercept This patch implements the xsetbv intercept to the AMD part of KVM. This makes AVX usable in a save way for the guest on AVX capable AMD hardware. The patch is tested by using AVX in the guest and host in parallel and checking for data corruption. I also used the KVM xsave unit-tests and they all pass. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit d4dbf470096c51cb4785167ea59fdbdea87ccbe4 Author: Takuya Yoshikawa Date: Tue Dec 7 12:59:07 2010 +0900 KVM: MMU: Make the way of accessing lpage_info more generic Large page information has two elements but one of them, write_count, alone is accessed by a helper function. This patch replaces this helper function with more generic one which returns newly named kvm_lpage_info structure and use it to access the other element rmap_pde. Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit 443381a828910efa3d71ba4491d180f2d0bb4212 Author: Anthony Liguori Date: Mon Dec 6 10:53:38 2010 -0600 KVM: VMX: add module parameter to avoid trapping HLT instructions (v5) In certain use-cases, we want to allocate guests fixed time slices where idle guest cycles leave the machine idling. There are many approaches to achieve this but the most direct is to simply avoid trapping the HLT instruction which lets the guest directly execute the instruction putting the processor to sleep. Introduce this as a module-level option for kvm-vmx.ko since if you do this for one guest, you probably want to do it for all. Signed-off-by: Anthony Liguori Signed-off-by: Avi Kivity commit 38e5e92fe8c02a8766459d505423b855caf9af1f Author: Joerg Roedel Date: Fri Dec 3 15:25:16 2010 +0100 KVM: SVM: Implement Flush-By-Asid feature This patch adds the new flush-by-asid of upcoming AMD processors to the KVM-AMD module. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit f40f6a459c2fefa77fd74eec28d6233c0a7f431a Author: Joerg Roedel Date: Fri Dec 3 15:25:15 2010 +0100 KVM: SVM: Use svm_flush_tlb instead of force_new_asid This patch replaces all calls to force_new_asid which are intended to flush the guest-tlb by the more appropriate function svm_flush_tlb. As a side-effect the force_new_asid function is removed. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit fa22a8d608a580264a99f0ddf4bb7fe65a9c2eb3 Author: Joerg Roedel Date: Fri Dec 3 15:25:14 2010 +0100 KVM: SVM: Remove flush_guest_tlb function This function is unused and there is svm_flush_tlb which does the same. So this function can be removed. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit fb67e14fc90f18250259faf61a269320ea8e4d8f Author: Xiao Guangrong Date: Tue Dec 7 10:35:25 2010 +0800 KVM: MMU: retry #PF for softmmu Retry #PF for softmmu only when the current vcpu has the same cr3 as the time when #PF occurs Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 2ec4739ddc889af11d09b3d5ca33687f1f3f1020 Author: Xiao Guangrong Date: Tue Dec 7 10:34:42 2010 +0800 KVM: MMU: fix accessed bit set on prefault path Retry #PF is the speculative path, so don't set the accessed bit Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 78b2c54aa4a7e9e4257d2b8e3a4b96d2d0c6e636 Author: Xiao Guangrong Date: Tue Dec 7 10:48:06 2010 +0800 KVM: MMU: rename 'no_apf' to 'prefault' It's the speculative path if 'no_apf = 1' and we will specially handle this speculative path in the later patch, so 'prefault' is better to fit the sense. Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit b53ba3f9cc0b5ac21a86a95c702768f871b02610 Author: Joerg Roedel Date: Fri Dec 3 11:45:59 2010 +0100 KVM: SVM: Add clean-bit for LBR state This patch implements the clean-bit for all LBR related state. This includes the debugctl, br_from, br_to, last_excp_from, and last_excp_to msrs. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 0574dec0d73ab87a21a8965467ac8caeedac7fed Author: Joerg Roedel Date: Fri Dec 3 11:45:58 2010 +0100 KVM: SVM: Add clean-bit for CR2 register This patch implements the clean-bit for the cr2 register in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 060d0c9a2ee2b1d2cf10afc11d8a0b2d97d8f3e3 Author: Joerg Roedel Date: Fri Dec 3 11:45:57 2010 +0100 KVM: SVM: Add clean-bit for Segements and CPL This patch implements the clean-bit defined for the cs, ds, ss, an es segemnts and the current cpl saved in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 17a703cb14055c5dac7f34672d368c4d8f6ffe49 Author: Joerg Roedel Date: Fri Dec 3 11:45:56 2010 +0100 KVM: SVM: Add clean-bit for GDT and IDT This patch implements the clean-bit for the base and limit of the gdt and idt in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 72214b9601f2b6c8343ea57b0e405f9da7a92d29 Author: Joerg Roedel Date: Fri Dec 3 11:45:55 2010 +0100 KVM: SVM: Add clean-bit for DR6 and DR7 This patch implements the clean-bit for the dr6 and dr7 debug registers in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit dcca1a6506123cd47af334b7ee2a4b0288196389 Author: Joerg Roedel Date: Fri Dec 3 11:45:54 2010 +0100 KVM: SVM: Add clean-bit for control registers This patch implements the CRx clean-bit for the vmcb. This bit covers cr0, cr3, cr4, and efer. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit b2747166dc315b31281fb659a5b8938873d5f1d7 Author: Joerg Roedel Date: Fri Dec 3 11:45:53 2010 +0100 KVM: SVM: Add clean-bit for NPT state This patch implements the clean-bit for all nested paging related state in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit decdbf6a4c4f5cf14343946031aff24ff815c909 Author: Joerg Roedel Date: Fri Dec 3 11:45:52 2010 +0100 KVM: SVM: Add clean-bit for interrupt state This patch implements the clean-bit for all interrupt related state in the vmcb. This corresponds to vmcb offset 0x60-0x67. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit d48086d1e316e0cefd69b6d2ce75a42856cfba57 Author: Joerg Roedel Date: Fri Dec 3 11:45:51 2010 +0100 KVM: SVM: Add clean-bit for the ASID This patch implements the clean-bit for the asid in the vmcb. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit f56838e4c38cbbc428ae276783f5dbb225e58817 Author: Joerg Roedel Date: Fri Dec 3 11:45:50 2010 +0100 KVM: SVM: Add clean-bit for IOPM_BASE and MSRPM_BASE This patch adds the clean bit for the physical addresses of the MSRPM and the IOPM. It does not need to be set in the code because the only place where these values are changed is the nested-svm vmrun and vmexit path. These functions already mark the complete VMCB as dirty. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 116a0a23676e7d29b7747a53f819baaaf4b88575 Author: Joerg Roedel Date: Fri Dec 3 11:45:49 2010 +0100 KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count This patch adds the clean-bit for intercepts-vectors, the TSC offset and the pause-filter count to the appropriate places. The IO and MSR permission bitmaps are not subject to this bit. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 8d28fec406e4d5ce6c109fe12699976e72e9748e Author: Roedel, Joerg Date: Fri Dec 3 13:15:21 2010 +0100 KVM: SVM: Add clean-bits infrastructure code This patch adds the infrastructure for the implementation of the individual clean-bits. Signed-off-by: Joerg Roedel Signed-off-by: Avi Kivity commit 700e1b12196c4b01524ca10d89f8731418d72b6e Author: Takuya Yoshikawa Date: Mon Dec 6 01:11:33 2010 +0900 KVM: MMU: Avoid dropping accessed bit while removing write access One more "KVM: MMU: Don't drop accessed bit while updating an spte." Sptes are accessed by both kvm and hardware. This patch uses update_spte() to fix the way of removing write access. Signed-off-by: Takuya Yoshikawa Signed-off-by: Avi Kivity commit a295673aba42895997a6c1be87f467a7cfc0f332 Author: Avi Kivity Date: Thu Dec 2 17:55:23 2010 +0200 KVM: VMX: Return 0 from a failed VMREAD If we execute VMREAD during reboot we'll just skip over it. Instead of returning garbage, return 0, which has a much smaller chance of confusing the code. Otherwise we risk a flood of debug printk()s which block the reboot process if a serial console or netconsole is enabled. Signed-off-by: Avi Kivity commit b7c4145ba2eb0717db0ddac1b5f7f48012189c53 Author: Avi Kivity Date: Thu Dec 2 17:52:50 2010 +0200 KVM: Don't spin on virt instruction faults during reboot Since vmx blocks INIT signals, we disable virtualization extensions during reboot. This leads to virtualization instructions faulting; we trap these faults and spin while the reboot continues. Unfortunately spinning on a non-preemptible kernel may block a task that reboot depends on; this causes the reboot to hang. Fix by skipping over the instruction and hoping for the best. Signed-off-by: Avi Kivity commit 4cc703100b1fd97c71804e2fa5c9c377c5b37dc5 Author: Joerg Roedel Date: Tue Nov 30 18:04:01 2010 +0100 KVM: SVM: Use get_host_vmcb function in svm_get_msr for TSC This patch replaces the open-coded vmcb-selection for the TSC calculation with the new get_host_vmcb helper function introduced in this patchset. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 8a05a1b8693371547bbb2d06f842595cebd16687 Author: Joerg Roedel Date: Tue Nov 30 18:04:00 2010 +0100 KVM: SVM: Add manipulation functions for misc intercepts This patch wraps changes to the misc intercepts of SVM into seperate functions to abstract nested-svm better and prepare the implementation of the vmcb-clean-bits feature. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 18c918c5f59bc35f9c567689daef8c255b575fdc Author: Joerg Roedel Date: Tue Nov 30 18:03:59 2010 +0100 KVM: SVM: Add manipulation functions for exception intercepts This patch wraps changes to the exception intercepts of SVM into seperate functions to abstract nested-svm better and prepare the implementation of the vmcb-clean-bits feature. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 3aed041a4c1b78cac87db76cf264b081df64dd37 Author: Joerg Roedel Date: Tue Nov 30 18:03:58 2010 +0100 KVM: SVM: Add manipulation functions for DRx intercepts This patch wraps changes to the DRx intercepts of SVM into seperate functions to abstract nested-svm better and prepare the implementation of the vmcb-clean-bits feature. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 4ee546b434504a618eac40421e595c68e494da9f Author: Roedel, Joerg Date: Fri Dec 3 10:50:51 2010 +0100 KVM: SVM: Add manipulation functions for CRx intercepts This patch wraps changes to the CRx intercepts of SVM into seperate functions to abstract nested-svm better and prepare the implementation of the vmcb-clean-bits feature. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 384c636843971c8ebbffd1cc8881e3184cbd23e2 Author: Joerg Roedel Date: Tue Nov 30 18:03:56 2010 +0100 KVM: SVM: Add function to recalculate intercept masks This patch adds a function to recalculate the effective intercepts masks when the vcpu is in guest-mode and either the host or the guest intercept masks change. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit fc3a9157d3148ab91039c75423da8ef97be3e105 Author: Joerg Roedel Date: Mon Nov 29 17:51:49 2010 +0100 KVM: X86: Don't report L2 emulation failures to user-space This patch prevents that emulation failures which result from emulating an instruction for an L2-Guest results in being reported to userspace. Without this patch a malicious L2-Guest would be able to kill the L1 by triggering a race-condition between an vmexit and the instruction emulator. With this patch the L2 will most likely only kill itself in this situation. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 2030753de70a8aed39543ed09c2360665b3af481 Author: Joerg Roedel Date: Mon Nov 29 17:51:48 2010 +0100 KVM: SVM: Make Use of the generic guest-mode functions This patch replaces the is_nested logic in the SVM module with the generic notion of guest-mode. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit ec9e60b21977007e3dfacc2b8fe3a8fbb9276b51 Author: Joerg Roedel Date: Mon Nov 29 17:51:47 2010 +0100 KVM: X86: Introduce generic guest-mode representation This patch introduces a generic representation of guest-mode fpr a vcpu. This currently only exists in the SVM code. Having this representation generic will help making the non-svm code aware of nesting when this is necessary. Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 6389ee946303cb4313dba0a49865e495a53351ff Author: Avi Kivity Date: Mon Nov 29 16:12:30 2010 +0200 KVM: Pull extra page fault information into struct x86_exception Currently page fault cr2 and nesting infomation are carried outside the fault data structure. Instead they are placed in the vcpu struct, which results in confusion as global variables are manipulated instead of passing parameters. Fix this issue by adding address and nested fields to struct x86_exception, so this struct can carry all information associated with a fault. Signed-off-by: Avi Kivity Tested-by: Joerg Roedel Tested-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 8c28d031657adaf238634ac406834a839d7fa43d Author: Avi Kivity Date: Mon Nov 22 17:53:27 2010 +0200 KVM: Push struct x86_exception into walk_addr() Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit ab9ae3138789afacd133a9c4b3d7a3f1578e25c7 Author: Avi Kivity Date: Mon Nov 22 17:53:26 2010 +0200 KVM: Push struct x86_exception info the various gva_to_gpa variants Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 35d3d4a1dd2c1ffd6f2481f6d8ad6c358bb22f07 Author: Avi Kivity Date: Mon Nov 22 17:53:25 2010 +0200 KVM: x86 emulator: simplify exception generation Immediately after we generate an exception, we want a X86EMUL_PROPAGATE_FAULT constant, so return it from the generation functions. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit db297e3d8ed8409b969512c3ecd9d13223f2981c Author: Avi Kivity Date: Mon Nov 22 17:53:24 2010 +0200 KVM: x86 emulator: tighen up ->read_std() and ->write_std() error checks Instead of checking for X86EMUL_PROPAGATE_FAULT, check for any error, making the callers more reliable. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 42438e364cbc1e95cacb4ca92688d54a50cf5c4d Author: Avi Kivity Date: Mon Nov 22 17:53:23 2010 +0200 KVM: x86 emulator: drop dead pf injection in emulate_popf() If rc == X86EMUL_PROPAGATE_FAULT, we would have returned earlier. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit bcc55cba9f1fcda68412c8c3d8579c56d90b16f2 Author: Avi Kivity Date: Mon Nov 22 17:53:22 2010 +0200 KVM: x86 emulator: make emulator memory callbacks return full exception This way, they can return #GP, not just #PF. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit da9cb575b1127f84984b8ad6d973dcc05ac036dd Author: Avi Kivity Date: Mon Nov 22 17:53:21 2010 +0200 KVM: x86 emulator: introduce struct x86_exception to communicate faults Introduce a structure that can contain an exception to be passed back to main kvm code. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit a4ee1ca4a36e7857d90ae8c2b85f1bde9a042c10 Author: Xiao Guangrong Date: Tue Nov 23 11:13:00 2010 +0800 KVM: MMU: delay flush all tlbs on sync_page path Quote from Avi: | I don't think we need to flush immediately; set a "tlb dirty" bit somewhere | that is cleareded when we flush the tlb. kvm_mmu_notifier_invalidate_page() | can consult the bit and force a flush if set. Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 407c61c6bd6a51b56d02f8bbad8aadf19db8c7b5 Author: Xiao Guangrong Date: Tue Nov 23 11:08:42 2010 +0800 KVM: MMU: abstract invalid guest pte mapping Introduce a common function to map invalid gpte Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit a4a8e6f76ecf963fa7e4d74b3635655a2033a27b Author: Xiao Guangrong Date: Fri Nov 19 17:04:03 2010 +0800 KVM: MMU: remove 'clear_unsync' parameter Remove it since we can judge it by using sp->unsync Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 9bdbba13b8868815198e4fdbd484769ef76392d9 Author: Lai Jiangshan Date: Fri Nov 19 17:03:22 2010 +0800 KVM: MMU: rename 'reset_host_protection' to 'host_writable' Rename it to fit its sense better Signed-off-by: Lai Jiangshan Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit b330aa0c7df1ece45f45566c45ea44f01e379ab0 Author: Xiao Guangrong Date: Fri Nov 19 17:02:35 2010 +0800 KVM: MMU: don't drop spte if overwrite it from W to RO We just need flush tlb if overwrite a writable spte with a read-only one. And we should move this operation to set_spte() for sync_page path Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 30bfb3c4256422221cc763ff6e749ce8aca8e5c9 Author: Xiao Guangrong Date: Fri Nov 19 17:01:40 2010 +0800 KVM: MMU: fix forgot flush tlbs on sync_page path We should flush all tlbs after drop spte on sync_page path since Quote from Avi: | sync_page | drop_spte | kvm_mmu_notifier_invalidate_page | kvm_unmap_rmapp | spte doesn't exist -> no flush | page is freed | guest can write into freed page? KVM-Stable-Tag. Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 27923eb19c5d1197bd9d1472abdc2e749f21387a Author: Alexander Graf Date: Thu Nov 25 10:25:44 2010 +0100 KVM: PPC: Fix compile warning KVM compilation fails with the following warning: include/linux/kvm_host.h: In function 'kvm_irq_routing_update': include/linux/kvm_host.h:679:2: error: 'struct kvm' has no member named 'irq_routing' That function is only used and reasonable to have on systems that implement an in-kernel interrupt chip. PPC doesn't. Fix by #ifdef'ing it out when no irqchip is available. Signed-off-by: Alexander Graf Signed-off-by: Avi Kivity commit 586f9607962cd982293759a4e95ff06e75be5225 Author: Avi Kivity Date: Thu Nov 18 13:09:54 2010 +0200 KVM: Add instruction-set-specific exit qualifications to kvm_exit trace The exit reason alone is insufficient to understand exactly why an exit occured; add ISA-specific trace parameters for additional information. Because fetching these parameters is expensive on vmx, and because these parameters are fetched even if tracing is disabled, we fetch the parameters via a callback instead of as traditional trace arguments. Signed-off-by: Avi Kivity commit aa17911e3c21b63e3bf94c580ed029d6dad816b4 Author: Avi Kivity Date: Wed Nov 17 18:44:19 2010 +0200 KVM: Record instruction set in kvm_exit tracepoint exit_reason's meaning depend on the instruction set; record it so a trace taken on one machine can be interpreted on another. Signed-off-by: Avi Kivity commit bd2b53b20fcd0d6c4c815b54e6d464e34429d3a4 Author: Michael S. Tsirkin Date: Thu Nov 18 19:09:08 2010 +0200 KVM: fast-path msi injection with irqfd Store irq routing table pointer in the irqfd object, and use that to inject MSI directly without bouncing out to a kernel thread. While we touch this structure, rearrange irqfd fields to make fastpath better packed for better cache utilization. This also adds some comments about locking rules and rcu usage in code. Some notes on the design: - Use pointer into the rt instead of copying an entry, to make it possible to use rcu, thus side-stepping locking complexities. We also save some memory this way. - Old workqueue code is still used for level irqs. I don't think we DTRT with level anyway, however, it seems easier to keep the code around as it has been thought through and debugged, and fix level later than rip out and re-instate it later. Signed-off-by: Michael S. Tsirkin Acked-by: Marcelo Tosatti Acked-by: Gregory Haskins Signed-off-by: Avi Kivity commit 104f226bfd0a607ca0e804ae4907555374f72cd9 Author: Avi Kivity Date: Thu Nov 18 13:12:52 2010 +0200 KVM: VMX: Fold __vmx_vcpu_run() into vmx_vcpu_run() cea15c2 ("KVM: Move KVM context switch into own function") split vmx_vcpu_run() to prevent multiple copies of the context switch from being generated (causing problems due to a label). This patch folds them back together again and adds the __noclone attribute to prevent the label from being duplicated. Signed-off-by: Avi Kivity commit 30b31ab6823988263c72a215fb875edec6161250 Author: Avi Kivity Date: Wed Nov 17 15:28:22 2010 +0200 KVM: x86 emulator: do not perform address calculations on linear addresses Linear addresses are supposed to already have segment checks performed on them; if we play with these addresses the checks become invalid. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 90de84f50b425805bf7ddc430143ed2e224ebd8e Author: Avi Kivity Date: Wed Nov 17 15:28:21 2010 +0200 KVM: x86 emulator: preserve an operand's segment identity Currently the x86 emulator converts the segment register associated with an operand into a segment base which is added into the operand address. This loss of information results in us not doing segment limit checks properly. Replace struct operand's addr.mem field by a segmented_address structure which holds both the effetive address and segment. This will allow us to do the limit check at the point of access. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit d53db5efc2f6026f7cb0871c91b887ed55e0f265 Author: Avi Kivity Date: Wed Nov 17 13:40:51 2010 +0200 KVM: x86 emulator: drop DPRINTF() Failed emulation is reported via a tracepoint; the cmps printk is pointless. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 8a6bcaa6efeb7f970474890d4dcfe89774ff26a4 Author: Avi Kivity Date: Wed Nov 17 13:40:50 2010 +0200 KVM: x86 emulator: drop unused #ifndef __KERNEL__ Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit f9335afea5d649693aee1ec8af2cc8ccf376f5a9 Author: Shane Wang Date: Wed Nov 17 11:40:17 2010 +0800 KVM: VMX: Inform user about INTEL_TXT dependency Inform user to either disable TXT in the BIOS or do TXT launch with tboot before enabling KVM since some BIOSes do not set FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX bit when TXT is enabled. Signed-off-by: Shane Wang Signed-off-by: Marcelo Tosatti commit 75b7127c3858261fc080dd52a022424a7e7f6ae5 Author: Takuya Yoshikawa Date: Tue Nov 16 17:37:41 2010 +0900 KVM: rename hardware_[dis|en]able() to *_nolock() and add locking wrappers The naming convension of hardware_[dis|en]able family is little bit confusing because only hardware_[dis|en]able_all are using _nolock suffix. Renaming current hardware_[dis|en]able() to *_nolock() and using hardware_[dis|en]able() as wrapper functions which take kvm_lock for them reduces extra confusion. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit 97e91e28fa8fcbac30beab3de72060ada27d5671 Author: Takuya Yoshikawa Date: Tue Nov 16 17:35:02 2010 +0900 KVM: take kvm_lock for hardware_disable() during cpu hotplug In kvm_cpu_hotplug(), only CPU_STARTING case is protected by kvm_lock. This patch adds missing protection for CPU_DYING case. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit e730b63cc083852551b092e1c93f0ef22c25f220 Author: Xiao Guangrong Date: Wed Nov 17 12:11:41 2010 +0800 KVM: MMU: don't mark spte notrap if reserved bit set If reserved bit is set, we need inject the #PF with PFEC.RSVD=1, but shadow_notrap_nonpresent_pte injects #PF with PFEC.RSVD=0 only Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 49f481720438bbd0138218b0bcb494c3512a454f Author: Jan Kiszka Date: Tue Nov 16 22:30:07 2010 +0100 KVM: Document device assigment API Adds API documentation for KVM_[DE]ASSIGN_PCI_DEVICE, KVM_[DE]ASSIGN_DEV_IRQ, KVM_SET_GSI_ROUTING, KVM_ASSIGN_SET_MSIX_NR, and KVM_ASSIGN_SET_MSIX_ENTRY. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 51de271d441c01e7a0cf39f128827e0b4dc56409 Author: Jan Kiszka Date: Tue Nov 16 22:30:06 2010 +0100 KVM: Clean up kvm_vm_ioctl_assigned_device Any arch not supporting device assigment will also not build assigned-dev.c. So testing for KVM_CAP_DEVICE_DEASSIGNMENT is pointless. KVM_CAP_ASSIGN_DEV_IRQ is unconditinally set. Moreover, add a default case for dispatching the ioctl. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit ed78661f2614d3c9f69c23e280db3bafdabdf5bb Author: Jan Kiszka Date: Tue Nov 16 22:30:05 2010 +0100 KVM: Save/restore state of assigned PCI device The guest may change states that pci_reset_function does not touch. So we better save/restore the assigned device across guest usage. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 1e001d49f9f9a0e3eb72939ad49d9a2c7754e9c1 Author: Jan Kiszka Date: Tue Nov 16 22:30:04 2010 +0100 KVM: Refactor IRQ names of assigned devices Cosmetic change, but it helps to correlate IRQs with PCI devices. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 0645211c43df0b96c51e12980066b3227e10b164 Author: Jan Kiszka Date: Tue Nov 16 22:30:03 2010 +0100 KVM: Switch assigned device IRQ forwarding to threaded handler This improves the IRQ forwarding for assigned devices: By using the kernel's threaded IRQ scheme, we can get rid of the latency-prone work queue and simplify the code in the same run. Moreover, we no longer have to hold assigned_dev_lock while raising the guest IRQ, which can be a lenghty operation as we may have to iterate over all VCPUs. The lock is now only used for synchronizing masking vs. unmasking of INTx-type IRQs, thus is renames to intx_lock. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 0c106b5aaa727c7f508828e94cff4a98874f930c Author: Jan Kiszka Date: Tue Nov 16 22:30:02 2010 +0100 KVM: Clear assigned guest IRQ on release When we deassign a guest IRQ, clear the potentially asserted guest line. There might be no chance for the guest to do this, specifically if we switch from INTx to MSI mode. Acked-by: Alex Williamson Acked-by: Michael S. Tsirkin Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 945ee35e0764a834bc5bc5d572085d5b6409902a Author: Avi Kivity Date: Tue Nov 9 16:15:43 2010 +0200 KVM: Mask KVM_GET_SUPPORTED_CPUID data with Linux cpuid info This allows Linux to mask cpuid bits if, for example, nx is enabled on only some cpus. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 2a6b20b83d1d37db57a9c25d99dc78454ad0747b Author: Avi Kivity Date: Tue Nov 9 16:15:42 2010 +0200 KVM: SVM: Replace svm_has() by standard Linux cpuid accessors Instead of querying cpuid directly, use the Linux accessors (boot_cpu_has, etc.). This allows the things like the clearcpuid kernel command line to work (when it's fixed wrt scattered cpuid bits). Acked-by: Joerg Roedel Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit c4806acdcec020fe5bbb054ce9dc75aaecaf29dd Author: Xiao Guangrong Date: Fri Nov 12 14:49:55 2010 +0800 KVM: MMU: fix apf prefault if nested guest is enabled If apf is generated in L2 guest and is completed in L1 guest, it will prefault this apf in L1 guest's mmu context. Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 060c2abe6c5e0f90418baf0a43b48d8d9a5521fb Author: Xiao Guangrong Date: Fri Nov 12 14:49:11 2010 +0800 KVM: MMU: support apf for nonpaing guest Let's support apf for nonpaing guest Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit e5f3f027960128035a5fa176877b5e9160b35397 Author: Xiao Guangrong Date: Fri Nov 12 14:47:01 2010 +0800 KVM: MMU: clear apfs if page state is changed If CR0.PG is changed, the page fault cann't be avoid when the prefault address is accessed later And it also fix a bug: it can retry a page enabled #PF in page disabled context if mmu is shadow page This idear is from Gleb Natapov Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 5054c0de664dbbb47f1e6b69d668b6018df832f6 Author: Xiao Guangrong Date: Fri Nov 12 14:46:08 2010 +0800 KVM: MMU: fix missing post sync audit Add AUDIT_POST_SYNC audit for long mode shadow page Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit d89f5eff70a31237ffa1e21c51d23ca532110aea Author: Jan Kiszka Date: Tue Nov 9 17:02:49 2010 +0100 KVM: Clean up vm creation and release IA64 support forces us to abstract the allocation of the kvm structure. But instead of mixing this up with arch-specific initialization and doing the same on destruction, split both steps. This allows to move generic destruction calls into generic code. It also fixes error clean-up on failures of kvm_create_vm for IA64. Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 9d893c6bc177b6ac5a1e937f4fdc359d272d68ff Author: Tracey Dent Date: Sat Nov 6 14:52:58 2010 -0400 KVM: x86: Makefile clean up Changed makefile to use the ccflags-y option instead of EXTRA_CFLAGS. Signed-off-by: Tracey Dent Signed-off-by: Avi Kivity commit 2a126faafb840e9a1e46514127cdb88ed998bd64 Author: Xiao Guangrong Date: Thu Nov 4 18:29:42 2010 +0800 KVM: remove unused function declaration Remove the declaration of kvm_mmu_set_base_ptes() Signed-off-by: Xiao Guangrong Signed-off-by: Avi Kivity commit 57e7fbee1dbd72949425b19d28415d2ddffe04ca Author: Jan Kiszka Date: Tue Nov 9 12:42:12 2010 +0100 KVM: Refactor srcu struct release on early errors Signed-off-by: Jan Kiszka Signed-off-by: Avi Kivity commit 30bd0c4c6c5aecc338ebf32e3a6e01c98f0a0b43 Author: Avi Kivity Date: Mon Nov 1 23:20:48 2010 +0200 KVM: VMX: Disallow NMI while blocked by STI While not mandated by the spec, Linux relies on NMI being blocked by an IF-enabling STI. VMX also refuses to enter a guest in this state, at least on some implementations. Disallow NMI while blocked by STI by checking for the condition, and requesting an interrupt window exit if it occurs. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 64f638c7c44fa87e65f51eaf0f8302b9cba2d696 Author: Xiao Guangrong Date: Mon Nov 1 17:03:44 2010 +0800 KVM: fix the race while wakeup all pv guest In kvm_async_pf_wakeup_all(), we add a dummy apf to vcpu->async_pf.done without holding vcpu->async_pf.lock, it will break if we are handling apfs at this time. Also use 'list_empty_careful()' instead of 'list_empty()' Signed-off-by: Xiao Guangrong Acked-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 15096ffceabb9693306982127348890886384aaa Author: Xiao Guangrong Date: Tue Nov 2 17:35:35 2010 +0800 KVM: handle more completed apfs if possible If it's no need to inject async #PF to PV guest we can handle more completed apfs at one time, so we can retry guest #PF as early as possible Signed-off-by: Xiao Guangrong Acked-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit e6d53e3b0db7ae3641f01a2b2af1470fda86d10c Author: Xiao Guangrong Date: Mon Nov 1 17:01:28 2010 +0800 KVM: avoid unnecessary wait for a async pf In current code, it checks async pf completion out of the wait context, like this: if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE && !vcpu->arch.apf.halted) r = vcpu_enter_guest(vcpu); else { ...... kvm_vcpu_block(vcpu) ^- waiting until 'async_pf.done' is not empty } kvm_check_async_pf_completion(vcpu) ^- delete list from async_pf.done So, if we check aysnc pf completion first, it can be blocked at kvm_vcpu_block Fixed by mark the vcpu is unhalted in kvm_check_async_pf_completion() path Signed-off-by: Xiao Guangrong Acked-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit c7d28c24042f7969adc29147d6c0a190192a6808 Author: Xiao Guangrong Date: Mon Nov 1 17:00:30 2010 +0800 KVM: fix searching async gfn in kvm_async_pf_gfn_slot Don't search later slots if the slot is empty Acked-by: Gleb Natapov Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 0730388b97d20cc568c25b42b9a23b28959b481f Author: Xiao Guangrong Date: Mon Nov 1 16:59:39 2010 +0800 KVM: cleanup async_pf tracepoints Use 'DECLARE_EVENT_CLASS' to cleanup async_pf tracepoints Acked-by: Gleb Natapov Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit c9b263d2be9c535b410f6617710534f798bf0ff0 Author: Xiao Guangrong Date: Mon Nov 1 16:58:43 2010 +0800 KVM: fix tracing kvm_try_async_get_page Tracing 'async' and *pfn is useless, since 'async' is always true, and '*pfn' is always "fault_pfn' We can trace 'gva' and 'gfn' instead, it can help us to see the life-cycle of an async_pf Signed-off-by: Xiao Guangrong Signed-off-by: Marcelo Tosatti commit 2653503769ef9ae771509e1358a3da8de8d21709 Author: Takuya Yoshikawa Date: Tue Nov 2 10:49:34 2010 +0900 KVM: replace vmalloc and memset with vzalloc Let's use newly introduced vzalloc(). Signed-off-by: Takuya Yoshikawa Signed-off-by: Jesper Juhl Signed-off-by: Marcelo Tosatti commit ec25d5e66ee152e371fd7046f3f8441859579aea Author: Gleb Natapov Date: Mon Nov 1 15:35:01 2010 +0200 KVM: handle exit due to INVD in VMX Currently the exit is unhandled, so guest halts with error if it tries to execute INVD instruction. Call into emulator when INVD instruction is executed by a guest instead. This instruction is not needed by ordinary guests, but firmware (like OpenBIOS) use it and fail. Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 2eec73437487aa690882cafddca6e4d93df46f26 Author: Jan Kiszka Date: Mon Nov 1 14:01:29 2010 +0100 KVM: x86: Avoid issuing wbinvd twice Micro optimization to avoid calling wbinvd twice on the CPU that has to emulate it. As we might be preempted between smp_call_function_many and the local wbinvd, the cache might be filled again so that real work could be done uselessly. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit aac8763697c6b7aa133abe8092a25154960e9a0c Author: Heiko Carstens Date: Wed Oct 27 17:22:10 2010 +0200 KVM: get rid of warning within kvm_dev_ioctl_create_vm Fixes this: CC arch/s390/kvm/../../../virt/kvm/kvm_main.o arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_dev_ioctl_create_vm': arch/s390/kvm/../../../virt/kvm/kvm_main.c:1828:10: warning: unused variable 'r' Signed-off-by: Heiko Carstens Signed-off-by: Marcelo Tosatti commit 3bcc8a8c6c13f601dddd948d33d89d5ac5213e3c Author: Heiko Carstens Date: Wed Oct 27 17:21:21 2010 +0200 KVM: add cast within kvm_clear_guest_page to fix warning Fixes this: CC arch/s390/kvm/../../../virt/kvm/kvm_main.o arch/s390/kvm/../../../virt/kvm/kvm_main.c: In function 'kvm_clear_guest_page': arch/s390/kvm/../../../virt/kvm/kvm_main.c:1224:2: warning: passing argument 3 of 'kvm_write_guest_page' makes pointer from integer without a cast arch/s390/kvm/../../../virt/kvm/kvm_main.c:1185:5: note: expected 'const void *' but argument is of type 'long unsigned int' Signed-off-by: Heiko Carstens Signed-off-by: Marcelo Tosatti commit 6f9e5c1702319e048a90e06e31b957fbbcecbe07 Author: Takuya Yoshikawa Date: Mon Nov 1 14:36:09 2010 +0900 KVM: use kmalloc() for small dirty bitmaps Currently we are using vmalloc() for all dirty bitmaps even if they are small enough, say less than K bytes. We use kmalloc() if dirty bitmap size is less than or equal to PAGE_SIZE so that we can avoid vmalloc area usage for VGA. This will also make the logging start/stop faster. Signed-off-by: Takuya Yoshikawa Signed-off-by: Marcelo Tosatti commit 515a01279a187415322a80736800a7d6325876ab Author: Takuya Yoshikawa Date: Wed Oct 27 18:23:54 2010 +0900 KVM: pre-allocate one more dirty bitmap to avoid vmalloc() Currently x86's kvm_vm_ioctl_get_dirty_log() needs to allocate a bitmap by vmalloc() which will be used in the next logging and this has been causing bad effect to VGA and live-migration: vmalloc() consumes extra systime, triggers tlb flush, etc. This patch resolves this issue by pre-allocating one more bitmap and switching between two bitmaps during dirty logging. Performance improvement: I measured performance for the case of VGA update by trace-cmd. The result was 1.5 times faster than the original one. In the case of live migration, the improvement ratio depends on the workload and the guest memory size. In general, the larger the memory size is the more benefits we get. Note: This does not change other architectures's logic but the allocation size becomes twice. This will increase the actual memory consumption only when the new size changes the number of pages allocated by vmalloc(). Signed-off-by: Takuya Yoshikawa Signed-off-by: Fernando Luis Vazquez Cao Signed-off-by: Marcelo Tosatti commit a36a57b1a19bce17b67f5c6f43460baf664ae5fa Author: Takuya Yoshikawa Date: Wed Oct 27 18:22:19 2010 +0900 KVM: introduce wrapper functions for creating/destroying dirty bitmaps This makes it easy to change the way of allocating/freeing dirty bitmaps. Signed-off-by: Takuya Yoshikawa Signed-off-by: Fernando Luis Vazquez Cao Signed-off-by: Marcelo Tosatti commit 64be5007066173d11a4635eedd57d41a3b3a7027 Author: Gleb Natapov Date: Sun Oct 24 16:49:08 2010 +0200 KVM: x86: trace "exit to userspace" event Add tracepoint for userspace exit. Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 612819c3c6e67bac8fceaa7cc402f13b1b63f7e4 Author: Marcelo Tosatti Date: Fri Oct 22 14:18:18 2010 -0200 KVM: propagate fault r/w information to gup(), allow read-only memory As suggested by Andrea, pass r/w error code to gup(), upgrading read fault to writable if host pte allows it. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 1ae5ec903f71c0ffa583ec54d17415892036ee18 Author: Lin Ming Date: Mon Dec 27 09:07:43 2010 +0800 ACPICA: Update version to 20101209 Version 20101209. Signed-off-by: Bob Moore Signed-off-by: Lin Ming Signed-off-by: Len Brown commit da50337373c90c15c6db6ed4239e87c5a3806f9a Author: Lin Ming Date: Mon Dec 13 13:39:37 2010 +0800 ACPICA: Misc comments to minimize code divergence Modify/add some comments to minimize ACPICA/linux GPE code divergence. Acked-by: Rafael J. Wysocki Signed-off-by: Lin Ming Signed-off-by: Len Brown commit a0fcdb237fcd4eaa7e5009b28ef5be07415f287d Author: Lin Ming Date: Mon Dec 13 13:39:26 2010 +0800 ACPICA: Global event handler The global event handler is called whenever a general purpose or fixed ACPI event occurs. Also update Linux OSL to collect events counter with global event handler. Signed-off-by: Lin Ming Signed-off-by: Len Brown commit bba63a296ffab20e08d9e8252d2f0d99050ac859 Author: Lin Ming Date: Mon Dec 13 13:39:17 2010 +0800 ACPICA: Implicit notify support This feature provides an automatic device notification for wake devices when a wakeup GPE occurs and there is no corresponding GPE method or handler. Rather than ignoring such a GPE, an implicit AML Notify operation is performed on the parent device object. This feature is not part of the ACPI specification and is provided for Windows compatibility only. Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 5a284cd75d635e3c5db0210dc9a9a44c6839f460 Author: Lin Ming Date: Mon Dec 13 13:39:07 2010 +0800 ACPICA: Fix local variable mess in acpi_ev_asynch_execute_gpe_method Change the local variable in acpi_ev_asynch_execute_gpe_method() back into a pointer as ACPICA code base does. Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 84f6b2a681cd2cc55ecc3fa94bfbe672d7ef4126 Author: Lin Ming Date: Mon Dec 13 13:38:55 2010 +0800 ACPICA: Remove unused function declarations Acked-by: Rafael J. Wysocki Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 8b6cd8ad18def34bfc5045b2a0234329bf94cf78 Author: Lin Ming Date: Mon Dec 13 13:38:46 2010 +0800 ACPICA: New GPE handler callback definition The new GPE handler callback has 2 additional parameters, gpe_device and gpe_number. typedef u32 (*acpi_gpe_handler) (acpi_handle gpe_device, u32 gpe_number, void *context); Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 3a37898d507794cfc68a092303e02651d3f01308 Author: Lin Ming Date: Mon Dec 13 13:36:15 2010 +0800 ACPICA: Rename some function and variable names Some function and variable names are renamed to be consistent with ACPICA code base. acpi_raw_enable_gpe -> acpi_ev_add_gpe_reference acpi_raw_disable_gpe -> acpi_ev_remove_gpe_reference acpi_gpe_can_wake -> acpi_setup_gpe_for_wake acpi_gpe_wakeup -> acpi_set_gpe_wake_mask acpi_update_gpes -> acpi_update_all_gpes acpi_all_gpes_initialized -> acpi_gbl_all_gpes_initialized acpi_handler_info -> acpi_gpe_handler_info ... Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 7905d9a5ad7a83f1c1c00559839857ab90afbdfc Author: Marcelo Tosatti Date: Fri Oct 22 14:18:17 2010 -0200 KVM: MMU: flush TLBs on writable -> read-only spte overwrite This can happen in the following scenario: vcpu0 vcpu1 read fault gup(.write=0) gup(.write=1) reuse swap cache, no COW set writable spte use writable spte set read-only spte Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 982c25658c066fbbeb42e44a6a8fcd59ae008837 Author: Marcelo Tosatti Date: Fri Oct 22 14:18:16 2010 -0200 KVM: MMU: remove kvm_mmu_set_base_ptes Unused. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit ff1fcb9ebd53ee3f21ae117e6952204e465f46d8 Author: Marcelo Tosatti Date: Fri Oct 22 14:18:15 2010 -0200 KVM: VMX: remove setting of shadow_base_ptes for EPT The EPT present/writable bits use the same position as normal pagetable bits. Since direct_map passes ACC_ALL to mmu_set_spte, thus always setting the writable bit on sptes, use the generic PT_PRESENT shadow_base_pte. Also pass present/writable error code information from EPT violation to generic pagefault handler. Signed-off-by: Marcelo Tosatti Signed-off-by: Avi Kivity commit 83bcacb1a548d4d8df532376c981277761622bce Author: Avi Kivity Date: Mon Oct 25 15:23:55 2010 +0200 KVM: Avoid double interrupt injection with vapic After an interrupt injection, the PPR changes, and we have to reflect that into the vapic. This causes a KVM_REQ_EVENT to be set, which causes the whole interrupt injection routine to be run again (harmlessly). Optimize by only setting KVM_REQ_EVENT if the ppr was lowered; otherwise there is no chance that a new injection is needed. Signed-off-by: Avi Kivity commit 82ca2d108b493f7d916975805668bef2096f1147 Author: Avi Kivity Date: Thu Oct 21 12:20:34 2010 +0200 KVM: SVM: Fold save_host_msrs() and load_host_msrs() into their callers This abstraction only serves to obfuscate. Remove. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit dacccfdd6bb386ec0714e1fec250c4b7d0aaccc9 Author: Avi Kivity Date: Thu Oct 21 12:20:33 2010 +0200 KVM: SVM: Move fs/gs/ldt save/restore to heavyweight exit path ldt is never used in the kernel context; same goes for fs (x86_64) and gs (i386). So save/restore them in the heavyweight exit path instead of the lightweight path. By itself, this doesn't buy us much, but it paves the way for moving vmload and vmsave to the heavyweight exit path, since they modify the same registers. [jan: fix copy/pase mistake on i386] Signed-off-by: Avi Kivity Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit afe9e66f8233e33e16fcc5b855070e45978f919e Author: Avi Kivity Date: Thu Oct 21 12:20:32 2010 +0200 KVM: SVM: Move svm->host_gs_base into a separate structure More members will join it soon. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit 13c34e073bec75aa4c8d1bb80c10fd7291f3423a Author: Avi Kivity Date: Thu Oct 21 12:20:31 2010 +0200 KVM: SVM: Move guest register save out of interrupts disabled section Saving guest registers is just a memory copy, and does not need to be in the critical section. Move outside the critical section to improve latency a bit. Signed-off-by: Avi Kivity Signed-off-by: Marcelo Tosatti commit d4c90b0043bdb40a6f340d34b2ac1861040de88c Author: Jan Kiszka Date: Wed Oct 20 18:34:54 2010 +0200 KVM: x86: Add missing inline tag to kvm_read_and_reset_pf_reason May otherwise generates build warnings about unused kvm_read_and_reset_pf_reason if included without CONFIG_KVM_GUEST enabled. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit f56f5369561ccafe0d4a2396179f814454a1571c Author: Andi Kleen Date: Wed Oct 20 17:56:17 2010 +0200 KVM: Move KVM context switch into own function gcc 4.5 with some special options is able to duplicate the VMX context switch asm in vmx_vcpu_run(). This results in a compile error because the inline asm sequence uses an on local label. The non local label is needed because other code wants to set up the return address. This patch moves the asm code into an own function and marks that explicitely noinline to avoid this problem. Better would be probably to just move it into an .S file. The diff looks worse than the change really is, it's all just code movement and no logic change. Signed-off-by: Andi Kleen Signed-off-by: Marcelo Tosatti commit 7e1fbeac6f4b52e12ccaa20b151bd76783069dee Author: Jan Kiszka Date: Wed Oct 20 15:18:02 2010 +0200 KVM: x86: Mark kvm_arch_setup_async_pf static It has no user outside mmu.c and also no prototype. Signed-off-by: Jan Kiszka Signed-off-by: Marcelo Tosatti commit 8030089f9e93ee5cefe74d258e35edc7ce9e4b73 Author: Gleb Natapov Date: Tue Oct 19 18:13:41 2010 +0200 KVM: improve hva_to_pfn() readability Improve vma handling code readability in hva_to_pfn() and fix async pf handling code to properly check vma returned by find_vma(). Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit fc5f06fac6fb8ce469ea173370f2cd398f1d9f9a Author: Gleb Natapov Date: Thu Oct 14 11:22:56 2010 +0200 KVM: Send async PF when guest is not in userspace too. If guest indicates that it can handle async pf in kernel mode too send it, but only if interrupts are enabled. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 6adba527420651b6cacaf392541c09fb108711a2 Author: Gleb Natapov Date: Thu Oct 14 11:22:55 2010 +0200 KVM: Let host know whether the guest can handle async PF in non-userspace context. If guest can detect that it runs in non-preemptable context it can handle async PFs at any time, so let host know that it can send async PF even if guest cpu is not in userspace. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 6c047cd982f944fa63b2d96de2a06463d113f9fa Author: Gleb Natapov Date: Thu Oct 14 11:22:54 2010 +0200 KVM paravirt: Handle async PF in non preemptable context If async page fault is received by idle task or when preemp_count is not zero guest cannot reschedule, so do sti; hlt and wait for page to be ready. vcpu can still process interrupts while it waits for the page to be ready. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 7c90705bf2a373aa238661bdb6446f27299ef489 Author: Gleb Natapov Date: Thu Oct 14 11:22:53 2010 +0200 KVM: Inject asynchronous page fault into a PV guest if page is swapped out. Send async page fault to a PV guest if it accesses swapped out memory. Guest will choose another task to run upon receiving the fault. Allow async page fault injection only when guest is in user mode since otherwise guest may be in non-sleepable context and will not be able to reschedule. Vcpu will be halted if guest will fault on the same page again or if vcpu executes kernel code. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 631bc4878220932fe67fc46fc7cf7cccdb1ec597 Author: Gleb Natapov Date: Thu Oct 14 11:22:52 2010 +0200 KVM: Handle async PF in a guest. When async PF capability is detected hook up special page fault handler that will handle async page fault events and bypass other page faults to regular page fault handler. Also add async PF handling to nested SVM emulation. Async PF always generates exit to L1 where vcpu thread will be scheduled out until page is available. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit fd10cde9294f73eeccbc16f3fec1ae6cde7b800c Author: Gleb Natapov Date: Thu Oct 14 11:22:51 2010 +0200 KVM paravirt: Add async PF initialization to PV guest. Enable async PF in a guest if async PF capability is discovered. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 344d9588a9df06182684168be4f1408b55c7da3e Author: Gleb Natapov Date: Thu Oct 14 11:22:50 2010 +0200 KVM: Add PV MSR to enable asynchronous page faults delivery. Guest enables async PF vcpu functionality using this MSR. Reviewed-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit ca3f10172eea9b95bbb66487656f3c3e93855702 Author: Gleb Natapov Date: Thu Oct 14 11:22:49 2010 +0200 KVM paravirt: Move kvm_smp_prepare_boot_cpu() from kvmclock.c to kvm.c. Async PF also needs to hook into smp_prepare_boot_cpu so move the hook into generic code. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 49c7754ce57063b819b01eb8a4290841ad0886c4 Author: Gleb Natapov Date: Mon Oct 18 15:22:23 2010 +0200 KVM: Add memory slot versioning and use it to provide fast guest write interface Keep track of memslots changes by keeping generation number in memslots structure. Provide kvm_write_guest_cached() function that skips gfn_to_hva() translation if memslots was not changed since previous invocation. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 56028d0861e48f7cc9c573d79f2d8a0a933a2bba Author: Gleb Natapov Date: Sun Oct 17 18:13:42 2010 +0200 KVM: Retry fault before vmentry When page is swapped in it is mapped into guest memory only after guest tries to access it again and generate another fault. To save this fault we can map it immediately since we know that guest is going to access the page. Do it only when tdp is enabled for now. Shadow paging case is more complicated. CR[034] and EFER registers should be switched before doing mapping and then switched back. Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit af585b921e5d1e919947c4b1164b59507fe7cd7b Author: Gleb Natapov Date: Thu Oct 14 11:22:46 2010 +0200 KVM: Halt vcpu if page it tries to access is swapped out If a guest accesses swapped out memory do not swap it in from vcpu thread context. Schedule work to do swapping and put vcpu into halted state instead. Interrupts will still be delivered to the guest and if interrupt will cause reschedule guest will continue to run another task. [avi: remove call to get_user_pages_noio(), nacked by Linus; this makes everything synchrnous again] Acked-by: Rik van Riel Signed-off-by: Gleb Natapov Signed-off-by: Marcelo Tosatti commit 3cfd53d53f700a225716294842b1a843326dea21 Author: Lin Ming Date: Mon Dec 13 13:36:02 2010 +0800 ACPICA: Move GPE functions to new file evxfgpe.c Create a new file evxfgpe.c and move GPE specific functions to it. Acked-by: Rafael J. Wysocki Signed-off-by: Lin Ming Signed-off-by: Len Brown commit 51120c2cc70fc241721b8016f4eff575e7d6aa30 Author: Holger Dengler Date: Wed Jan 12 09:55:32 2011 +0100 [S390] MAINTAINERS: Update zcrypt driver entry Holger will take over the zcrypt driver maintainer work. Update the MAINTAINERS entry accordingly. Signed-off-by: Holger Dengler Signed-off-by: Felix Beck commit d2c9dfccbc3a449b9677772e7496e2656049d9f3 Author: Heiko Carstens Date: Wed Jan 12 09:55:31 2011 +0100 [S390] Randomize PIEs Randomize ELF_ET_DYN_BASE, which is used when loading position independent executables. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3351918282fd664e918a3175ddfae9b15656122e Author: Heiko Carstens Date: Wed Jan 12 09:55:30 2011 +0100 [S390] Randomise the brk region Randomize heap address like other architectures do already. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit a05c90f1948baacedd0c3e7e3250225be4cae727 Author: Heiko Carstens Date: Wed Jan 12 09:55:29 2011 +0100 [S390] Add is_32bit_task() helper function Helper function which tells us if a task is running in ESA mode. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 9887a1fcddef1386d3387edf6497d08670460edb Author: Heiko Carstens Date: Wed Jan 12 09:55:28 2011 +0100 [S390] Randomize lower bits of stack address Randomize the lower bits of the stack address like x86 and powerpc. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit df1ca53cba34b1d40a4ed47907d71397e4ee72c2 Author: Heiko Carstens Date: Wed Jan 12 09:55:27 2011 +0100 [S390] Randomize mmap start address Randomize mmap start address with 8MB. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 1060f62ea47e609b0c1672e8d1ac216e57f11a8e Author: Heiko Carstens Date: Wed Jan 12 09:55:26 2011 +0100 [S390] Rearrange mmap.c Shuffle code around so it looks more like x86 and powerpc. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7e0d48574ec371e26fa31e23d1d314f04e31eb3e Author: Heiko Carstens Date: Wed Jan 12 09:55:25 2011 +0100 [S390] Enable flexible mmap layout for 64 bit processes Historically 64 bit processes use the legacy address layout. However there is no reason why 64 bit processes shouldn't benefit from the flexible mmap layout advantages. Therefore just enable it. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit e7828bbd5e8b7c8d6480d1eb744af821989ca432 Author: Heiko Carstens Date: Wed Jan 12 09:55:24 2011 +0100 [S390] vdso: dont map at mmap_base The vdso object is currently always mapped with mm->mmap_base used as requested address. In case of flexible mmap layout this means it gets mapped above mmap_base and therefore potentially stealing a bit of address space that is reserved for the stack. In case of flexible mmap layout the object should be mapped below mmap base. For legacy mmap layout above. To fix this just don't request any specific address and let the mmap code figure out an address that fits. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 9e78a13bfb1640c058fde9dabfd386b942539018 Author: Heiko Carstens Date: Wed Jan 12 09:55:23 2011 +0100 [S390] reduce miminum gap between stack and mmap_base Reduce minimum gap between stack and mmap_base to 32MB. That way there is a bit more space for heap and mmap for tight 31 bit address spaces. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 9046e401e752dba784805a7818f99cc45a39cbff Author: Heiko Carstens Date: Wed Jan 12 09:55:22 2011 +0100 [S390] mmap: consider stack address randomization Consider stack address randomization when calulating mmap_base for flexible mmap layout . Because of address randomization the stack address can be up to 8MB lower than STACK_TOP. When calculating mmap_base this isn't taken into account, which could lead to the case that the gap between the real stack top and mmap_base is lower than what ulimit specifies for the maximum stack size. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7a63fa1a85d75756368d9c86fff5c1b193de991c Author: Martin Schwidefsky Date: Wed Jan 12 09:55:21 2011 +0100 [S390] Update default configuration Signed-off-by: Martin Schwidefsky commit b17295e646562a2122ce84c1e55c9ae66fb6ae50 Author: Sebastian Ott Date: Wed Jan 12 09:55:10 2011 +0100 [S390] cio: path_event overindication after resume While resuming report any found paths as new to the device drivers. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 5b919f833d9d60588d026ad82d17f17e8872c7a9 Author: Kees Cook Date: Wed Jan 12 00:34:49 2011 -0800 net: ax25: fix information leak to userland harder Commit fe10ae53384e48c51996941b7720ee16995cbcb7 adds a memset() to clear the structure being sent back to userspace, but accidentally used the wrong size. Reported-by: Brad Spengler Signed-off-by: Kees Cook Cc: stable@kernel.org Signed-off-by: David S. Miller commit 81e88fdc432a1552401d6e91a984dcccce72b8dc Author: Huang Ying Date: Wed Jan 12 14:44:55 2011 +0800 ACPI, APEI, Generic Hardware Error Source POLL/IRQ/NMI notification type support Generic Hardware Error Source provides a way to report platform hardware errors (such as that from chipset). It works in so called "Firmware First" mode, that is, hardware errors are reported to firmware firstly, then reported to Linux by firmware. This way, some non-standard hardware error registers or non-standard hardware link can be checked by firmware to produce more valuable hardware error information for Linux. This patch adds POLL/IRQ/NMI notification types support. Because the memory area used to transfer hardware error information from BIOS to Linux can be determined only in NMI, IRQ or timer handler, but general ioremap can not be used in atomic context, so a special version of atomic ioremap is implemented for that. Known issue: - Error information can not be printed for recoverable errors notified via NMI, because printk is not NMI-safe. Will fix this via delay printing to IRQ context via irq_work or make printk NMI-safe. v2: - adjust printk format per comments. Signed-off-by: Huang Ying Reviewed-by: Andi Kleen Signed-off-by: Len Brown commit 700b65cee958d81b16c48378d5759c46d01e24d0 Author: Takashi Iwai Date: Wed Jan 12 09:03:05 2011 +0100 ALSA: hda - Add missing NID 0x19 fixup for Sony VAIO With GPIO2-fixup, another fixup for NID 0x19 was missing because the fixup is applied only once. Add the corresponding verb to the entry. Signed-off-by: Takashi Iwai Cc: commit 1a99d4a46c4d08da3418a2079b78ec5daa2a6408 Author: Kailang Yang Date: Wed Jan 12 09:01:23 2011 +0100 ALSA: hda - Fix ALC275 enable hardware EQ for SONY VAIO SONY VAIO ALC275 default BIOS verb set the hardware EQ to disable. Enable it when driver is loading. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit c386735264da97e6b6d15aa56361e9ef188b26ab Author: Clemens Ladisch Date: Wed Jan 12 08:30:12 2011 +0100 ALSA: oxygen: fix Xonar DG input Apparently, this card uses the other I2S input. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 357f915ece53aa4c8759087888346145848ea753 Author: Kailang Yang Date: Wed Jan 12 08:12:52 2011 +0100 ALSA: hda - Fix EAPD on Lenovo NB ALC269 to low Lenovo NB 0x9e54 use the external AMP in an inverted manner. Set EAPD to low will enable the AMP. Signed-off-by: Kailang Yang Signed-off-by: Takashi Iwai commit e2e93296c50fe13dd2ca60a0e44b5502e9b8c58e Author: Takashi Iwai Date: Wed Jan 12 08:03:39 2011 +0100 ALSA: hda - Fix missing EAPD for Acer 4930G The proper initializatio of NID 0x15 EAPD is missing in the quirk for Acer 4930G. Signed-off-by: Takashi Iwai commit 393004b2ea49524ee41a562cae8db67f50f372a5 Author: Nitin Daga Date: Mon Jan 10 21:49:31 2011 +0530 ALSA: hda: Disable 4/6 channels on some NVIDIA GPUs. Added hardware constraint in patch_hdmi.c to disable channels 4/6 which are not supported by some older NVIDIA GPUs. Signed-off-by: Nitin Daga Acked-By: Stephen Warren Cc: Signed-off-by: Takashi Iwai commit 0ebaa24c6b1f62839bcd12d63fa76e3cf23b9bd0 Author: Takashi Iwai Date: Tue Jan 11 18:11:04 2011 +0100 ALSA: hda - Add static_hdmi_pcm option to HDMI codec parser The dynamic PCM restriction based on ELD information may lead to the problem in some cases, e.g. when the receiver is turned off. Then it may send a TV HDMI default such as channels = 2. Since it's still plugged, the driver doesn't know whether it's the right configuration for future use. Now, when an app opens the device at this moment, then turn on the receiver, the app still sends channels=2. The right solution is to implement some kind of notification and automatic re-open mechanism. But, this is a goal far ahead. This patch provides a workaround for such a case by providing a new module option static_hdmi_pcm for snd-hda-codec-hdmi module. When this is set to true, the driver doesn't change PCM parameters per ELD information. For users who need the static configuration like the scenario above, set this to true. The parameter can be changed dynamically via sysfs, too. Signed-off-by: Takashi Iwai Cc: commit 6661702f2e803b55b50cc0471eb6b9254e99eef2 Author: Takashi Iwai Date: Tue Jan 11 18:07:14 2011 +0100 ALSA: hda - Don't refer ELD when unplugged When unplugged, we shouldn't refer to ELD information for PCM open any more. Signed-off-by: Takashi Iwai Cc: commit 2f55eaab56ea083498034c18e09d356594081fca Merge: 03cfbdf 559a8cd Author: Takashi Iwai Date: Wed Jan 12 07:20:30 2011 +0100 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc commit e3d5fb71e228c22ee1f78f19f19ef4e07f48f076 Author: Fabio Estevam Date: Mon Jan 10 09:47:41 2011 -0200 video: imx: Update the manufacturer's name i.MX processors are currently manufactured by Freescale, not Motorola. Make the manufacturer's name consistent. Signed-off-by: Fabio Estevam Signed-off-by: Paul Mundt commit 01c728a246a1072fe9664b91179a47937182b0a0 Merge: 554738d 50a88cb Author: Dmitry Torokhov Date: Tue Jan 11 22:01:45 2011 -0800 Merge branch 'next' into for-linus commit ec03031707a348578c6ded277e5d92eb21de4fce Author: Jamie Iles Date: Tue Jan 11 12:43:43 2011 +0000 nuc900fb: 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. Cc: linux-fbdev@vger.kernel.org Signed-off-by: Jamie Iles Acked-by: Wan ZongShun Signed-off-by: Paul Mundt commit 0b2e9cb42cd0b5b0c95a776e30c9ecdff16587ea Author: Jamie Iles Date: Tue Jan 11 12:43:42 2011 +0000 s3c2410fb: 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. Cc: Vincent Sanders Cc: linux-fbdev@vger.kernel.org Signed-off-by: Jamie Iles Signed-off-by: Paul Mundt commit 50a88cb7eddb971077ae7dff76b116747c12c371 Author: Jekyll Lai Date: Tue Jan 11 21:53:55 2011 -0800 Input: add SW_ROTATE_LOCK switch type This switch is used to signal that user want to disable screen transitions from portrait to landscape mode and back. Signed-off-by: Jekyll Lai Signed-off-by: Alan Cox Signed-off-by: Dmitry Torokhov commit ccd8c79c5608fc4835dcb0244623ceae2489f72d Author: Mayuresh Janorkar Date: Tue Jan 11 19:54:03 2011 +0530 video: tidy up modedb formatting. A part of file: drivers/video/modedb.c was not as per the coding guidelines. The cleanup includes: 1) Converting spcaes to tabs 2) Adding spaces on either sides of "|" operator Signed-off-by: Mayuresh Janorkar Signed-off-by: Paul Mundt commit 2cf0c58ed970b91e620e551d4c8da8b1d0baab49 Author: Darius Augulis Date: Wed Jan 12 14:50:51 2011 +0900 serial: samsung: fix device name Swap device and driver names in serial/samsung.c Signed-off-by: Darius Augulis Cc: Ben Dooks Signed-off-by: Kukjin Kim commit 53582c4c508a95ece9f7c907edef9911c7eb79eb Merge: 6ae1e19 da97da7 Author: Paul Mundt Date: Wed Jan 12 14:47:21 2011 +0900 Merge branch 'rmobile/sdio' into rmobile-latest commit da97da73d418533187a8390cf6541f48bed653e8 Author: Magnus Damm Date: Thu Jan 6 10:55:41 2011 +0000 ARM: mach-shmobile: sh7372 Enable SDIO IRQs for Mackerel Enable SDIO IRQ support for the Mackerel board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 9213c0007dc4863ea1c3dd6553f2f05a88573768 Author: Magnus Damm Date: Thu Jan 6 10:41:09 2011 +0000 ARM: mach-shmobile: sh7377 Enable SDIO IRQs This patch enables interrupt generation for SDIO IRQs of the SDHI block on the sh7377 aka G4 processor. Use together with a recent SDHI driver using TMIO_MMC_SDIO_IRQ and with the MMC_CAP_SDIO_IRQ flag in the board code. The G4EVM specific SDHI platform data is also updated to flag SDIO capabilities. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 969f9a19122141465d02a889d7d1de34eb53e609 Author: Magnus Damm Date: Thu Jan 6 10:38:47 2011 +0000 ARM: mach-shmobile: sh7367 Enable SDIO IRQs This patch enables interrupt generation for SDIO IRQs of the SDHI block on the sh7367 aka G3 processor. Use together with a recent SDHI driver using TMIO_MMC_SDIO_IRQ and with the MMC_CAP_SDIO_IRQ flag in the board code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 330e4e7169be3d587dcd7408003197a6f1d66dd0 Author: Arnd Hannemann Date: Tue Dec 28 22:22:33 2010 +0000 ARM: mach-shmobile: sh7372 Enable SDIO IRQs This patch enables the interrupt generation for SDIO IRQs of the sdhi controllers of the SoC. To make sure interrupts are handled announce the MMC_CAP_SDIO_IRQ capability on AP4EVB. Tested with a b43-based SDIO wireless card. Signed-off-by: Arnd Hannemann Signed-off-by: Paul Mundt commit 83eb95b852902f952ba594447a796ad8146b9462 Merge: efb3e34 9bbe7b9 Author: Paul Mundt Date: Wed Jan 12 14:37:42 2011 +0900 Merge branch 'sh/sdio' into sh-latest commit 9bbe7b984096ac45586da2adf26c14069ecb79b2 Author: Magnus Damm Date: Thu Jan 6 11:12:27 2011 +0000 sh: sh7366 Enable SDIO IRQs This patch enables interrupt generation for SDIO IRQs of the SDHI block on the sh7366 processor. Use together with a recent SDHI driver using TMIO_MMC_SDIO_IRQ and with the MMC_CAP_SDIO_IRQ flag in the board code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3a0f4c78999f9e8c1b66ddb98c8326be4b33cb49 Author: Magnus Damm Date: Thu Jan 6 11:10:09 2011 +0000 sh: sh7343 Enable SDIO IRQs This patch enables interrupt generation for SDIO IRQs of the SDHI block on the sh7343 processor. Use together with a recent SDHI driver using TMIO_MMC_SDIO_IRQ and with the MMC_CAP_SDIO_IRQ flag in the board code. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e8a50ae37fcbe9e29cfbe1d1c3dc8eccee9fbb35 Author: Arnd Hannemann Date: Wed Dec 29 15:50:28 2010 +0000 sh: mach-ecovec24: enable runtime PM for SDHI This patch enables runtime PM for SDHI on ecovec. Tested with a b43 based SDIO card. Signed-off-by: Arnd Hannemann Signed-off-by: Paul Mundt commit 365e108739a4b2b207bd61e066aa6eb9bd1b03c4 Author: Arnd Hannemann Date: Tue Dec 28 22:22:36 2010 +0000 sh: sh7723 / ap325rxa enable SDIO IRQs This patch enables the interrupt generation for SDIO IRQs of the sdhi controllers of the SoC. To make sure SDIO IRQs are used announce the MMC_CAP_SDIO_IRQ capability on ap325rxa. Signed-off-by: Arnd Hannemann Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit 464495e5d8ba58ce6c103a2a176abaf313c0c704 Author: Arnd Hannemann Date: Tue Dec 28 22:22:35 2010 +0000 sh: sh7722 Enable SDIO IRQs This patch enables the interrupt generation for SDIO IRQs of the sdhi controllers of the SoC. To make sure SDIO IRQs are used, announce the MMC_CAP_SDIO_IRQ capability on migor. Signed-off-by: Arnd Hannemann Signed-off-by: Paul Mundt commit a68a07841848a25fa04918b441667fd192cea108 Author: Arnd Hannemann Date: Tue Dec 28 22:22:34 2010 +0000 sh: sh7724 Enable SDIO IRQs This patch enables the interrupt generation for SDIO IRQs of the sdhi controllers of the SoC. To make sure interrupt are handled announce the MMC_CAP_SDIO_IRQ capability on ecovec, kfr2r09 and se7724. Tested with a b43-based SDIO wireless card on ecovec. Signed-off-by: Arnd Hannemann Signed-off-by: Paul Mundt commit 6d855fcdd24d2491455527c4999b4d04363f1980 Author: Zhang Rui Date: Mon Jan 10 11:16:30 2011 +0800 ACPI: delete CONFIG_ACPI_PROCFS_POWER and power procfs I/F in 2.6.39 sysfs I/F for ACPI power devices, including AC and Battery, has been working in upstream kenrel since 2.6.24, Sep 2007. In 2.6.37, we made the sysfs I/F always built in and this option disabled by default. Now, we plan to remove this option and the ACPI power procfs interface in 2.6.39. First, update the feature-removal-schedule to announce this change. Second, add runtime warnings in ACPI AC/Battery/SBS driver, so that users will notice this change even if "make oldconfig" is used. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 4464ed3b05de7a41ae55c74109cec8aeb138ce14 Author: Zhang Rui Date: Mon Jan 10 11:16:26 2011 +0800 ACPI: update CONFIG_ACPI_PROCFS description Update CONFIG_ACPI_PROCFS description because the processor, video and thermal zone procfs I/F have been removed. Some ACPI drivers, e.g. button, have their procfs I/F always built in, because we don't have sysfs I/F replacement at the moment. But once we finish developing the sysfs I/F for these driver, we need CONFIG_ACPI_PROCFS to enabled/disable the corresponding procfs I/F. So just updating the description rather than removing this option, although there is no procfs I/F depends on it for now. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 4cb18728709683c91a5f6f8d5f337bfb498b089a Author: R.Durgadoss Date: Wed Oct 27 03:33:29 2010 +0530 thermal: Add event notification to thermal framework This patch adds event notification support to the generic thermal sysfs framework in the kernel. The notification is in the form of a netlink event. Signed-off-by: R.Durgadoss Signed-off-by: Len Brown commit 436c3878418ff484ce852c82847b238ef3f73341 Author: Amit Daniel Kachhap Date: Wed Jan 12 13:40:04 2011 +0900 ARM: SAMSUNG: Add support for clock debugging through debug-fs interface This patch adds support for clock information exposed to debug-fs interface. Signed-off-by: Amit Daniel Kachhap [kgene.kim@samsung.com: removed useless empty lines] Signed-off-by: Kukjin Kim commit eb4a7cbf27082bea34764bab3bc85595683f967b Author: John L. Burr Date: Tue Jan 11 20:39:46 2011 -0800 IB/mthca: Fix driver when sizeof (phys_addr_t) > sizeof (long) Some systems have PCI addresses that don't fit in unsigned long (eg some 32-bit PowerPC 440 systems have 36-bit bus addresses). Fix up the driver by using phys_addr_t where appropriate, so we don't truncate any PCI resource addresses before ioremapping them. Signed-off-by: John L. Burr [ Update to apply to current driver source. - Roland ] Signed-off-by: Roland Dreier commit 65a84a0f7567ea244e5246e642920260cfc2744a Author: Anton Blanchard Date: Fri Jan 7 03:30:41 2011 +0000 xfs: Add log level to assertion printk I received a ppc64 bug report involving xfs but the assertion was filtered out by the console log level. Use KERN_CRIT to ensure it makes it out. Signed-off-by: Anton Blanchard Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 1884bd8354c9aec4ca501dc4773c13ad2a09af7b Author: Jesper Juhl Date: Sat Dec 25 20:14:53 2010 +0000 xfs: fix an assignment within an ASSERT() In fs/xfs/xfs_trans.c::xfs_trans_unreserve_and_mod_sb() at the out: label we have this: ASSERT(error = 0); I believe a comparison was intended, not an assignment. If I'm right, the patch below fixes that up. Signed-off-by: Jesper Juhl Signed-off-by: Alex Elder commit 5b026c4e3af52fda22c9313a3388344f82f3ba15 Author: Len Brown Date: Tue Jan 11 23:25:30 2011 -0500 SFI: use ioremap_cache() instead of ioremap() We copied ACPI's oversight of using ioremap() and creating non-cached table mappings when we should have been using ioremap_cache(). Signed-off-by: Len Brown commit eca0bdd326d2cf9127bbb6ac602bfbcbf169c10d Merge: 3c0eee3 103a8fe d5532ee Author: Len Brown Date: Tue Jan 11 23:06:28 2011 -0500 Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools commit d5532ee7b40b4a64e605e543b0387694430ecb79 Author: Len Brown Date: Fri Oct 22 23:53:03 2010 -0400 tools: create power/x86/x86_energy_perf_policy MSR_IA32_ENERGY_PERF_BIAS first became available on Westmere Xeon. It is implemented in all Sandy Bridge processors -- mobile, desktop and server. It is expected to become increasingly important in subsequent generations. x86_energy_perf_policy is a user-space utility to set the hardware energy vs performance policy hint in the processor. Most systems would benefit from "x86_energy_perf_policy normal" at system startup, as the hardware default is maximum performance at the expense of energy efficiency. See x86_energy_perf_policy.8 man page for more information. Background: Linux-2.6.36 added "epb" to /proc/cpuinfo to indicate if an x86 processor supports MSR_IA32_ENERGY_PERF_BIAS, without actually modifying the MSR. In March, 2010, Venkatesh Pallipadi proposed a small driver that programmed MSR_IA32_ENERGY_PERF_BIAS, based on the cpufreq governor in use. It also offered a boot-time cmdline option to override. http://lkml.org/lkml/2010/3/4/457 But hiding the hardware policy behind the governor choice was deemed "kinda icky". In June, 2010, I proposed a generic user/kernel API to generalize the power/performance policy trade-off. "RFC: /sys/power/policy_preference" http://lkml.org/lkml/2010/6/16/399 That is my preference for implementing this capability, but I received no support on the list. So in September, 2010, I sent x86_energy_perf_policy.c to LKML, a user-space utility that scribbles directly to the MSR. http://lkml.org/lkml/2010/9/28/246 Here is that same utility, after responding to some review feedback, to live in tools/power/, where it is easily found. Signed-off-by: Len Brown commit 103a8fea9b420d5faef43bb87332a28e2129816a Author: Len Brown Date: Fri Oct 22 23:53:03 2010 -0400 tools: create power/x86/turbostat turbostat is a Linux tool to observe proper operation of Intel(R) Turbo Boost Technology. turbostat displays the actual processor frequency on x86 processors that include APERF and MPERF MSRs. Note that turbostat is of limited utility on Linux kernels 2.6.29 and older, as acpi_cpufreq cleared APERF/MPERF up through that release. On Intel Core i3/i5/i7 (Nehalem) and newer processors, turbostat also displays residency in idle power saving states, which are necessary for diagnosing any cpuidle issues that may have an effect on turbo-mode. See the turbostat.8 man page for example usage. Signed-off-by: Len Brown commit bfc60177f8ab509bc225becbb58f7e53a0e33e81 Author: Christoph Hellwig Date: Fri Jan 7 13:02:23 2011 +0000 xfs: fix error handling for synchronous writes If we get an IO error on a synchronous superblock write, we attach an error release function to it so that when the last reference goes away the release function is called and the buffer is invalidated and unlocked. The buffer is left locked until the release function is called so that other concurrent users of the buffer will be locked out until the buffer error is fully processed. Unfortunately, for the superblock buffer the filesyetm itself holds a reference to the buffer which prevents the reference count from dropping to zero and the release function being called. As a result, once an IO error occurs on a sync write, the buffer will never be unlocked and all future attempts to lock the buffer will hang. To make matters worse, this problems is not unique to such buffers; if there is a concurrent _xfs_buf_find() running, the lookup will grab a reference to the buffer and then wait on the buffer lock, preventing the reference count from ever falling to zero and hence unlocking the buffer. As such, the whole b_relse function implementation is broken because it cannot rely on the buffer reference count falling to zero to unlock the errored buffer. The synchronous write error path is the only path that uses this callback - it is used to ensure that the synchronous waiter gets the buffer error before the error state is cleared from the buffer by the release function. Given that the only sychronous buffer writes now go through xfs_bwrite and the error path in question can only occur for a write of a dirty, logged buffer, we can move most of the b_relse processing to happen inline in xfs_buf_iodone_callbacks, just like a normal I/O completion. In addition to that we make sure the error is not cleared in xfs_buf_iodone_callbacks, so that xfs_bwrite can reliably check it. Given that xfs_bwrite keeps the buffer locked until it has waited for it and checked the error this allows to reliably propagate the error to the caller, and make sure that the buffer is reliably unlocked. Given that xfs_buf_iodone_callbacks was the only instance of the b_relse callback we can remove it entirely. Based on earlier patches by Dave Chinner and Ajeet Yadav. Signed-off-by: Christoph Hellwig Reported-by: Ajeet Yadav Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit a46db60834883c1c8c665d7fcc7b4ab66f5966fc Author: Christoph Hellwig Date: Fri Jan 7 13:02:04 2011 +0000 xfs: add FITRIM support Allow manual discards from userspace using the FITRIM ioctl. This is not intended to be run during normal workloads, as the freepsace btree walks can cause large performance degradation. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit c58efdb442bb49dea1d148f207560c41918c1bf4 Author: Dave Chinner Date: Tue Jan 4 04:49:29 2011 +0000 xfs: ensure log covering transactions are synchronous To ensure the log is covered and the filesystem idles correctly, we need to ensure that dummy transactions hit the disk and do not stay pinned in memory. If the superblock is pinned in memory, it can't be flushed so the log covering cannot make progress. The result is dependent on timing - more oftent han not we continue to issues a log covering transaction every 36s rather than idling after ~90s. Fix this by making the log covering transaction synchronous. To avoid additional log force from xfssyncd, make the log covering transaction take the place of the existing log force in the xfssyncd background sync process. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit d15eda5c6edff4987af6f4423af0bab0c3251e74 Author: Dave Airlie Date: Wed Jan 12 11:39:48 2011 +1000 i915/gtt: fix ordering causing DMAR errors on object teardown. Previous to the last GTT rework we always rewrote the GTT then unmapped the object, somehow this got reversed in the rework in 2.6.37-rc5 timeframe. This fix needs to go to stable in an alternate form since the code changed. This fixes DMAR reports on my Ironlake HP2540p. Signed-off-by: Dave Airlie commit a46f3108b1cd8bf11d46ac8a5f30df6f6dbdf738 Author: Dave Airlie Date: Wed Jan 12 11:38:37 2011 +1000 i915/gtt: fix ordering issues with status setup and DMAR This code was setting up the status page before setting the DMAR-is-on-bit, so we were getting DMAR errors on the status page. Reverse the two bits of init code to the correct result. Signed-off-by: Dave Airlie commit 1bd9ef198498e3e00c9d78a1566338f7ea2e4bb5 Author: Koen Kooi Date: Wed Jan 12 00:23:29 2011 +0000 omap3: beaglexm: fix power on of DVI TFP410 DVI chip is used to provide display out. This chip is controlled by 2 lines: LDO which supplies the power is controlled over gpio + 2 and the enable of the chip itself is done over gpio + 1 NOTE: the LDO is necessary for LED, serial blocks as well. gpio + 1 was used to sense USB overcurrent in vanilla beagle. Without this fix, the display would not function as the LDO remains shut down. [nm@ti.com: split up, added descriptive changelogs] Signed-off-by: Nishanth Menon Signed-off-by: Koen Kooi Signed-off-by: Tony Lindgren commit 559a8cd629f1b797732fd97afd58b41d8b6fb312 Author: Peter Ujfalusi Date: Tue Dec 28 11:16:19 2010 +0200 ASoC: tpa6130a2: Fix compiler warning sound/soc/codecs/tpa6130a2.c: In function 'tpa6130a2_add_controls': sound/soc/codecs/tpa6130a2.c:342: warning: unused variable 'dapm' Introduced by commit 39646871a47fd8808c08de0ce7d7ca8393af2805 ("ASoC: tpa6130a2: Replace DAPM code with direct interface"). The DAPM code has been removed from the driver, but the dapm struct remained. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 784fe39fa80d557847baeca2695915d17b09827f Merge: 4162cf6 6fe4f14 Author: Dave Airlie Date: Wed Jan 12 10:49:03 2011 +1000 Merge branch 'drm-intel-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel * 'drm-intel-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: (37 commits) drm/i915/execbuffer: Reorder binding of objects to favour restrictions drm/i915: If we hit OOM when allocating GTT pages, clear the aperture drm/i915/evict: Ensure we completely cleanup on failure drm/i915/execbuffer: Correctly clear the current object list upon EFAULT drm/i915/debugfs: Show all objects in the gtt drm/i915: Record AGP memory type upon error drm/i915: Periodically flush the active lists and requests drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT drm/i915: Record the error batchbuffer on each ring drm/i915: Include TLB miss overhead for computing WM drm/i915: Propagate error from flushing the ring drm/i915: detect & report PCH display error interrupts drm/i915: cleanup rc6 code drm/i915: fix rc6 enabling around suspend/resume drm/i915: re-enable rc6 support for Ironlake+ drm/i915: Make the ring IMR handling private drm/i915/ringbuffer: Simplify the ring irq refcounting drm/i915/debugfs: Show the per-ring IMR drm/i915: Mask USER interrupts on gen6 (until required) drm/i915: Handle ringbuffer stalls when flushing ... commit 399b82e4930f5f97556c7fd84ea3ef312718adee Author: Peter Ujfalusi Date: Mon Jan 10 15:39:49 2011 +0200 ASoC: tlv320dac33: Add DAPM selection for LOM invert The L/R LOM line can be invertined side of the corresponding DAC, or inverted from the corresponding LOP. Add control for user space to select the source of the LOM inversion. When only the analog bypass is enabled, and the LOM is inverted from DAC output, we need to power the corresponding DAC. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit a710770e05563fd5add9af686569ee9fa56bbd65 Author: David Lambert Date: Thu Jan 6 08:00:37 2011 -0600 ASoC: DMIC codec: Adding a generic DMIC codec This codec is to be used by the DMIC driver to control the DMIC codec. This driver will be used on future implementations of the DMIC driver to support codec specific features. At this time, the codec driver just registers the codec DAI. Signed-off-by: David Lambert Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4162cf64973df51fc885825bc9ca4d055891c49f Merge: fb7b5a9 343a8d1 Author: Linus Torvalds Date: Tue Jan 11 16:32:41 2011 -0800 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: (67 commits) cxgb4vf: recover from failure in cxgb4vf_open() netfilter: ebtables: make broute table work again netfilter: fix race in conntrack between dump_table and destroy ah: reload pointers to skb data after calling skb_cow_data() ah: update maximum truncated ICV length xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC ehea: Increase the skb array usage net/fec: remove config FEC2 as it's used nowhere pcnet_cs: add new_id tcp: disallow bind() to reuse addr/port net/r8169: Update the function of parsing firmware net: ppp: use {get,put}_unaligned_be{16,32} CAIF: Fix IPv6 support in receive path for GPRS/3G arp: allow to invalidate specific ARP entries net_sched: factorize qdisc stats handling mlx4: Call alloc_etherdev to allocate RX and TX queues net: Add alloc_netdev_mqs function caif: don't set connection request param size before copying data cxgb4vf: fix mailbox data/control coherency domain race qlcnic: change module parameter permissions ... commit fb7b5a956992fdc53d0b9c8ea29b51b92839dc1b Merge: 5a62f99 5edddaa Author: Linus Torvalds Date: Tue Jan 11 16:32:20 2011 -0800 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: sparc64: Fix bootup regression due to perf init ordering. commit 5a62f995446be44811fefa48f91f9efb7ea172d7 Merge: f1d6d6c 5d7d807 Author: Linus Torvalds Date: Tue Jan 11 16:31:41 2011 -0800 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: (72 commits) powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA powerpc/pseries: Fix VPHN build errors on non-SMP systems powerpc/83xx: add mpc8308_p1m DMA controller device-tree node powerpc/83xx: add DMA controller to mpc8308 device-tree node powerpc/512x: try to free dma descriptors in case of allocation failure powerpc/512x: add MPC8308 dma support powerpc/512x: fix the hanged dma transfer issue powerpc/512x: scatter/gather dma fix powerpc/powermac: Make auto-loading of therm_pm72 possible of/address: Use propper endianess in get_flags powerpc/pci: Use printf extension %pR for struct resource powerpc: Remove unnecessary casts of void ptr powerpc: Disable VPHN polling during a suspend operation powerpc/pseries: Poll VPA for topology changes and update NUMA maps powerpc: iommu: Add device name to iommu error printks powerpc: Record vma->phys_addr in ioremap() powerpc: Update compat_arch_ptrace powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S powerpc/time: printk time stamp init not correct powerpc: Minor cleanups for machdep.h ... commit f1d6d6cd9029daa7e7d4a0b14347b5392320f22a Merge: b9d919a 2b76c05 Author: Linus Torvalds Date: Tue Jan 11 16:30:08 2011 -0800 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: (42 commits) IB/qib: Fix refcount leak in lkey/rkey validation IB/qib: Improve SERDES tunning on QMH boards IB/qib: Unnecessary delayed completions on RC connection IB/qib: Issue pre-emptive NAKs on eager buffer overflow IB/qib: RDMA lkey/rkey validation is inefficient for large MRs IB/qib: Change QPN increment IB/qib: Add fix missing from earlier patch IB/qib: Change receive queue/QPN selection IB/qib: Fix interrupt mitigation IB/qib: Avoid duplicate writes to the rcv head register IB/qib: Add a few new SERDES tunings IB/qib: Reset packet list after freeing IB/qib: New SERDES init routine and improvements to SI quality IB/qib: Clear WAIT_SEND flags when setting QP to error state IB/qib: Fix context allocation with multiple HCAs IB/qib: Fix multi-Florida HCA host panic on reboot IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better IB/qib: UD send with immediate receive completion has wrong size IB/qib: Set port physical state even if other fields are invalid IB/qib: Generate completion callback on errors ... commit 5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9 Author: Benjamin Herrenschmidt Date: Wed Jan 12 10:56:29 2011 +1100 powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA Signed-off-by: Benjamin Herrenschmidt commit 343a8d13aae58dec562dbb5c7d48a53e9b847871 Author: Casey Leedom Date: Tue Jan 11 15:44:40 2011 -0800 cxgb4vf: recover from failure in cxgb4vf_open() If the Link Start fails in cxgb4vf_open(), we need to back out any state that we've built up ... Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit 60dbb011df9764294284cc3e70f935eaa462e15e Merge: 4b0ef1f 2f46e07 Author: David S. Miller Date: Tue Jan 11 15:43:03 2011 -0800 Merge branch 'master' of git://1984.lsi.us.es/net-2.6 commit 0f7e2aaa03ea3f2393d3446c686036ce51298d3e Author: Enric Balletbo i Serra Date: Tue Jan 11 15:47:54 2011 +0000 omap3: igep3: Add omap_reserve functionality This patch adds omap_reserve functionality to board-igep0030.c. This patch is in similar lines to commit id 71ee7dad9b6991, from Russell king Cc: Russell King Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit f8362d215549c66066f78e67c033dd370ae50322 Author: Koen Kooi Date: Tue Jan 11 17:13:36 2011 +0000 omap3: beaglexm: fix DVI reset GPIO GPIO reset line for Beagle XM is different from vanilla beagle so we populate it as part of gpio update routine. This in part fixes the issue of display not functioning on beagle XM platform. [nm@ti.com: split up, added descriptive changelogs] Signed-off-by: Nishanth Menon Signed-off-by: Koen Kooi Signed-off-by: Tony Lindgren commit 68fc3e152c9f99323e2a4917967725aec5281b32 Author: Koen Kooi Date: Tue Jan 11 17:13:35 2011 +0000 omap3: beaglexm: fix EHCI power up GPIO dir EHCI enable power pin is inverted (active high) in comparison to vanilla beagle which is active low. Handle this case conditionally. Without this fix, Beagle XM 4 port EHCI will not function and no networking will be available [nm@ti.com: split up, added descriptive changelogs] Signed-off-by: Nishanth Menon Signed-off-by: Koen Kooi Signed-off-by: Tony Lindgren commit b9d919a4ac6cf031b8e065f82ad8f1b0c9ed74b1 Merge: 7c955fc 357f54d Author: Linus Torvalds Date: Tue Jan 11 15:11:56 2011 -0800 Merge branch 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.38' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (89 commits) NFS fix the setting of exchange id flag NFS: Don't use vm_map_ram() in readdir NFSv4: Ensure continued open and lockowner name uniqueness NFS: Move cl_delegations to the nfs_server struct NFS: Introduce nfs_detach_delegations() NFS: Move cl_state_owners and related fields to the nfs_server struct NFS: Allow walking nfs_client.cl_superblocks list outside client.c pnfs: layout roc code pnfs: update nfs4_callback_recallany to handle layouts pnfs: add CB_LAYOUTRECALL handling pnfs: CB_LAYOUTRECALL xdr code pnfs: change lo refcounting to atomic_t pnfs: check that partial LAYOUTGET return is ignored pnfs: add layout to client list before sending rpc pnfs: serialize LAYOUTGET(openstateid) pnfs: layoutget rpc code cleanup pnfs: change how lsegs are removed from layout list pnfs: change layout state seqlock to a spinlock pnfs: add prefix to struct pnfs_layout_hdr fields pnfs: add prefix to struct pnfs_layout_segment fields ... commit 2f46e07995734a363608e974a82fd05d5b610750 Author: Florian Westphal Date: Tue Jan 11 23:55:51 2011 +0100 netfilter: ebtables: make broute table work again broute table init hook sets up the "br_should_route_hook" pointer, which then gets called from br_input. commit a386f99025f13b32502fe5dedf223c20d7283826 (bridge: add proper RCU annotation to should_route_hook) introduced a typedef, and then changed this to: br_should_route_hook_t *rhook; [..] rhook = rcu_dereference(br_should_route_hook); if (*rhook(skb)) problem is that "br_should_route_hook" contains the address of the function, so calling *rhook() results in kernel panic. Signed-off-by: Florian Westphal Acked-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso commit 6fe4f14044f181e146cdc15485428f95fa541ce8 Author: Chris Wilson Date: Mon Jan 10 17:35:37 2011 +0000 drm/i915/execbuffer: Reorder binding of objects to favour restrictions As the mappable portion of the aperture is always a small subset at the start of the GTT, it is allocated preferentially by drm_mm. This is useful in case we ever need to map an object later. However, if you have a large object that can consume the entire mappable region of the GTT this prevents the batchbuffer from fitting and so causing an error. Instead allocate all those that require a mapping up front in order to improve the likelihood of finding sufficient space to bind them. Signed-off-by: Chris Wilson commit 809b63349ce6eb6603e7dab482c642f28135a2db Author: Chris Wilson Date: Mon Jan 10 17:33:15 2011 +0000 drm/i915: If we hit OOM when allocating GTT pages, clear the aperture Rather than evicting an object at random, which is unlikely to alleviate the memory pressure sufficient to allow us to continue, zap the entire aperture. That should give the system long enough to recover and reap some pages from the evicted objects, forestalling the allocation error for the new object. Signed-off-by: Chris Wilson commit 092de6f225638ec300936bfcbdc67805733cc78c Author: Chris Wilson Date: Mon Jan 10 14:21:05 2011 +0000 drm/i915/evict: Ensure we completely cleanup on failure ... and not leave the objects in a inconsistent state. Signed-off-by: Chris Wilson Cc: stable@kernel.org commit 36cf17423095882ec0f8f2c04d1bd0ee812149df Author: Chris Wilson Date: Mon Jan 10 12:09:12 2011 +0000 drm/i915/execbuffer: Correctly clear the current object list upon EFAULT Before releasing the lock in order to copy the relocation list from user pages, we need to drop all the object references as another thread may usurp and execute another batchbuffer before we reacquire the lock. However, the code was buggy and failed to clear the list... Signed-off-by: Chris Wilson Cc: stable@kernel.org commit 13ee6ac579574a2a95e982b19920fd2495dce8cd Author: Stephen Hemminger Date: Tue Jan 11 23:54:42 2011 +0100 netfilter: fix race in conntrack between dump_table and destroy The netlink interface to dump the connection tracking table has a race when entries are deleted at the same time. A customer reported a crash and the backtrace showed thatctnetlink_dump_table was running while a conntrack entry was being destroyed. (see https://bugzilla.vyatta.com/show_bug.cgi?id=6402). According to RCU documentation, when using hlist_nulls the reader must handle the case of seeing a deleted entry and not proceed further down the linked list. The old code would continue which caused the scan to walk into the free list. This patch uses locking (rather than RCU) for this operation which is guaranteed safe, and no longer requires getting reference while doing dump operation. Signed-off-by: Stephen Hemminger Signed-off-by: Pablo Neira Ayuso commit 7c955fca3e1d8132982148267d9efcafae849bb6 Merge: e9688f6 a4264b3 Author: Linus Torvalds Date: Tue Jan 11 14:45:52 2011 -0800 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: Close small mem leak in udf_find_entry() udf: Fix directory corruption after extent merging udf: Protect udf_file_aio_write from possible races udf: Remove unnecessary bkl usages udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct udf: Remove BKL from free space counting functions udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks() udf: Remove BKL from udf_put_super() and udf_remount_fs() udf: Protect default inode credentials by rwlock udf: Protect all modifications of LVID with s_alloc_mutex udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex udf: Remove BKL from udf_update_inode udf: Convert UDF_SB(sb)->s_flags to use bitops fs/udf: Add printf format/argument verification fs/udf: Use vzalloc (Evil merge: this also removes the BKL dependency from the Kconfig file) commit e9688f6acad8cb1f2e8d7abb2de06a6a5c9cbcf2 Merge: 40c73ab 0f0a25b Author: Linus Torvalds Date: Tue Jan 11 14:37:31 2011 -0800 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: (44 commits) ext4: fix trimming starting with block 0 with small blocksize ext4: revert buggy trim overflow patch ext4: don't pass entire map to check_eofblocks_fl ext4: fix memory leak in ext4_free_branches ext4: remove ext4_mb_return_to_preallocation() ext4: flush the i_completed_io_list during ext4_truncate ext4: add error checking to calls to ext4_handle_dirty_metadata() ext4: fix trimming of a single group ext4: fix uninitialized variable in ext4_register_li_request ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary ext4: drop i_state_flags on architectures with 64-bit longs ext4: reorder ext4_inode_info structure elements to remove unneeded padding ext4: drop ec_type from the ext4_ext_cache structure ext4: use ext4_lblk_t instead of sector_t for logical blocks ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED ext4: fix 32bit overflow in ext4_ext_find_goal() ext4: add more error checks to ext4_mkdir() ext4: ext4_ext_migrate should use NULL not 0 ext4: Use ext4_error_file() to print the pathname to the corrupted inode ext4: use IS_ERR() to check for errors in ext4_error_file ... commit 40c73abbb37e399eba274fe49e520ffa3dd65bdb Merge: 0945f35 d96336b Author: Linus Torvalds Date: Tue Jan 11 14:36:55 2011 -0800 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: ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG ext3: Remove redundant unlikely() ext2: Remove redundant unlikely() ext3: speed up file creates by optimizing rec_len functions ext2: speed up file creates by optimizing rec_len functions ext3: Add more journal error check ext3: Add journal error check in resize.c quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout ext3: Add FITRIM handling ext3: Add batched discard support for ext3 ext3: Add journal error check into ext3_rename() ext3: Use search_dirblock() in ext3_dx_find_entry() ext3: Avoid uninitialized memory references with a corrupted htree directory ext3: Return error code from generic_check_addressable ext3: Add journal error check into ext3_delete_entry() ext3: Add error check in ext3_mkdir() fs/ext3/super.c: Use printf extension %pV fs/ext2/super.c: Use printf extension %pV ext3: don't update sb journal_devnum when RO dev commit 0945f352ce1520765296fc2b07e50055c847d39d Merge: 7bc4a4c b8b80cf Author: Linus Torvalds Date: Tue Jan 11 14:36:08 2011 -0800 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: fs/9p: Don't set dentry->d_op in create routines fs/9p: fix spelling typo fs/9p: TREADLINK bugfix net/9p: Use proper data types fs/9p: Simplify the .L create operation fs/9p: Move dotl inode operations into a seperate file fs/9p: fix menu presentation fs/9p: Fix the return error on default acl removal fs/9p: Remove unnecessary semicolons commit 08c18323547ce6d70eab3b37eca894baf114ad85 Author: Chris Wilson Date: Mon Jan 10 00:00:24 2011 +0000 drm/i915/debugfs: Show all objects in the gtt Useful for determining the layout. Signed-off-by: Chris Wilson commit a779e5abda0367aa9d53c0931d9687743afe503d Author: Chris Wilson Date: Sun Jan 9 21:07:49 2011 +0000 drm/i915: Record AGP memory type upon error Signed-off-by: Chris Wilson commit 0a58705b2fc3fa29525cf2fdae3d4276a5771280 Author: Chris Wilson Date: Sun Jan 9 21:05:44 2011 +0000 drm/i915: Periodically flush the active lists and requests In order to retire active buffers whilst no client is active, we need to insert our own flush requests onto the ring. This is useful for servers that queue up some rendering and then go to sleep as it allows us to the complete processing of those requests, potentially making that memory available again much earlier. Signed-off-by: Chris Wilson commit bf572541ab44240163eaa2d486b06f306a31d45a Author: NeilBrown Date: Wed Jan 12 09:03:35 2011 +1100 md: fix regression with re-adding devices to arrays with no metadata Commit 1a855a0606 (2.6.37-rc4) fixed a problem where devices were re-added when they shouldn't be but caused a regression in a less common case that means sometimes devices cannot be re-added when they should be. In particular, when re-adding a device to an array without metadata we should always access the device, but after the above commit we didn't. This patch sets the In_sync flag in that case so that the re-add succeeds. This patch is suitable for any -stable kernel to which 1a855a0606 was applied. Cc: stable@kernel.org Signed-off-by: NeilBrown commit 4b0ef1f223be4e092632b4152ceec5627ac10f59 Author: Dang Hongwu Date: Tue Jan 11 07:13:33 2011 +0000 ah: reload pointers to skb data after calling skb_cow_data() skb_cow_data() may allocate a new data buffer, so pointers on skb should be set after this function. Bug was introduced by commit dff3bb06 ("ah4: convert to ahash") and 8631e9bd ("ah6: convert to ahash"). Signed-off-by: Wang Xuefu Acked-by: Krzysztof Witek Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit e44f391187495e0deaf7b9f0077e94f270837d1a Author: Nicolas Dichtel Date: Tue Jan 11 08:06:19 2011 +0000 ah: update maximum truncated ICV length For SHA256, RFC4868 requires to truncate ICV length to 128 bits, hence MAX_AH_AUTH_LEN should be updated to 16. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit fa6dd8a2c89861d05621ce7e2880e485bec22fba Author: Nicolas Dichtel Date: Tue Jan 11 08:04:12 2011 +0000 xfrm: check trunc_len in XFRMA_ALG_AUTH_TRUNC Maximum trunc length is defined by MAX_AH_AUTH_LEN (in bytes) and need to be checked when this value is set (in bits) by the user. In ah4.c and ah6.c a BUG_ON() checks this condiftion. Signed-off-by: Nicolas Dichtel Signed-off-by: David S. Miller commit f76957fc8fc4fa9735f01e59653b2792b077de06 Author: Breno Leitao Date: Tue Jan 11 07:45:57 2011 +0000 ehea: Increase the skb array usage Currently the skb array is not fully allocated, and the allocation is done as it's requested, which is not the expected way. This patch just allocate the full skb array at driver initialization. Also, this patch increases ehea version to 107. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit b5074087add883d015827e3792e4e388cc2d40c3 Author: Shawn Guo Date: Tue Jan 11 02:07:52 2011 +0000 net/fec: remove config FEC2 as it's used nowhere Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit 0c302f57aba3ed638d71b66767e145ea5c14a353 Author: Ken Kawasaki Date: Tue Jan 11 01:55:58 2011 +0000 pcnet_cs: add new_id pcnet_cs: add another ID of "corega Ether CF-TD" 10Base-T PCMCIA card. Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit c191a836a908d1dd6b40c503741f91b914de3348 Author: Eric Dumazet Date: Tue Jan 11 01:14:22 2011 +0000 tcp: disallow bind() to reuse addr/port inet_csk_bind_conflict() logic currently disallows a bind() if it finds a friend socket (a socket bound on same address/port) satisfying a set of conditions : 1) Current (to be bound) socket doesnt have sk_reuse set OR 2) other socket doesnt have sk_reuse set OR 3) other socket is in LISTEN state We should add the CLOSE state in the 3) condition, in order to avoid two REUSEADDR sockets in CLOSE state with same local address/port, since this can deny further operations. Note : a prior patch tried to address the problem in a different (and buggy) way. (commit fda48a0d7a8412ced tcp: bind() fix when many ports are bound). Reported-by: Gaspar Chilingarov Reported-by: Daniel Baluta Tested-by: Daniel Baluta Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d9126400580e2caada85fa68799952956a6062fd Author: Chris Wilson Date: Tue Jan 11 11:07:54 2011 +0000 drm/i915/gtt: Unmap the PCI pages after unbinding them from the GTT Dave Airlie spotted that his ILK laptop with DMAR enabled was generating the occasional DMAR warning. "The ordering in the previous code was to rewrite the GTT table before unmapping the pages and that makes sense to me." This is his stable patch ported to d-i-n. Reported-by: Dave Airlie Original-patch-by: Dave Airlie Signed-off-by: Chris Wilson commit bcfb2e285827bf0cfea8bbfad18a4fca57fbabae Author: Chris Wilson Date: Fri Jan 7 21:06:07 2011 +0000 drm/i915: Record the error batchbuffer on each ring Signed-off-by: Chris Wilson commit db66e37d239b45f36a3f6495cf4ec49391b2c089 Author: Chris Wilson Date: Sat Jan 8 09:02:21 2011 +0000 drm/i915: Include TLB miss overhead for computing WM The docs recommend that if 8 display lines fit inside the FIFO buffer, then the number of watermark entries should be increased to hide the latency of filling the rest of the FIFO buffer. Signed-off-by: Chris Wilson commit 882417851a0f2e09e110038a13e88e9b5a100800 Author: Chris Wilson Date: Fri Jan 7 17:09:48 2011 +0000 drm/i915: Propagate error from flushing the ring ... in order to avoid a BUG() and potential unbounded waits. Signed-off-by: Chris Wilson commit 776ad8062bb77697b8728a9794e3a394b28cf885 Author: Jesse Barnes Date: Tue Jan 4 15:09:39 2011 -0800 drm/i915: detect & report PCH display error interrupts FDI and the transcoders can fail for various reasons, so detect those conditions and report on them. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit d5bb081b027b520f9e59b4fb8faea83a136ec15e Author: Jesse Barnes Date: Wed Jan 5 12:01:26 2011 -0800 drm/i915: cleanup rc6 code Cleanup several aspects of the rc6 code: - misnamed intel_disable_clock_gating function (was only about rc6) - remove commented call to intel_disable_clock_gating - rc6 enabling code belongs in its own function (allows us to move the actual clock gating enable call back into restore_state) - allocate power & render contexts up front, only free on unload (avoids ugly lazy init at rc6 enable time) Signed-off-by: Jesse Barnes [ickle: checkpatch cleanup] Signed-off-by: Chris Wilson commit 1daed3fb8324d517a1f9da43f1a1d3619d1b0ddc Author: Jesse Barnes Date: Wed Jan 5 12:01:25 2011 -0800 drm/i915: fix rc6 enabling around suspend/resume Enabling RC6 implies setting a graphics context. Make sure we do that only after the ring has been enabled, otherwise our ring commands will hang. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 88271da3f3da75d6eaef5e768c82a1627edf7088 Author: Jesse Barnes Date: Wed Jan 5 12:01:24 2011 -0800 drm/i915: re-enable rc6 support for Ironlake+ Re-enable rc6 support on Ironlake for power savings. Adds a debugfs file to check current RC state, adds a missing workaround for Ironlake MI_SET_CONTEXT instructions, and renames MCHBAR_RENDER_STANDBY to RSTDBYCTL to match the docs. Keep RC6 and the power context disabled on pre-ILK. It only seems to hang and doesn't save any power. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 0dc79fb2a36efcadbb39bd8b28933d8aa40408b1 Author: Chris Wilson Date: Wed Jan 5 10:32:24 2011 +0000 drm/i915: Make the ring IMR handling private As the IMR for the USER interrupts are not modified elsewhere, we can separate the spinlock used for these from that of hpd and pipestats. Those two IMR are manipulated under an IRQ and so need heavier locking. Reported-and-tested-by: Alexey Fisher Signed-off-by: Chris Wilson commit 01a03331e5fe91861937f8b8e72c259f5e9eae67 Author: Chris Wilson Date: Tue Jan 4 22:22:56 2011 +0000 drm/i915/ringbuffer: Simplify the ring irq refcounting ... and move it under the spinlock to gain the appropriate memory barriers. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32752 Signed-off-by: Chris Wilson commit 9862e600cef87de0e301bad7d1435b87e03ea84d Author: Chris Wilson Date: Tue Jan 4 22:22:17 2011 +0000 drm/i915/debugfs: Show the per-ring IMR Signed-off-by: Chris Wilson commit 0f46832fab779a9a3314ce5e833155fe4cf18f6c Author: Chris Wilson Date: Tue Jan 4 17:35:21 2011 +0000 drm/i915: Mask USER interrupts on gen6 (until required) Otherwise we may consume 20% of the CPU just handling IRQs whilst rendering. Ouch. Signed-off-by: Chris Wilson commit b72f3acb71646de073abdc070fe1108866c96634 Author: Chris Wilson Date: Tue Jan 4 17:34:02 2011 +0000 drm/i915: Handle ringbuffer stalls when flushing Signed-off-by: Chris Wilson commit 63256ec5347fb2344a42adbae732b90603c92f35 Author: Chris Wilson Date: Tue Jan 4 18:42:07 2011 +0000 drm/i915: Enforce write ordering through the GTT We need to ensure that writes through the GTT land before any modification to the MMIO registers and so must impose a mandatory write barrier when flushing the GTT domain. This was revealed by relaxing the write ordering by experimentally mapping the registers and the GATT as write-combining. Signed-off-by: Chris Wilson commit 759010728b1323aec03c5baae13fde8f76e44a99 Author: Chris Wilson Date: Mon Jan 3 16:39:21 2011 +0000 drm/i915: Remove impossible test As has_gem is unconditionally set to true, the conditional immediately following that assignment is superfluous. Signed-off-by: Chris Wilson commit dbdc647927a0f4b34e7cf486889d8f671f73d2e5 Author: Jesse Barnes Date: Thu Dec 30 09:36:39 2010 -0800 drm/i915: avoid reading non-existent PLL reg on Ironlake+ These functions need to be reworked for Ironlake and above, but until then at least avoid reading non-existent registers. Signed-off-by: Jesse Barnes [ickle: combine with a gratuitous tidy] Signed-off-by: Chris Wilson commit d78cb50baa9177353d6719612b83558a9bf2d59b Author: Chris Wilson Date: Thu Dec 23 13:33:15 2010 +0000 drm/i915: add 'reset' parameter When bringing up new hardware, or otherwise experimenting, GPU hangs are a way of life. However, the automatic GPU reset can do more harm than good under these circumstances, as we may wish to capture a full trace for debugging. Based on a patch by Zhenyu Wang. Signed-off-by: Chris Wilson commit a0fa62d3b6afaa260cad8ccd6944e81ad01c7cf3 Author: Yuanhan Liu Date: Thu Dec 23 16:35:40 2010 +0800 drm/i915: fix the wrong latency value while computing wm0 On Ironlake, the LP0 latency is hardcoded and in ns unit, while on Sandybridge, it comes from a register and with unit 0.1 us. So, fix the wrong latency value while computing wm0 on Ironlake and Sandybridge. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson commit b79d4990226defc3789f9ba492b27e9e56790857 Author: Jesse Barnes Date: Tue Dec 21 13:10:23 2010 -0800 drm/i915: support low power watermarks on Ironlake This patch actually makes the watermark code even uglier (if that's possible), but has the advantage of sharing code between SNB and ILK at least. Longer term we should refactor the watermark stuff into its own file and clean it up now that we know how it's supposed to work. Supporting WM2 on my Vaio reduced power consumption by around 0.5W, so this patch is definitely worthwhile (though it also needs lots of test coverage). Signed-off-by: Jesse Barnes [ickle: pass the watermark structs arounds] Signed-off-by: Chris Wilson commit c97689d8860f086125e7ff9cd730027a0057ca4f Author: Chris Wilson Date: Thu Dec 23 10:40:38 2010 +0000 agp/intel: Flush the chipset write buffers when changing GTT base Flush the chipset write buffers before and after adjusting the GTT base register, just in case. We only modify this value upon initialisation (boot and resume) so there should be no outstanding writes, however there are always those persistent PGTBL_ER that keep getting reported upon resume. Signed-off-by: Chris Wilson commit 55249baaa5cd188ebd9acdb047eeaed8092e4a93 Author: Chris Wilson Date: Wed Dec 22 14:04:47 2010 +0000 drm/i915: Workaround erratum on i830 for TAIL pointer within last 2 cachelines On i830 if the tail pointer is set to within 2 cachelines of the end of the buffer, the chip may hang. So instead if the tail were to land in that location, we pad the end of the buffer with NOPs, and start again at the beginning. Signed-off-by: Chris Wilson commit 35c3047ad15849335242b847c94f180ef45db490 Author: Chris Wilson Date: Wed Dec 22 14:07:12 2010 +0000 drm/i915: Use the mappable sizes determined by GTT for consistency. There should be no difference, but we can eliminate redundant code. Signed-off-by: Chris Wilson commit a6044e23b784544fe567db75dbf9c4f684bd6d5b Author: Jesse Barnes Date: Mon Dec 20 11:34:20 2010 -0800 drm/i915: support overclocking on Sandy Bridge In some configuration, the PCU may allow us to overclock the GPU. Check for this case and adjust the max frequency as appropriate. Also initialize the min/max frequencies to default values as indicated by hardware. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit bee17e5ae6b68d21b9d193f34ccefeef9d4fffe0 Author: Chris Wilson Date: Tue Jan 11 18:09:58 2011 +0000 drm/i915/lvds: Always use 0 to disable the pfit controller ... and just any combination of bits & ~PFIT_ENABLE. This way we do not attempt disable to the panel fitter controller uselessly upon intel_lvds_disable(). Signed-off-by: Chris Wilson commit 47356eb67285014527a5ab87543ba1fae3d1e10a Author: Chris Wilson Date: Tue Jan 11 17:06:04 2011 +0000 drm/i915/panel: Only record the backlight level when it is enabled By tracking the current status of the backlight we can prevent recording the value of the current backlight when we have disabled it. And so prevent restoring it to 'off' after an unbalanced sequence of intel_lvds_disable/enable. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=22672 Tested-by: Alex Riesen Tested-by: Larry Finger Signed-off-by: Chris Wilson Cc: stable@kernel.org commit 2d93666e70662cfcf1927e1a858685f5b38d5d65 Author: Benjamin Tissoires Date: Tue Jan 11 16:45:54 2011 +0100 HID: hid-multitouch: minor fixes based on additional review * amended Kconfig (PixCir and Hanvon are the same panel but with different name) * insert field name in mt_class and retrieving it in mt_probe * add 2 quirks: MT_QUIRK_VALID_IS_INRANGE, MT_QUIRK_VALID_IS_CONFIDENCE, in order to find the field "valid" * inlined slot_is_contactid and slot_is_contact_number * cosmetics changes (tabs and comments) * do not send unnecessary properties once the touch is up Signed-off-by: Benjamin Tissoires Acked-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit 97aaf910731b03b27b1c4c8a58006a1dc99dcd9a Author: Chris Wilson Date: Tue Jan 4 20:10:52 2011 +0000 drm/i915/sdvo: Defer detection of output capabilities until probing Alex Fiestas reported an issue with his HDMI connector being misdetected as DVI unless he had something connected upon boot. By moving the decision as to whether to use HDMI or DVI encoding for the HDMI capable output until we probe the monitor means that we should avoid sending a HDMI signal to a DVI monitor and also correctly detect hardware like Alex's. However, to really determine what connector is soldered onto the wire we need to inspect the VBT sdvo child devices - but can we trust it? Reported-by: Alex Fiestas Tested-by: Alex Fiestas Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32828 Signed-off-by: Chris Wilson Cc: stable@kernel.org commit c64f6f934c7490faff76faf96217066a1b3570a0 Author: Benjamin Tissoires Date: Sat Jan 8 12:15:42 2011 +0100 HID: Switch turbox/mosart touchscreen to hid-mosart This device used the MULTI_INPUT quirk whereas it could be used with hid-mosart instead to support the multitouch part. Reference: https://bugs.launchpad.net/ubuntu/+bug/620609/ Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit bc5ab083a68bfec212780281f8e57d871d8882a0 Author: Benjamin Tissoires Date: Sat Jan 8 12:15:41 2011 +0100 HID: add Add Cando touch screen 10.1-inch product id This device has been reported to be an hid-cando one. Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit 5572da08a784621f2ab4fdc8dc65471261871795 Author: Benjamin Tissoires Date: Fri Jan 7 23:47:27 2011 +0100 HID: hid-mulitouch: add support for the 'Sensing Win7-TwoFinger' Added support for the 'Sensing Win7-TwoFinger' panel by GeneralTouch found on some tablets. Because of conflicting VID/PID, this conflicts with previous support for some single-touch panels by GeneralTouch Signed-off-by: Benjamin Tissoires Signed-off-by: Stéphane Chatty Signed-off-by: Jiri Kosina commit 3c5a62b5226ca5db993660281e9c2a7275d9fb02 Author: Yuanhan Liu Date: Thu Jan 6 18:26:08 2011 +0800 drm/i915: fix calculation of eDP signal levels on Sandybridge Some voltage swing/pre-emphasis level use the same value on eDP Sandybridge, like 400mv_0db and 600mv_0db are with the same value of (0x0 << 22). So, fix them, and point out the value if it isn't a supported voltage swing/pre-emphasis level. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson Cc: stable@kernel.org commit a3b5e577d96bfccbc41ebf4df784e3a153072273 Author: Benjamin Tissoires Date: Fri Jan 7 23:46:30 2011 +0100 HID: hid-multitouch: add support for Cypress TrueTouch panels Added support for Cypress TrueTouch panels, which detect up to 10 fingers Signed-off-by: Benjamin Tissoires Signed-off-by: Stéphane Chatty Signed-off-by: Jiri Kosina commit 5519cab477b61326963c8d523520db0342862b63 Author: Benjamin Tissoires Date: Fri Jan 7 23:45:50 2011 +0100 HID: hid-multitouch: support for PixCir-based panels Created a driver for PixCir based dual-touch panels, including the one in the Hanvon tablet. This is done in a code structure aimed at unifying support for several existing HID multitouch panels. Signed-off-by: Benjamin Tissoires Signed-off-by: Stéphane Chatty Signed-off-by: Jiri Kosina commit 281054ac8dfc083442c571be44f1c5b9821812ae Author: Benjamin Tissoires Date: Fri Jan 7 23:45:11 2011 +0100 HID: set HID_MAX_FIELD at 128 Stantums multitouch panels sends more than 64 reports and this results in not being able to handle all the touches given by this device. This patch is required to be able to include Stantum panels in the unified hid-multitouch driver. Signed-off-by: Benjamin Tissoires Acked-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit 0d2689c0f054f6a8bf3115d6386bd9c2d65dc44b Author: Benjamin Tissoires Date: Fri Jan 7 23:44:32 2011 +0100 HID: add feature_mapping callback Currently hid doesn't export the features it knows to the specific modules. Some information can be really important in such features: MosArt and Cypress devices are by default not in a multitouch mode. We have to send the value 2 on the right feature. This patch exports to the module the features report so they can find the right feature to set up the correct mode. Signed-off-by: Benjamin Tissoires Acked-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit f5afcd3dd0dca7fe869311c51da54d5a889191ba Author: David Müller Date: Thu Jan 6 12:29:32 2011 +0000 drm/i915/crt: Check for a analog monitor in case of DVI-I Since Linux 2.6.36 the digital output on my system (855GME + DVI-I) is not working any longer. The analog output is always activated regardless of the type of monitor attached. The culprit seems to be intel_crt_detect_ddc(), which returns true as soon as an ACK from the EDID device is received. Obviously this approach does not work with DVI-I where the analog and digital outputs share a common DDC bus. In a similar manner to the shared DDC wire, ala the "Mac Mini Hack", we need an additional check to make sure that there really is an analog device attached to the DDC. Signed-off-by: David Müller Signed-off-by: Chris Wilson Cc: stable@kernel.org commit 37f809755845cc3e18e8216c04525bdb885fa13b Author: Jesse Barnes Date: Wed Jan 5 14:45:24 2011 -0800 drm/i915: make DP training try a little harder When trying to do channel equalization, we need to make sure we still have clock recovery on all lanes while training. We also need to try clock recovery again if we lose the clock or if channel eq fails 5 times. We'll try clock recovery up to 5 more times before giving up entirely. Gets suspend/resume working on my Vaio again and brings us back into compliance with the DP training sequence spec. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 858bc21f0637c407601a05626854ae58b242f75d Author: Jesse Barnes Date: Tue Jan 4 10:46:49 2011 -0800 drm/i915: check eDP encoder correctly when setting modes We were using a stale pointer in the check which caused us to use CPU attached DP params when we should have been using PCH attached params. Signed-off-by: Jesse Barnes Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31988 Tested-by: Jan-Hendrik Zab Tested-by: Christoph Lukas Signed-off-by: Chris Wilson Cc: stable@kernel.org commit cc8e7a355c1ec64b06a5b8126c47c5cb47f44fce Author: Rafael J. Wysocki Date: Mon Jan 10 21:23:16 2011 +0100 PNP / ACPI: Use DEVICE_ACPI_HANDLE() for device ACPI handle access The PNP ACPI driver squirrels the ACPI handles of PNP devices' ACPI companions, but this isn't correct, because those handles should be accessed using the DEVICE_ACPI_HANDLE() macro operating on struct device objects. Using DEVICE_ACPI_HANDLE() in the PNP ACPI driver instead of the driver's own copies of the ACPI handles allows us to avoid a problem with docking stations where a machine docked before suspend to RAM and undocked while suspended crashes during the subsequent resume (in that case the ACPI companion of the PNP device in question doesn't exist any more while the device is being resumed). It also allows us to avoid the problem where suspend to RAM fails when the machine was undocked while suspended before (again, the ACPI companion of the PNP device is not present any more while it is being suspended). This change doesn't fix all of the the PNP ACPI driver's problems with PNP devices in docking stations (generally speaking, the driver has no idea that devices can come and go and doesn't even attempt to handle such events), but at least it makes suspend work for the users of docking stations who don't use the PNP devices located in there. References: https://bugzilla.kernel.org/show_bug.cgi?id=15100 Reported-and-tested-by: Toralf Förster Signed-off-by: Rafael J. Wysocki Acked-by: Bjorn Helgaas Signed-off-by: Len Brown commit 0f0a25bf516843adae479636dc1cf75fd0bd003c Author: Jan Kara Date: Tue Jan 11 15:16:31 2011 -0500 ext4: fix trimming starting with block 0 with small blocksize When s_first_data_block is not zero (which happens e.g. when block size is 1KB) and trim ioctl is called to start trimming from block 0, the math in ext4_get_group_no_and_offset() overflows. The overall result is that ioctl returns EINVAL which is kind of unexpected and we probably don't want userspace tools to bother with internal details of filesystem structure. So just silently increase starting offset (and shorten length) when starting block is below s_first_data_block. CC: Lukas Czerner Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit e1b478e4ec4477520767d1a920433626263a2a6b Author: Konrad Rzeszutek Wilk Date: Tue Jan 11 15:09:16 2011 -0500 xen/p2m: Fix module linking error. Fixes: ERROR: "m2p_find_override_pfn" [drivers/block/xen-blkfront.ko] undefined! Signed-off-by: Konrad Rzeszutek Wilk commit 5ce8ba25d657a71d6d8cdb05a2b90c5ae7debfda Author: J. Bruce Fields Date: Mon Jan 10 16:44:41 2011 -0500 nfsd4: allow restarting callbacks If we lose the backchannel and then the client repairs the problem, resend any callbacks. We use a new cb_done flag to track whether there is still work to be done for the callback or whether it can be destroyed with the rpc. Signed-off-by: J. Bruce Fields commit 3ff3600e7eab16301e824293e8f49b9990bd4641 Author: J. Bruce Fields Date: Mon Jan 10 16:37:51 2011 -0500 nfsd4: simplify nfsd4_cb_prepare Remove handling for a nonexistant case (status && !-EAGAIN). Signed-off-by: J. Bruce Fields commit 14a24e99f4f506265b634c1cd04eca6394f49dbc Author: J. Bruce Fields Date: Fri Dec 10 19:02:49 2010 -0500 nfsd4: give out delegations more quickly in 4.1 case Signed-off-by: J. Bruce Fields commit 229b2a0839870d0d4f91ad3b24ec13c57bbd50a0 Author: J. Bruce Fields Date: Fri Dec 10 17:37:44 2010 -0500 nfsd4: add helper function to run callbacks Signed-off-by: J. Bruce Fields commit 84f5f7ccc59e628fc8754c0a837fd7e9559711ac Author: J. Bruce Fields Date: Thu Dec 9 15:52:19 2010 -0500 nfsd4: make sure sequence flags are set after destroy_session If this loses any backchannel, make sure we have a chance to notice that and set the sequence flags. Signed-off-by: J. Bruce Fields commit eea4980660bc204bb9d11bb3bf2b1bde5fd5175f Author: J. Bruce Fields Date: Thu Nov 18 08:34:12 2010 -0500 nfsd4: re-probe callback on connection loss This makes sure we set the sequence flag when necessary. Signed-off-by: J. Bruce Fields commit 0d7bb71907546b2baf15d78edd3e508e12963dbf Author: J. Bruce Fields Date: Thu Nov 18 08:30:33 2010 -0500 nfsd4: set sequence flag when backchannel is down Implement the SEQ4_STATUS_CB_PATH_DOWN flag. Signed-off-by: J. Bruce Fields commit 77a3569d6c4e14e89fa628df383b6dccc0cce6be Author: J. Bruce Fields Date: Fri Apr 30 18:51:44 2010 -0400 nfsd4: keep finer-grained callback status Distinguish between when the callback channel is known to be down, and when it is not yet confirmed. This will be useful in the 4.1 case. Also, we don't seem to be using the fact that this field is atomic. Signed-off-by: J. Bruce Fields commit f0418aa4b1103f959d64dc18273efa04ee0140e9 Author: J. Bruce Fields Date: Wed Dec 8 13:48:19 2010 -0500 rpc: allow xprt_class->setup to return a preexisting xprt This allows us to reuse the xprt associated with a server connection if one has already been set up. Signed-off-by: J. Bruce Fields commit 99de8ea962bbc11a51ad4c52e3dc93bee5f6ba70 Author: J. Bruce Fields Date: Wed Dec 8 12:45:44 2010 -0500 rpc: keep backchannel xprt as long as server connection Multiple backchannels can share the same tcp connection; from rfc 5661 section 2.10.3.1: A connection's association with a session is not exclusive. A connection associated with the channel(s) of one session may be simultaneously associated with the channel(s) of other sessions including sessions associated with other client IDs. However, multiple backchannels share a connection, they must all share the same xid stream (hence the same rpc_xprt); the only way we have to match replies with calls at the rpc layer is using the xid. So, keep the rpc_xprt around as long as the connection lasts, in case we're asked to use the connection as a backchannel again. Requests to create new backchannel clients over a given server connection should results in creating new clients that reuse the existing rpc_xprt. But to start, just reject attempts to associate multiple rpc_xprt's with the same underlying bc_xprt. Signed-off-by: J. Bruce Fields commit d75faea330dbd1873c9094e9926ae306590c0998 Author: J. Bruce Fields Date: Tue Nov 30 19:15:01 2010 -0500 rpc: move sk_bc_xprt to svc_xprt This seems obviously transport-level information even if it's currently used only by the server socket code. Signed-off-by: J. Bruce Fields commit dcbeaa68dbbdacbbb330a86c7fc95a28473fc209 Author: J. Bruce Fields Date: Tue Jun 15 17:25:45 2010 -0400 nfsd4: allow backchannel recovery Now that we have a list of connections to choose from, we can teach the callback code to just pick a suitable connection and use that, instead of insisting on forever using the connection that the first create_session was sent with. Signed-off-by: J. Bruce Fields commit 1d1bc8f2074f0b728dfca2a3c16f2f5a3f298ffc Author: J. Bruce Fields Date: Mon Oct 4 23:12:59 2010 -0400 nfsd4: support BIND_CONN_TO_SESSION Basic xdr and processing for BIND_CONN_TO_SESSION. This adds a connection to the list of connections associated with a session. Signed-off-by: J. Bruce Fields commit 4c6493785a1ea9c3b3522f199760a90a30e1626c Author: J. Bruce Fields Date: Tue Jun 15 14:22:37 2010 -0400 nfsd4: modify session list under cl_lock We want to traverse this from the callback code. Signed-off-by: J. Bruce Fields commit ec26fba40fa92c7cc5c61d40746f499dcefc67be Author: J. Bruce Fields Date: Tue Jan 11 10:30:48 2011 -0500 Documentation: fl_mylease no longer exists Signed-off-by: J. Bruce Fields commit a2c50f69168deec3f7e47644eb4ef4f8a3ee6910 Merge: 8c3df3e 3c0eee3 Author: J. Bruce Fields Date: Tue Jan 11 10:28:36 2011 -0500 Merge commit 'v2.6.37' into for-2.6.38-incoming I made a slight mess of Documentation/filesystems/Locking; resolve conflicts with upstream before fixing it up. commit 0a2179b169089f871e071c74316371ed43e6c8eb Author: Theodore Ts'o Date: Tue Jan 11 14:42:29 2011 -0500 ext4: revert buggy trim overflow patch This reverts commit 4f531501e44: ext4: fix possible overflow in ext4_trim_fs() Signed-off-by: "Theodore Ts'o" commit 7bc4a4ce68f8c6d064ea949446852e996526f692 Merge: 498f7f5 92f1c00 Author: Linus Torvalds Date: Tue Jan 11 11:42:06 2011 -0800 Merge branch 'for-linus-merged' of git://oss.sgi.com/xfs/xfs * 'for-linus-merged' of git://oss.sgi.com/xfs/xfs: (47 commits) xfs: convert grant head manipulations to lockless algorithm xfs: introduce new locks for the log grant ticket wait queues xfs: convert log grant heads to atomic variables xfs: convert l_tail_lsn to an atomic variable. xfs: convert l_last_sync_lsn to an atomic variable xfs: make AIL tail pushing independent of the grant lock xfs: use wait queues directly for the log wait queues xfs: combine grant heads into a single 64 bit integer xfs: rework log grant space calculations xfs: fact out common grant head/log tail verification code xfs: convert log grant ticket queues to list heads xfs: use AIL bulk delete function to implement single delete xfs: use AIL bulk update function to implement single updates xfs: remove all the inodes on a buffer from the AIL in bulk xfs: consume iodone callback items on buffers as they are processed xfs: reduce the number of AIL push wakeups xfs: bulk AIL insertion during transaction commit xfs: clean up xfs_ail_delete() xfs: Pull EFI/EFD handling out from under the AIL lock xfs: fix EFI transaction cancellation. ... commit 87f1d40a706bdebdc8f959b9ac291d0d8fdfcc7e Author: Jeremy Fitzhardinge Date: Mon Dec 13 14:42:30 2010 +0000 xen p2m: clear the old pte when adding a page to m2p_override When adding a page to m2p_override we change the p2m of the page so we need to also clear the old pte of the kernel linear mapping because it doesn't correspond anymore. When we remove the page from m2p_override we restore the original p2m of the page and we also restore the old pte of the kernel linear mapping. Before changing the p2m mappings in m2p_add_override and m2p_remove_override, check that the page passed as argument is valid and return an error if it is not. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk commit a12b4eb34bb1ea16046c5b61e7a887e252cc1cce Author: Stefano Stabellini Date: Fri Dec 10 14:56:42 2010 +0000 xen gntdev: use gnttab_map_refs and gnttab_unmap_refs Use gnttab_map_refs and gnttab_unmap_refs to map and unmap the grant ref, so that we can have a corresponding struct page. Signed-off-by: Stefano Stabellini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 289b777eac19c811b474593b4d2fd14e46340c23 Author: Stefano Stabellini Date: Fri Dec 10 14:54:44 2010 +0000 xen: introduce gnttab_map_refs and gnttab_unmap_refs gnttab_map_refs maps some grant refs and uses the new m2p override to set a proper m2p mapping for the granted pages. gnttab_unmap_refs unmaps the granted refs and removes th mappings from the m2p override. Signed-off-by: Stefano Stabellini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 9b705f0e98c489b18ba22a6eab9d694b546c8552 Author: Stefano Stabellini Date: Fri Dec 10 14:52:45 2010 +0000 xen p2m: transparently change the p2m mappings in the m2p override In m2p_add_override store the original mfn into page->index and then change the p2m mapping, setting mfns as FOREIGN_FRAME. In m2p_remove_override restore the original mapping. Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk commit f0a70c882ea546bbd802643990ceded32c39facc Author: Daniel De Graaf Date: Fri Jan 7 11:51:47 2011 +0000 xen/gntdev: Fix circular locking dependency apply_to_page_range will acquire PTE lock while priv->lock is held, and mn_invl_range_start tries to acquire priv->lock with PTE already held. Fix by not holding priv->lock during the entire map operation. This is safe because map->vma is set nonzero while the lock is held, which will cause subsequent maps to fail and will cause the unmap ioctl (and other users of gntdev_del_map) to return -EBUSY until the area is unmapped. It is similarly impossible for gntdev_vma_close to be called while the vma is still being created. Signed-off-by: Daniel De Graaf Signed-off-by: Konrad Rzeszutek Wilk commit ba5d1012292403c8037adf4a54c4ec50dfe846c4 Author: Jeremy Fitzhardinge Date: Wed Dec 8 10:54:32 2010 -0800 xen/gntdev: stop using "token" argument It's the struct page of the L1 pte page. But we can get its mfn by simply doing an arbitrary_virt_to_machine() on it anyway (which is the safe conservative choice; since we no longer allow HIGHPTE pages, we would never expect to be operating on a mapped pte page). Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 4ad9f594d7199c99f6b1b3ef88c64bd5920a4592 Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 16:58:54 2011 -0200 Revert "perf tools: Emit clearer message for sys_perf_event_open ENOENT return" This reverts commit aa7bc7ef73efc46d7c3a0e185eefaf85744aec98. It removed the fallback from hardware profiling to software profiling. .e.g., in a VM with no PMU. Reported-by: David Ahern Cc: 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 9329e7604fe915fd0201633d3c38adae307d56a5 Author: Ian Campbell Date: Wed Dec 8 11:57:40 2010 +0000 xen: gntdev: move use of GNTMAP_contains_pte next to the map_op This flag controls the meaning of gnttab_map_grant_ref.host_addr and specifies that the field contains a reference to the pte entry to be used to perform the mapping. Therefore move the use of this flag to the point at which we actually use a reference to the pte instead of something else, splitting up the usage of the flag in this way is confusing and potentially error prone. The other flags are all properties of the mapping itself as opposed to properties of the hypercall arguments and therefore it make sense to continue to pass them round in map->flags. Signed-off-by: Ian Campbell Cc: Stefano Stabellini Cc: Derek G. Murray Cc: Gerd Hoffmann Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 448f2831934381e9d3c4d93e700ba7bbe14612dc Author: Jeremy Fitzhardinge Date: Wed Dec 15 13:19:33 2010 +0000 xen: add m2p override mechanism Add a simple hashtable based mechanism to override some portions of the m2p, so that we can find out the pfn corresponding to an mfn of a granted page. In fact entries corresponding to granted pages in the m2p hold the original pfn value of the page in the source domain that granted it. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Stefano Stabellini Signed-off-by: Konrad Rzeszutek Wilk commit b5eafe924bb054d7c56e6ebd18106352e8a3f916 Author: Jeremy Fitzhardinge Date: Mon Dec 6 16:29:22 2010 -0800 xen: move p2m handling to separate file Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 8d3eaea24609c7cd6fb0e6471f46a52f9e5d0202 Author: Jeremy Fitzhardinge Date: Thu Nov 11 14:39:12 2010 -0800 xen/gntdev: add VM_PFNMAP to vma These pages are from other domains, so don't have any local PFN. VM_PFNMAP is the closest concept Linux has to this. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit ab31523c2fcac557226bac72cbdf5fafe01f9a26 Author: Gerd Hoffmann Date: Tue Dec 14 18:40:46 2010 +0000 xen/gntdev: allow usermode to map granted pages The gntdev driver allows usermode to map granted pages from other domains. This is typically used to implement a Xen backend driver in user mode. Signed-off-by: Gerd Hoffmann Signed-off-by: Stefano Stabellini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit f07745325cbd93afc5d8bcf7539a063d33134075 Author: Ian Campbell Date: Mon Feb 9 12:05:49 2009 -0800 xen: define gnttab_set_map_op/unmap_op Impact: hypercall definitions These functions populate the gnttab data structures used by the granttab map and unmap ops and are used in the backend drivers. Originally xen-unstable.hg 9625:c3bb51c443a7 [ Include Stefano's fix for phys_addr_t ] Signed-off-by: Ian Campbell Signed-off-by: Stefano Stabellini Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit 498f7f505dc79934c878c7667840c50c64f232fc Merge: 0969d11 d6351db Author: Linus Torvalds Date: Tue Jan 11 11:28:34 2011 -0800 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: (22 commits) MAINTAINERS: Update Joel Becker's email address ocfs2: Remove unused truncate function from alloc.c ocfs2/cluster: dereferencing before checking in nst_seq_show() ocfs2: fix build for OCFS2_FS_STATS not enabled ocfs2/cluster: Show o2net timing statistics ocfs2/cluster: Track process message timing stats for each socket ocfs2/cluster: Track send message timing stats for each socket ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking ocfs2: Add DEBUG_FS dependency ocfs2/dlm: Hard code the values for enums ocfs2/dlm: Minor cleanup ocfs2/dlm: Cleanup dlmdebug.c ocfs2: Release buffer_head in case of error in ocfs2_double_lock. ocfs2/cluster: Pin the local node when o2hb thread starts ocfs2/cluster: Show pin state for each o2hb region ocfs2/cluster: Pin/unpin o2hb regions ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap ocfs2/cluster: Pin the remote node item in configfs ocfs2/dlm: make existing convertion precedent over new lock ... commit 357f54d6b38252737116a6d631f6ac28ded018ed Author: Andy Adamson Date: Tue Dec 14 10:11:57 2010 -0500 NFS fix the setting of exchange id flag Indicate support for referrals. Do not set any PNFS roles. Check the flags returned by the server for validity. Do not use exchange flags from an old client ID instance when recovering a client ID. Update the EXCHID4_FLAG_XXX set to RFC 5661. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 0969d11e201b82d30a158ccdb3aca67a7b845613 Merge: 16ee8db d15be32 Author: Linus Torvalds Date: Tue Jan 11 11:13:46 2011 -0800 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze * 'next' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: remove obsolete DEBUG_BOOTMEM microblaze: trivial: Fix removed the part of line microblaze: Fix __muldi3 function for little-endian. microblaze: Clear i/dcache for sw breakpoints microblaze: Remove useless early_init_dt_check_for_initrd microblaze: Fix unaligned exception for little endian platform microblaze: Add PVR for Microblaze v8.00.b microblaze: Correct PVR access macros Revert "microblaze: Simplify syscall rutine" microblaze: Fix initramfs arch/microblaze: Remove unnecessary semicolons commit 16ee8db6a93ffbc021132599f33288613f042c3d Merge: 5943a26 fa36e95 Author: Linus Torvalds Date: Tue Jan 11 11:11:46 2011 -0800 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix Moorestown VRTC fixmap placement x86/gpio: Implement x86 gpio_to_irq convert function x86, UV: Fix APICID shift for Westmere processors x86: Use PCI method for enabling AMD extended config space before MSR method x86: tsc: Prevent delayed init if initial tsc calibration failed x86, lapic-timer: Increase the max_delta to 31 bits x86: Fix sparse non-ANSI function warnings in smpboot.c x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h x86, numa: Fix cpu to node mapping for sparse node ids x86, numa: Fake node-to-cpumask for NUMA emulation x86, numa: Fake apicid and pxm mappings for NUMA emulation x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU x86, numa: Reduce minimum fake node size to 32M Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c commit 5943a268002fce97885f2ca08827ff1b0312068c Merge: 4277616 96c8f06 Author: Linus Torvalds Date: Tue Jan 11 11:06:41 2011 -0800 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: rtc: Namespace fixup RTC: Remove UIE emulation RTC: Rework RTC code to use timerqueue for events Fix up trivial conflict in drivers/rtc/rtc-dev.c commit 42776163e13a56ea3096edff7a5df95408e80eb4 Merge: edb2877 3d03e2e Author: Linus Torvalds Date: Tue Jan 11 11:02:13 2011 -0800 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: (28 commits) perf session: Fix infinite loop in __perf_session__process_events perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1) perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail perf tools: Emit clearer message for sys_perf_event_open ENOENT return perf stat: better error message for unsupported events perf sched: Fix allocation result check perf, x86: P4 PMU - Fix unflagged overflows handling dynamic debug: Fix build issue with older gcc tracing: Fix TRACE_EVENT power tracepoint creation tracing: Fix preempt count leak tracepoint: Add __rcu annotation tracing: remove duplicate null-pointer check in skb tracepoint tracing/trivial: Add missing comma in TRACE_EVENT comment tracing: Include module.h in define_trace.h x86: Save rbp in pt_regs on irq entry x86, dumpstack: Fix unused variable warning x86, NMI: Clean-up default_do_nmi() x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU x86, NMI: Remove DIE_NMI_IPI x86, NMI: Add priorities to handlers ... commit edb2877f4a62647e36e20839a786f94d688a06ed Merge: 5b2eef9 f9db92c Author: Linus Torvalds Date: Tue Jan 11 11:01:24 2011 -0800 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: (39 commits) mmc: davinci: add support for SDIO irq handling mmc: fix division by zero in MMC core mmc: tmio_mmc: fix CMD irq handling mmc: tmio_mmc: handle missing HW interrupts mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc mmc: tmio_mmc: implement SDIO IRQ support mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers mmc: tmio_mmc: silence compiler warnings mmc: tmio_mmc: implement a bounce buffer for unaligned DMA mmc: tmio_mmc: merge the private header into the driver mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure mmc: tmio_mmc: allow multi-element scatter-gather lists mmc: Register debugfs dir before calling card probe function. mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK. mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan. mmc: Fix sd/sdio/mmc initialization frequency retries mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap mmc: dw_mmc: Add Synopsys DesignWare mmc host driver. mmc: add sdhci-tegra driver for Tegra SoCs mmc: sdhci: add quirk for max len ADMA descriptors ... commit cc841580aa58ad7498b23e282859d07f8b721e24 Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 15:16:52 2011 -0200 perf top: Fix annotate segv Before we had sym_counter, it was initialized to zero and we used that as an index in the global attrs variable, now we have a list of evsel entries, and sym_counter became sym_evsel, that remained initialized to zero (NULL): b00m. Fix it by initializing it to the first entry in the evsel list. Bug-introduced: 69aad6f Reported-by: Kirill Smelkov Tested-by: Kirill Smelkov Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Kirill Smelkov 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 cdce2db74e156fbd9a2dc3c7b246166f8b70955b Author: Karsten Wiese Date: Tue Jan 4 01:20:37 2011 +0100 ALSA: snd-usb-us122l: Fix missing NULL checks Fix missing NULL checks in usb_stream_hwdep_poll() and usb_stream_hwdep_ioctl(). Wake up poll waiters before returning from usb_stream_hwdep_ioctl(). Signed-off-by: Karsten Wiese Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit 921eebdc18c82268eab446592191b39e35d031d6 Author: Karsten Wiese Date: Mon Jan 3 02:41:58 2011 +0100 ALSA: snd-usb-us122l: Fix MIDI output The US-122L always reads 9 bytes per urb unless they are set to 0xFD. Signed-off-by: Karsten Wiese Cc: stable@kernel.org Signed-off-by: Takashi Iwai commit 04f8fd176c9c105dc0025486cfab9dc779288b3e Author: Dimitris Papastamos Date: Tue Jan 11 11:24:02 2011 +0000 ASoC: soc-cache: Fix invalid memory access during snd_soc_lzo_cache_sync() The size of the lzo syncing bitmap was incorrectly set to the size of the cache times the word size, however, the correct size is the size of the cache. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6cde6d4217ff01422c093d3f7ff550b7a324e96e Author: Will Deacon Date: Tue Jan 11 14:04:36 2011 +0100 ARM: 6619/1: nommu: avoid mapping vectors page when !CONFIG_MMU When running without an MMU, we do not need to install a mapping for the vectors page. Attempting to do so causes a compile-time error because install_special_mapping is not defined. This patch adds compile-time guards to the vector mapping functions so that we can build nommu configurations once more. Acked-by: Greg Ungerer Signed-off-by: Will Deacon Signed-off-by: Russell King commit 03cfbdf9f7a1d392146718f67e50fa9ab2844f22 Author: Takashi Iwai Date: Tue Jan 11 17:58:26 2011 +0100 ASoC: Fix section mismatch in wm8995.c __devinitconst can't be used for data referred in driver struct. Signed-off-by: Takashi Iwai commit d1d7093f3f639e693fa763eb51d8d9c349bfd606 Author: Clemens Ladisch Date: Tue Jan 11 10:35:29 2011 +0100 ALSA: oxygen: add S/PDIF source selection for Claro cards Add a mixer control to switch between the optical and coaxial S/PDIF inputs on the HT-Omega Claro and Claro halo cards. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 5fc51524746430179c676297fd48aaab28e1b85f Author: Clemens Ladisch Date: Tue Jan 11 10:33:40 2011 +0100 ALSA: oxygen: fix CD/MIDI for X-Meridian (2G) Enable the X-Meridian's CD input and the X-Meridian 2G's potential MIDI ports. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit edc4d272551594729f63ca4cde1612608494091f Author: Russell King Date: Tue Jan 11 16:44:02 2011 +0000 ARM: sched_clock: make minsec argument to clocks_calc_mult_shift() zero The purpose of the minsec argument is to prevent 64-bit math overflow when the number of cycles is multiplied up. However, the multipler is 32-bit, and in the sched_clock() case, the cycle counter is up to 32-bit as well. So the math can never overflow. With a value of 60, and clock rates greater than 71MHz, the calculated multiplier is unnecessarily reduced in value, which reduces accuracy by maybe 70ppt. It's almost not worth bothering with as the oscillator driving the counter won't be any more than 1ppm - unless you're using a rubidium lamp or caesium fountain frequency standard. So, set the minsec argument to zero. Signed-off-by: Russell King commit 211baa7016894c02fc18693e21ca479cd08ac0c0 Author: Russell King Date: Tue Jan 11 16:23:04 2011 +0000 ARM: sched_clock: allow init_sched_clock() to be called early sched_clock is supposed to be initialized early - in the recently added init_early platform hook. However, in doing so we end up calling mod_timer() before the timer lists are initialized, resulting in an oops. Split the initialization in two - the part which the platform calls early which starts things off. The addition of the timer can be delayed until after we have more of the kernel initialized - when the normal time sources are initialized. Signed-off-by: Russell King commit b8b80cf37c7f0e32729262f805bc0fa81c3e9d12 Author: Aneesh Kumar K.V Date: Tue Jan 11 08:14:47 2011 +0000 fs/9p: Don't set dentry->d_op in create routines We do set dentry->d_op in lookup even in case of EOENT entries. That implies we should have dentry->d_op already set when create/mkdir/mknod/link/symlink routines are called Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit c25a61f542ccb81e74d3f822992f3d74392f386d Author: Eric Van Hensbergen Date: Tue Jan 11 09:49:03 2011 -0600 fs/9p: fix spelling typo introduced a typo somehow during a hand merge Reported by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 31b6ceac497954c160c61f07e76b891b1cf53c90 Author: M. Mohan Kumar Date: Sat Jan 8 07:28:46 2011 +0530 fs/9p: TREADLINK bugfix Remove v9fs_vfs_readlink_dotl function and use generic_readlink. Update v9fs_vfs_follow_link_dotl function to accommodate this change Signed-off-by: M. Mohan Kumar Reported-by: Dr. David Alan Gilbert Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 219fd58be62d01e30224c7af919dea77b7e392a8 Author: M. Mohan Kumar Date: Mon Jan 10 14:23:53 2011 -0600 net/9p: Use proper data types Use proper data types for storing the count of the binary blob and length of a string. Without this patch length calculation of string will always result in -1 because of comparision between signed and unsigned integer. Signed-off-by: M. Mohan Kumar Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit af7542fc8ac678ce69dbd5c9643c52897b47c66f Author: Aneesh Kumar K.V Date: Mon Jan 10 14:22:21 2011 -0600 fs/9p: Simplify the .L create operation Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 53c06f4e0a4621bb40c8be6ff701e07f6226143d Author: Aneesh Kumar K.V Date: Mon Jan 10 13:51:47 2011 -0600 fs/9p: Move dotl inode operations into a seperate file Source Code Reorganization Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Eric Van Hensbergen commit 255614c45943d43a3778a04b214692346b9d5049 Author: Randy Dunlap Date: Sun Jan 2 06:15:54 2011 +0000 fs/9p: fix menu presentation Make the 9P_FS kconfig options subordinate to the 9P_FS kconfig symbol in the menu presentation instead of them all being at the same level. Signed-off-by: Randy Dunlap Signed-off-by: Eric Van Hensbergen commit 6f81c1157468dd0a7377249c44ae83a7fe998bc9 Author: Aneesh Kumar K.V Date: Fri Dec 10 12:19:31 2010 +0530 fs/9p: Fix the return error on default acl removal If we don't have default ACL, then trying to remove default acl on a file should return 0. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Venkateswararao Jujjuri commit 009ca3897ea8313b4ed4da964a2f31ecf5a0624d Author: Joe Perches Date: Mon Nov 15 03:04:51 2010 +0000 fs/9p: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Eric Van Hensbergen commit 50c01fc355c6a97c511d58411f9bc0e4b8fc4659 Author: Jamie Iles Date: Tue Jan 11 12:43:52 2011 +0000 spi/dw_spi: 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 Signed-off-by: Grant Likely commit 8c3df3e58cde676de4df9363c00f37dbfce08e5c Author: J. Bruce Fields Date: Tue Jan 11 10:12:37 2011 -0500 Documentation: don't remove lock manager fl_release_private I thought I'd removed the last user of this, but missed fs/locks.c:lease_release_private_callback(). Thanks to Christoph for pointing this out. Signed-off-by: J. Bruce Fields commit 04d94879c8a4973b5499dc26b9d38acee8928791 Author: Christoph Lameter Date: Mon Jan 10 10:15:15 2011 -0600 slub: Avoid use of slub_lock in show_slab_objects() The purpose of the locking is to prevent removal and additions of nodes when statistics are gathered for a slab cache. So we need to avoid racing with memory hotplug functionality. It is enough to take the memory hotplug locks there instead of the slub_lock. online_pages() currently does not acquire the memory_hotplug lock. Another patch will be submitted by the memory hotplug authors to take the memory hotplug lock and describe the uses of the memory hotplug lock to protect against adding and removal of nodes from non hotplug data structures. Cc: # 2.6.37 Reported-and-tested-by: Bart Van Assche Acked-by: David Rientjes Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 925268a06dc2b1ff7bfcc37419a6827a0e739639 Author: KAMEZAWA Hiroyuki Date: Tue Jan 11 16:44:01 2011 +0900 memory hotplug: one more lock on memory hotplug Now, memory_hotplug_(un)lock() is used for add/remove/offline pages for avoiding races with hibernation. But this should be held in online_pages(), too. It seems asymmetric. There are cases where one has to avoid a race with memory hotplug notifier and his own local code, and hotplug v.s. hotplug. This will add a generic solution for avoiding races. In other view, having lock here has no big impacts. online pages is tend to be done by udev script at el against each memory section one by one. Then, it's better to have lock here, too. Cc: # 2.6.37 Reviewed-by: Christoph Lameter Acked-by: David Rientjes Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Pekka Enberg commit bd3bfe9eda94d3c050830217c1e1c338808de5b2 Author: Arnaldo Carvalho de Melo Date: Tue Jan 11 12:42:00 2011 -0200 perf evsel: Fix order of event list deletion We need to defer calling perf_evsel_list__delete() till after atexit registered routines, because we need to traverse the events being recorded at that time at least on 'perf record'. This fixes the problem reported by Thomas Renninger where cmd_record called by cmd_timechart would not write the tracing data to the perf.data file header because the evsel_list at atexit (control+C on 'perf timechart record') time would be empty, being already deleted by run_builtin(), and thus 'perf timechart' when trying to process such perf.data file would die with: "no trace data in the file" Problem introduced in 70d544d. Reported-by: Thomas Renninger Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Renninger Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f123c98e7f168e949b283690693695f988332c3d Author: Steven Rostedt Date: Thu Jan 6 15:08:29 2011 -0500 rtmutex: Fix comment about why new_owner can be NULL in wake_futex_pi() The comment about why rt_mutex_next_owner() can return NULL in wake_futex_pi() is not the normal case. Tracing the cause of why this occurs is more likely that waiter simply timedout. But because it originally caused contention with the futex, the owner will go into the kernel when it unlocks the lock. Then it will hit this code path and rt_mutex_next_owner() will return NULL. Cc: Thomas Gleixner Signed-off-by: Steven Rostedt Signed-off-by: Ingo Molnar commit 1aa023b8fda8096caf41c20427a0ef396d88eb0f Author: Russell King Date: Tue Jan 11 13:48:17 2011 +0000 ARM: integrator: fix compile warning in cpu.c Fix: arch/arm/mach-integrator/cpu.c: In function ■integrator_get■: arch/arm/mach-integrator/cpu.c:164: warning: ■vco.s■ may be used uninitialized in this function Signed-off-by: Russell King commit 48f76ed1cc034c682666c43815fd0ef27c2a7215 Author: Shawn Guo Date: Tue Jan 11 20:09:24 2011 +0800 ARM: mx28: add the second fec device registration Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit b2878fa41be8b57fc58f8b53eb0d0183511ef548 Author: Shawn Guo Date: Thu Jan 6 15:13:14 2011 +0800 ARM: mx28: update clock and device name for dual fec support Change device name from "fec" to "imx28-fec", so that fec driver can distinguish mx28. Signed-off-by: Shawn Guo Signed-off-by: Sascha Hauer commit c0fdcfa8e9a994176ff1070dced50eeff5f6f851 Author: Ryan Mallon Date: Mon Jan 10 20:49:27 2011 +0100 ARM: 6616/1: Fix ep93xx-fb init/exit annotations Fix section mismatch errors in the ep93xx-fb driver resulting from incorrect init/exit annotations. Reported-by: H Hartley Sweeten Signed-off-by: Ryan Mallon Tested-by: H Hartley Sweeten Signed-off-by: Russell King commit 6426d2c2f071e0be50a22052a47b582f2561e5e0 Author: Russell King Date: Tue Jan 11 12:11:01 2011 +0000 ARM: twd: fix display of twd frequency The fraction of MHz was not being displayed correctly as the calculation was a factor of 10 out. Fix this. Signed-off-by: Russell King commit fa36e956c5027d9a985d555d104d293c0a98d2c3 Author: Arjan van de Ven Date: Tue Jan 11 10:55:56 2011 +0000 x86: Fix Moorestown VRTC fixmap placement The x86 fixmaps need to be all together... unfortunately the VRTC one was misplaced. This patch makes sure the MRST VRTC fixmap is put prior to the __end_of_permanent_fixed_addresses marker. Signed-off-by: Arjan van de Ven Signed-off-by: Alan Cox LKML-Reference: <20110111105544.24448.27607.stgit@bob.linux.org.uk> Signed-off-by: Ingo Molnar commit 718c45bd1aa80c4e23a0ee204c973e3014e94708 Author: Alek Du Date: Tue Jan 11 10:55:32 2011 +0000 x86/gpio: Implement x86 gpio_to_irq convert function We need this for x86 MID platforms where GPIO interrupts are used. No special magic is needed so the default 1:1 behaviour will do nicely. Signed-off-by: Alek Du Signed-off-by: Jacob Pan Signed-off-by: Alan Cox LKML-Reference: <20110111105439.24448.69863.stgit@bob.linux.org.uk> Signed-off-by: Ingo Molnar commit 990a32d1e54b3c0f7304bec95fb883404589b3f0 Author: Jack Steiner Date: Mon Jan 10 13:52:11 2011 -0600 x86, UV: Fix APICID shift for Westmere processors Westmere processors use a different algorithm for assigning APICIDs on SGI UV systems. The location of the node number within the apicid is now a function of the processor type. Signed-off-by: Jack Steiner LKML-Reference: <20110110195210.GA18737@sgi.com> Signed-off-by: Ingo Molnar commit 24d9b70b8c679264756a6980e668b96b3f964826 Author: Jan Beulich Date: Mon Jan 10 16:20:23 2011 +0000 x86: Use PCI method for enabling AMD extended config space before MSR method While both methods should work equivalently well for the native case, the Xen Dom0 case can't reliably work with the MSR one, since there's no guarantee that the virtual CPUs it has available fully cover all necessary physical ones. As per the suggestion of Robert Richter the patch only adds the PCI method, but leaves the MSR one as a fallback to cover new systems the PCI IDs of which may not have got added to the code base yet. The only change in v2 is the breaking out of the new CPI initialization method into a separate function, as requested by Ingo. Signed-off-by: Jan Beulich Acked-by: Robert Richter Cc: Andreas Herrmann3 Cc: Joerg Roedel Cc: Jeremy Fitzhardinge LKML-Reference: <4D2B3FD7020000780002B67D@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit f4fd58d65e05850a80bba4ee3929e3b696fbc5eb Author: Guennadi Liakhovetski Date: Tue Jan 11 08:34:52 2011 +0100 ASoC: fix migor audio build Commit 6d803ba736abb5e122dede70a4720e4843dd6df4 "ARM: 6483/1: arm & sh: factorised duplicated clkdev.c" broke compilation of migor audio. Use the correct header to fix the problem. Signed-off-by: Guennadi Liakhovetski Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 29fe359ca20326e57b25e8545c49ed9ff5e830c7 Author: Thomas Gleixner Date: Tue Jan 11 11:40:48 2011 +0100 x86: tsc: Prevent delayed init if initial tsc calibration failed commit a8760ec (x86: Check tsc available/disabled in the delayed init function) missed to prevent the setup of the delayed init function in case the initial tsc calibration failed. This results in the same divide by zero bug as we have seen without the tsc disabled check. Skip the delayed work setup when tsc_khz (the initial calibration value) is 0. Bisected-and-tested-by: Kirill A. Shutemov Cc: John Stultz Signed-off-by: Thomas Gleixner commit 92cb33f188e192c3803d6d430ea61151da3e026e Author: Fabio Estevam Date: Mon Jan 10 18:17:37 2011 -0200 ARM: imx/mx27_3ds: Add debug board support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit e1336bff92c6e0f4e6212af13f11d20c29a900a2 Author: Alexander Stein Date: Tue Jan 11 01:07:09 2011 -0800 Input: fix force feedback capability query example 'features' is a bit array, not byte array Signed-off-by: Alexander Stein Acked-by: Anssi Hannula Signed-off-by: Dmitry Torokhov commit 5fca6cac9feed75efc0b2c454305a5f538d887f5 Author: Ping Cheng Date: Tue Jan 11 01:06:58 2011 -0800 Input: wacom_w8001 - add single-touch support Emulate single-touch compatible events for the 2-finger panels so that they can be used with single-touch legacy clients. Assign device ids as Wacom USB vendor ID and product ID. Name the device to reflect its specific features. Scale touch coordinates to pen maximum if pen supported. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 2cad26a9d583ea16bb23a8cdc2f7a7df4662a72c Author: Yong Shen Date: Mon Jan 10 20:08:54 2011 +0800 ARM i.MX5 uart clock bug fix uart clk is from pll3 on mx53 instead of mx51 Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit b0a6ba5ffbb52b5e8fccd1a013e770e1b0af03ba Author: Yong Shen Date: Mon Jan 10 20:08:53 2011 +0800 ARM i.MX53 enable spi on EVK board 1. some macro definitions fix 2. add platform data for spi device 3. register spi clocks Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit e92d457514c957f293c4706a06a25833061d9b88 Author: Stephen Rothwell Date: Tue Jan 11 13:20:30 2011 +1100 ALSA: include delay.h for msleep in Xonar DG support Signed-off-by: Stephen Rothwell Signed-off-by: Takashi Iwai commit efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd Author: Paul Mundt Date: Tue Jan 11 15:02:59 2011 +0900 sh: Fix up legacy PTEA space attribute mapping. When p3_ioremap() was converted to ioremap_prot() there was some breakage introduced where the 29-bit segmentation logic would trap the area range and return an identity mapping without having allowed the area specification to force mapping through page tables. This wires up a PCC mask for pgprot verification to work out whether to short-circuit the identity mapping on legacy parts, restoring the previous behaviour. Reported-by: Nobuhiro Iwamatsu Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 11e1ed6e88616be5489a43bc6297d9bb8464908b Author: Paul Mundt Date: Tue Jan 11 15:00:26 2011 +0900 sh: Stub out legacy PCC pgprot encoding for X2 TLBs. Presently it's still possible to reference the PAGE_KERNEL_PCC pgprot encoding on X2 TLBs which simply don't support it at all. Convert this over to follow the nommu behaviour and simply hand back an invalid pgprot value so we error out properly. Signed-off-by: Paul Mundt commit c81fc389255d287dbfb17a70cd172663f962341a Author: Paul Mundt Date: Tue Jan 11 14:39:35 2011 +0900 sh: constify prefetch pointers. prefetch()/prefetchw() are supposed to take a const void * instead of a straight void *, which the build recently started complaining about, fix them up. Signed-off-by: Paul Mundt commit 39bf990ead35c7263652ca5dd8262b2b2cd147ac Author: Jesse Larrew Date: Fri Dec 17 22:07:47 2010 +0000 powerpc/pseries: Fix VPHN build errors on non-SMP systems The header asm/hvcall.h was previously included indirectly via smp.h. On non-SMP systems, however, these declarations are excluded and the build breaks. This is easily fixed by including asm/hvcall.h directly. The VPHN feature is only meaningful on NUMA systems that implement the SPLPAR option, so exclude the VPHN code on systems without SPLPAR enabled. Also, expose unmap_cpu_from_node() on systems with SPLPAR enabled, even if CONFIG_HOTPLUG_CPU is disabled. Lastly, map_cpu_to_node() is now needed by VPHN to manipulate the node masks after boot time, so remove the __cpuinit annotation to fix a section mismatch. Signed-off-by: Jesse Larrew commit eed0ba0b4ab2d1668588219a8efa81bf8636a12d Merge: 98b14d6 c9de933 Author: Benjamin Herrenschmidt Date: Tue Jan 11 15:10:08 2011 +1100 Merge remote branch 'gcl/next' into next commit 89e9fd32c6f4ed58cd6f6e3c3cf5b536a3f36100 Merge: 239f6dc 2f59986 54b3846 Author: Paul Mundt Date: Tue Jan 11 13:05:15 2011 +0900 Merge branches 'sh/memchunk' and 'common/mmcif' into sh-latest commit 2f5998610ae315fa659ebe2ae0f1c02203b63d9a Author: Paul Mundt Date: Fri Jan 7 15:19:56 2011 +0900 sh: Add a machvec callback for early memblock reservations. This adds in a callback to the machvec to allow platforms to do early reservations through memblock. Signed-off-by: Paul Mundt commit 6ae1e19dbb43ff0d429a9f45087c513212686836 Author: Tony SIM Date: Tue Jan 11 09:47:59 2011 +0900 ARM: mach-shmobile: mackerel: Add touchscreen ST1232 support Signed-off-by: Tony SIM Signed-off-by: Paul Mundt commit 1dadad2ffcf90522bd66aa3fad5a325eda9115aa Author: Simon Horman Date: Mon Jan 10 23:18:01 2011 +0000 ARM: mach-shmobile: ap4eb: SCIF port for earlyprintk when using zboot Initialise the SCIF serial port to allow earlyprintk output when using zboot. Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 38915d2e9e9295d0b6c745620908725c2f50c6bd Author: Simon Horman Date: Mon Jan 10 23:18:00 2011 +0000 ARM: mach-shmobile: mackerel: SCIF port for earlyprintk when using zboot Initialise the SCIF serial port to allow earlyprintk output when using zboot. It is based on a very similar patched for AP4EB. Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit da5d1f4c9001c0aa2092019bdfa8f41e9985d163 Author: Yusuke Goda Date: Fri Jan 7 09:48:36 2011 +0000 ARM: mach-shmobile: mackerel: Add support get_cd in CN23 Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 239f6dcbab35c90240edf47293cec6e33ea2cf9a Author: Yoshihiro Shimoda Date: Fri Jan 7 10:26:26 2011 +0000 sh: update sh7757lcr_defconfig - disable the 8250 driver (fix the build error on sh7757lcr) - enable sh_eth driver Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 538e790605be792fc90fe29db42f7e404ab7e5cc Author: Yoshihiro Shimoda Date: Fri Jan 7 10:26:24 2011 +0000 sh: add PVR probing for SH7757 3rd cut Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 95d210ce6b23ec8916f97ec0cc7eb4d5fa80e0b3 Author: Nobuhiro Iwamatsu Date: Fri Jan 7 03:02:15 2011 +0000 sh: Use device_initcall() instead of __initcall() Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 144cd59687fd69e806411391e1ab044473bb5f72 Author: Nobuhiro Iwamatsu Date: Fri Jan 7 03:02:14 2011 +0000 sh: intc - convert board specific landisk code This converts the board specific interrupt code for landisk to make use of intc (use register_intc_controller). Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 418f219c25bee9382db6e93b875df6a46c092198 Author: Nobuhiro Iwamatsu Date: Fri Jan 7 03:02:13 2011 +0000 sh: Move init_landisk_IRQ to header file Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit baa7eb025ab14f3cba2e35c0a8648f9c9f01d24f Author: Nobuhiro Iwamatsu Date: Fri Jan 7 03:02:12 2011 +0000 sh: Fix IRQ macro in header of landisk Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 9ca04434bb5c448e2e252d99a087810c40b9a7c6 Author: Nobuhiro Iwamatsu Date: Fri Jan 7 03:02:11 2011 +0000 sh: pci: Add pci_fixup_pcic to pci of landisk This adds a pci setting revision for landisk. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Paul Mundt commit 0d6ae8fa945aba732edadce1ead9929520d61b99 Author: Paul Mundt Date: Tue Jan 11 12:36:37 2011 +0900 sh: Kill off deprecated ctrl_in/out I/O routines. Now that all of the in-tree drivers have been converted to portable I/O accessors, we can kill off the legacy ones with extreme prejudice. Signed-off-by: Paul Mundt commit 92f1c008ae79e32b83c0607d184b194f302bb3ee Merge: e54be89 d0eb2f3 Author: Alex Elder Date: Mon Jan 10 21:35:55 2011 -0600 Merge branch 'master' into for-linus-merged This merge pulls the XFS master branch into the latest Linus master. This results in a merge conflict whose best fix is not obvious. I manually fixed the conflict, in "fs/xfs/xfs_iget.c". Dave Chinner had done work that resulted in RCU freeing of inodes separate from what Nick Piggin had done, and their results differed slightly in xfs_inode_free(). The fix updates Nick's call_rcu() with the use of VFS_I(), while incorporating needed updates to some XFS inode fields implemented in Dave's series. Dave's RCU callback function has also been removed. Signed-off-by: Alex Elder commit 90a48151599b5f5137aeb0c8849557231e9c1640 Author: Vicente Jiménez Date: Sat Jan 8 00:54:26 2011 +0000 video: matroxfb: Correct video option in comments and kernel config help. Configuring the kernel I found that the Matrox frame buffer help has a different option than the one in the docs (Documentation/fb/matroxfb.txt). I decided to check the source code to see what is the correct option. drivers/video/matrox/matroxfb_base.c has a lot of comments that sugests that the video option is "matrox". However in line 2452 of this same file you have: fb_get_options("matroxfb", &option) video=matroxfb:XXX is the correct video option not video=matrox:XXX. Signed-off-by: Vicente Jimenez Aguilar Signed-off-by: Paul Mundt commit 0d7fa180a8f314eaa4f766a852bf73abce4dbcc2 Author: Guennadi Liakhovetski Date: Fri Jan 7 11:58:03 2011 +0000 fbdev: sh_mobile_hdmi: simplify pointer handling Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit eb0778bd3c1d4d29ffb7e13739463855d92965df Author: Guennadi Liakhovetski Date: Fri Jan 7 11:57:59 2011 +0000 fbdev: sh_mobile_hdmi: framebuffer notifiers have to be registered A previous patch added a framebuffer notifier to sh_mobile_hdmi.c, but did not register it with the framebuffer core. This patch adds such a registration and moves the notifier block into dynamically allocated per-device private data. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c7321d6f88e1f962d605923a93f9c255e4d0b8c9 Author: Guennadi Liakhovetski Date: Fri Jan 7 11:57:55 2011 +0000 fbdev: sh_mobile_hdmi: add command line option to use the preferred EDID mode Currently, if no command-line option is specified, the sh_mobile_hdmi will use the default 720p video mode. If a command line option of the form "video=sh_mobile_lcdc:x@" is provided, the driver will look for that mode among those, available in the monitor EDID. This patch adds the ability to request the driver to use monitor's preferred mode by specifying 0 as width and hight in the above string. If that mode is not supported by the system, the driver will continue scanning through EDID modes, until it finds a suitable one. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e9ab3207310e8acfa3a5cd8cbb44860f69270bfd Merge: e54be89 18faa1b Author: Paul Mundt Date: Tue Jan 11 12:01:14 2011 +0900 Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux commit 2b76c05794e66655e10633d2d78287854c991f63 Merge: db8b101 1eba27e 8ae31e5 1397490 d0444f1 601d87b 4db62d4 9af7627 Author: Roland Dreier Date: Mon Jan 10 17:43:30 2011 -0800 Merge branches 'cxgb4', 'ipath', 'ipoib', 'mlx4', 'mthca', 'nes', 'qib' and 'srp' into for-next commit 4db62d4786e946e6fc8c2bb1f9201508f7f46c41 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:23 2011 -0800 IB/qib: Fix refcount leak in lkey/rkey validation The mr optimization introduced a reference count leak on an exception test. The lock/refcount manipulation is moved down and the problematic exception test now calls bail to insure that the lock is released. Additional fixes as suggested by Ralph Campbell : - reduce lock scope of dma regions - use explicit values on returns vs. automatic ret value Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit f2d255a0787119f7f4dc0e6093a0bd2700a49402 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:22 2011 -0800 IB/qib: Improve SERDES tunning on QMH boards Improve the QMH SERDES tunning on initial driver load by having the driver go through a link state change. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit dd04e43d46ad7a4e625a9ff3b270dc0db9abe81d Author: Mike Marciniszyn Date: Mon Jan 10 17:42:22 2011 -0800 IB/qib: Unnecessary delayed completions on RC connection Currently on receipt of a response message (ACKs, RDMA Response, Atomic Responses etc.) if the SDMA completion counter is not advanced the driver delays the completion of the WQE. In most cases this is overly pessimistic as the response (ACK) to a previously transmitted send implies that the send is complete. Ensure that SDMA queue is progressed appropriately before determining if a send has delayed completions. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 994bcd28a36af1413381dfe0aac065e2cbc2af40 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:22 2011 -0800 IB/qib: Issue pre-emptive NAKs on eager buffer overflow Under congestion resulting in eager buffer overflow attempt to send pre-emptive NAKs if header queue entries with TID errors are generated and a valid header is present. This prevents long timeouts and flow restarts if a trailing set of packets are dropped due to eager overflows. Pre-emptive NAKs are currently only supported for RDMA writes. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 2a600f14d25fda341b5633c75cc50a7574fc1007 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:22 2011 -0800 IB/qib: RDMA lkey/rkey validation is inefficient for large MRs The current code loops during rkey/lkey validiation to isolate the MR for the RDMA, which is expensive when the current operation is inside a very large memory region. This fix optimizes rkey/lkey validation routines for user memory regions and fast memory regions. The MR entry can be isolated by shifts/mods instead of looping. The existing loop is preserved for phys memory regions for now. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 7c3edd3ff3098093e594dbcbc9dbeeae09b1b4a0 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:22 2011 -0800 IB/qib: Change QPN increment Changing from +1 to +2 allows for better QP distribution across receive contexts. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 057ae62faceccb50b0c2387af60dbbbcd40aab84 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Add fix missing from earlier patch The upstream code was missing part of a receive/error race fix from the internal tree. Add the missing part, which makes future merges possible. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 2528ea60f94ef9e1e1cd82066d55f62a1d19fde1 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Change receive queue/QPN selection The basic idea is that on SusieQ, the difficult part of mapping QPN to context is handled by the mapping registers so the generic QPN allocation doesn't need to worry about chip specifics. For Monty and Linda, there is no mapping table so the qpt->mask (same as dd->qpn_mask), is used to see if the QPN to context falls within [zero..dd->n_krcv_queues). Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 19ede2e422496b2a064b9b22823c6afb66ff927b Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Fix interrupt mitigation For SusieQ we need to write to the interrupt timer register before updating the header queue head with interrupt count. This is to ensure that the timer is enabled properly and a receive available interrupt is delivered. Otherwise this interrupt can be lost if the receiver header/eager queues are full before the timer is enabled. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit aa7374ac19ca08715693b0a2d9f88f479af3ea7c Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Avoid duplicate writes to the rcv head register Avoid duplicate writes to the head register as this can lead to lost interrupts if the context goes full before the second write is done. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit e706203c7c1cff8c27f9ce6d58911014a6bd826c Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Add a few new SERDES tunings Add new SERDES tuning to aid manufacturing. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit f73df408b299e4bc5ed66cc50058585af64a8f9e Author: Mike Marciniszyn Date: Mon Jan 10 17:42:21 2011 -0800 IB/qib: Reset packet list after freeing Reset the list pointers after freeing the SDMA packet list. This is done to any potential double-free cases. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit a0a234d47dcacfdb0a8dfcb861e0bd8300702674 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: New SERDES init routine and improvements to SI quality Implement new SERDES initialization routine and improvements to signal integrity -- disable LE1 adaptation, disable LOS after link-up, set better SERDES parameters. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 16028f27778cb6439516c36c0a72446d29805691 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: Clear WAIT_SEND flags when setting QP to error state If these flags are set when the QP is transitioned to the error state, it will wait until the flags are cleared, which may never happen if the error transition is due to a link going down. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 6676b3f746ff164a4a367c9aa5ae4b5b1145083c Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: Fix context allocation with multiple HCAs The driver was incorrectly choosing HCAs on which to allocate new user contexts based on overall count of usable ports regardless whether the usable port was on the currently selected HCA. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 5dbbcb97cc55dd6e0c34cf06f9e1ee181247d054 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: Fix multi-Florida HCA host panic on reboot Add check when setting configured contexts that the value does not exceed the number of contexts allocated for the card. If the value exceeds the already allocated count, set it to what is already allocated. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit b3d5cb2f2067b30da53aa67e42fdd733030fb411 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: Handle transitions from ACTIVE_DEFERRED to ACTIVE better When the link transitions from ACTIVE_DEFERRED to ACTIVE, the driver only sees the ACTIVE state. With this change, it will check whether the state was already ACTIVE and if so, it will not generated IB events and will not clear symbol error counts. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit c7665e5a6988450a6cc19c2dc1dff4d290077614 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:20 2011 -0800 IB/qib: UD send with immediate receive completion has wrong size The code to generate receive completion entries for UD send with immediate contains the wrong payload length. This is because when the code to compute the payload size was moved, the value of hdrsize didn't get moved too. The fix is to update tlen directly. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 3c9e5f4d657170c2fbc3d382d2daae3820713a6c Author: Mike Marciniszyn Date: Mon Jan 10 17:42:19 2011 -0800 IB/qib: Set port physical state even if other fields are invalid The IBTA vol. 1 release 1.2.1 spec. says: C14-24.2.1: If PortInfo:Portstate=Down, then a SubnSet(PortInfo) shall make any changes it specifies to PortInfo:PortPhysicalState; any other result is vendor-dependent. The patch changes the error handling so that the reply says there are invalid fields but still attempts to set fields that are in range including PortInfo:PortPhysicalState. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit a377acd15188cf11e47a67af5feea098cd8b25d2 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:19 2011 -0800 IB/qib: Generate completion callback on errors According to IBTA vol. 1, C11-30.1.1, a notification callback is invoked if the CQ is armed for the next solicited completion event or an error completion. The error case wasn't being generated correctly. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit f509f9c14d3f70834f964189293bed3e0e1fc839 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:19 2011 -0800 IB/qib: Add support for the new QME7362 card Add support to recognize another board variation named QME7362. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 0a43e117221702b08a023d6aa1a31ac30e40866b Author: Mike Marciniszyn Date: Mon Jan 10 17:42:19 2011 -0800 IB/qib: Add receive header queue size module parameters The receive header queue sizes need to modified for performance tuning. Three module parameters are added to support this. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 9d5b243f24212966d6d06058f96b2b1a22482f59 Author: Mike Marciniszyn Date: Mon Jan 10 17:42:19 2011 -0800 IB/qib: Remove IB latency turnoff This is required for hardware testing. Signed-off-by: Mike Marciniszyn Signed-off-by: Roland Dreier commit 601d87b0795c5affe5b73318c1088edbf10ce72f Author: Joe Perches Date: Mon Jan 10 17:42:14 2011 -0800 RDMA/nes: Fix string continuation line Signed-off-by: Joe Perches Signed-off-by: Roland Dreier commit d0444f1527f22d193c209d4fdad0dbabbf2be2ee Author: Dan Carpenter Date: Mon Jan 10 17:42:10 2011 -0800 IB/mthca: Handle -ENOMEM in forward_trap() ib_create_send_mad() can return ERR_PTR(-ENOMEM) here. Signed-off-by: Dan Carpenter Signed-off-by: Roland Dreier commit 1397490938aa0aca39001c3fd5a9fc9387110d86 Author: Dan Carpenter Date: Mon Jan 10 17:42:06 2011 -0800 IB/mlx4: Handle -ENOMEM in forward_trap() ib_create_send_mad() can return ERR_PTR(-ENOMEM) here. Signed-off-by: Dan Carpenter Signed-off-by: Roland Dreier commit 030b4b3309e29c6c857d8521c3076743663c259e Author: Ali Ayoub Date: Mon Jan 10 17:42:06 2011 -0800 mlx4_core: Avoid vunmap() of invalid pointer if allocation fails Signed-off-by: Ali Ayoub Signed-off-by: Roland Dreier commit 3afa9f19e5bd16abed998b7bf1b178206403286f Author: Vladimir Sokolovsky Date: Mon Jan 10 17:42:06 2011 -0800 IB/mlx4: Don't call dma_free_coherent() with irqs disabled mlx4_ib_free_cq_buf() should not be called under spin_lock_irq() since it calls dma_free_coherent(), which needs irqs enabled. Fix this by deferring the free to outside the locked region. This was found due to the WARN_ON(irqs_disabled()); in swiotlb_free_coherent(). Signed-off-by: Vladimir Sokolovsky Signed-off-by: Roland Dreier commit f5a49539a64ae5e3833fddec54a3c2524c7fe333 Author: Roland Dreier Date: Mon Jan 10 17:42:05 2011 -0800 mlx4_core: Remove warning message about firmware bug The kernel warning message added in commit 58d74bb1d9f7 ("mlx4_core: Workaround firmware bug in query dev cap") about mlx4 reporting the wrong number of "blue flame registers" doesn't really help anyone, since the firmware bug is known and fixed and the bug is pretty much harmless to users. So just get rid of the warning. Signed-off-by: Roland Dreier commit 8ae31e5b1fc73751d800d551fb30340caa53c7dd Author: Or Gerlitz Date: Mon Jan 10 17:41:55 2011 -0800 IPoIB: Add GRO support Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 19e364f6801e38972673278adedaab1abf6f854c Author: Or Gerlitz Date: Mon Jan 10 17:41:54 2011 -0800 IPoIB: Remove LRO support As a first step in moving from LRO to GRO, revert commit af40da894e9 ("IPoIB: add LRO support"). Also eliminate the ethtool set_flags callback which isn't needed anymore. Finally, we need to include directly to get the declaration of restart_syscall() (which used to be included implicitly through ). Cc: Ben Hutchings Cc: Eric W. Biederman Cc: Vladimir Sokolovsky Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit 1eba27e87a85f6ed68905055bc9a7dbfb024c255 Author: Joe Perches Date: Mon Jan 10 17:41:50 2011 -0800 IB/ipath: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Roland Dreier commit db8b10167126d72829653690f57b9c7ca53c4d54 Author: Steve Wise Date: Mon Jan 10 17:41:43 2011 -0800 RDMA/cxgb4: Don't re-init wait object in init/fini paths Re-initializing the wait object in rdma_init()/rdma_fini() causes a timing window which can lead to a deadlock during close. Once this deadlock hits, all RDMA activity over the T4 device will be stuck. There's no need to re-init the wait object, so remove it. Signed-off-by: Steve Wise Cc: Signed-off-by: Roland Dreier commit c94310916390ac162e70c8c134bf70680c944a02 Author: Stephen Hemminger Date: Mon Jan 10 17:41:43 2011 -0800 RDMA/cxgb3,cxgb4: Remove dead code This removes unused code found by running 'make namespacecheck'; compile tested only. Signed-off-by: Stephen Hemminger Acked-by: Steve Wise Signed-off-by: Roland Dreier commit 5b2eef966cb2ae307aa4ef1767f7307774bc96ca Merge: 8adbf8d 56bec7c Author: Linus Torvalds Date: Mon Jan 10 17:11:39 2011 -0800 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: (390 commits) drm/radeon/kms: disable underscan by default drm/radeon/kms: only enable hdmi features if the monitor supports audio drm: Restore the old_fb upon modeset failure drm/nouveau: fix hwmon device binding radeon: consolidate asic-specific function decls for pre-r600 vga_switcheroo: comparing too few characters in strncmp() drm/radeon/kms: add NI pci ids drm/radeon/kms: don't enable pcie gen2 on NI yet drm/radeon/kms: add radeon_asic struct for NI asics drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init drm/radeon/kms: add ucode loader for NI drm/radeon/kms: add support for DCE5 display LUTs drm/radeon/kms: add ni_reg.h drm/radeon/kms: add bo blit support for NI drm/radeon/kms: always use writeback/events for fences on NI drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5 drm/radeon/kms: add backend map workaround for barts drm/radeon/kms: fill gpu init for NI asics drm/radeon/kms: add disabled vbios accessor for NI asics drm/radeon/kms: handle NI thermal controller ... commit 8adbf8d46718a8f110de55ec82c40d04d0c362cc Merge: 0be8c8b 0cc43a1 Author: Linus Torvalds Date: Mon Jan 10 17:09:13 2011 -0800 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: Constify i2c_client where possible i2c-algo-bit: Complain about masters which can't read SCL i2c-algo-bit: Refactor adapter registration i2c: Add generic I2C multiplexer using GPIO API i2c-nforce2: Remove unnecessary cast of pci_get_drvdata i2c-i801: Include commit 0be8c8bd1de21d75ef14eb6af35b664f70a35746 Merge: e54be89 a780c6e Author: Linus Torvalds Date: Mon Jan 10 17:06:08 2011 -0800 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: (52 commits) Blackfin: encode cpu-rev into uImage name Blackfin: bf54x: don't ack GPIO ints when unmasking them Blackfin: sram_free_with_lsl: do not ignore return value of sram_free Blackfin: boards: add missing "static" to peripheral lists Blackfin: DNP5370: new board port Blackfin: bf518f-ezbrd: fix dsa resources Blackfin: move "-m elf32bfin" to general LDFLAGS Blackfin: kgdb_test: make sure to initialize num2 Blackfin: kgdb: disable preempt schedule when running single step in kgdb Blackfin: kgdb: disable interrupt when single stepping in ADEOS Blackfin: SMP: kgdb: apply anomaly 257 work around Blackfin: fix building IPIPE code when XIP is enabled Blackfin: SMP: kgdb: flush core internal write buffer before flushinv Blackfin: sport_uart resources: remove unused secondary RX/TX pins Blackfin: tll6527m: fix spelling in unused code (struct name) Blackfin: bf527-ezkit: add adau1373 chip address Blackfin: no-mpu: fix masking of small uncached dma region Blackfin: pm: drop irq save/restore in standby and suspend to mem callback MAINTAINERS: update Analog Devices support info Blackfin: dpmc.h: pull in new pll.h ... commit 3d03e2ea74103a50c23d6ab1906cf73399c0dafb Author: Arnaldo Carvalho de Melo Date: Mon Jan 10 21:37:57 2011 -0200 perf session: Fix infinite loop in __perf_session__process_events In this if statement: if (head + event->header.size >= mmap_size) { if (mmaps[map_idx]) { munmap(mmaps[map_idx], mmap_size); mmaps[map_idx] = NULL; } page_offset = page_size * (head / page_size); file_offset += page_offset; head -= page_offset; goto remap; } With, for instance, these values: head=2992 event->header.size=48 mmap_size=3040 We end up endlessly looping back to remap. Off by one. Problem introduced in 55b4462. Reported-by: Linus Torvalds Reported-by: Ingo Molnar Reported-by: David Ahern Bisected-by: David Ahern Tested-by: David Ahern Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 42b82dc19dfdcab931fb67175996a881ce254145 Author: hayeswang Date: Mon Jan 10 02:07:25 2011 +0000 net/r8169: Update the function of parsing firmware Update rtl_phy_write_fw function. The new function could parse the complex firmware which is used by RTL8111E and later. The new firmware may read data and do some operations, not just do writing only. Signed-off-by: Hayes Wang Signed-off-by: David S. Miller commit 96545aeb7b4457594d764af4d689a738e97f14b8 Author: Changli Gao Date: Thu Jan 6 13:37:36 2011 +0000 net: ppp: use {get,put}_unaligned_be{16,32} Signed-off-by: Changli Gao Reviewed-by: Harvey Harrison Signed-off-by: David S. Miller commit d7b92affba524e0ca848a5ab60649fb91190d9b5 Author: Kumar Sanghvi Date: Fri Jan 7 01:57:08 2011 +0000 CAIF: Fix IPv6 support in receive path for GPRS/3G Checks version field of IP in the receive path for GPRS/3G data and appropriately sets the value of skb->protocol. Signed-off-by: Sjur Braendeland Signed-off-by: David S. Miller commit 545ecdc3b3a2fe0b54a3053bf8bf85321bbca7da Author: Maxim Levitsky Date: Sat Jan 8 13:57:12 2011 +0000 arp: allow to invalidate specific ARP entries IPv4 over firewire needs to be able to remove ARP entries from the ARP cache that belong to nodes that are removed, because IPv4 over firewire uses ARP packets for private information about nodes. This information becomes invalid as soon as node drops off the bus and when it reconnects, its only possible to start talking to it after it responded to an ARP packet. But ARP cache prevents such packets from being sent. Signed-off-by: Maxim Levitsky Signed-off-by: David S. Miller commit e54be894eae10eca9892e965cc9532f5d5a11767 Merge: 949f671 c6c0ac6 Author: Linus Torvalds Date: Mon Jan 10 16:10:33 2011 -0800 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: driver core: Document that device_rename() is only for networking sysfs: remove useless test from sysfs_merge_group driver-core: merge private parts of class and bus driver core: fix whitespace in class_attr_string commit bfe0d0298f2a67d94d58c39ea904a999aeeb7c3c Author: Eric Dumazet Date: Sun Jan 9 08:30:54 2011 +0000 net_sched: factorize qdisc stats handling HTB takes into account skb is segmented in stats updates. Generalize this to all schedulers. They should use qdisc_bstats_update() helper instead of manipulating bstats.bytes and bstats.packets Add bstats_update() helper too for classes that use gnet_stats_basic_packed fields. Note : Right now, TCQ_F_CAN_BYPASS shortcurt can be taken only if no stab is setup on qdisc. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f1593d2298acca8b6680100d622911827edb8b0a Author: Tom Herbert Date: Sun Jan 9 19:36:36 2011 +0000 mlx4: Call alloc_etherdev to allocate RX and TX queues Changed driver to call alloc_etherdev_mqs so that the number of TX and RX queues can be set to correct values in the netdev device. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 36909ea43814cba34f7c921e99cba33d770a54e1 Author: Tom Herbert Date: Sun Jan 9 19:36:31 2011 +0000 net: Add alloc_netdev_mqs function Added alloc_netdev_mqs function which allows the number of transmit and receive queues to be specified independenty. alloc_netdev_mq was changed to a macro to call the new function. Also added alloc_etherdev_mqs with same purpose. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 949f6711b83d2809d1ccb9d830155a65fdacdff9 Merge: 443e622 7959d55 Author: Linus Torvalds Date: Mon Jan 10 16:04:53 2011 -0800 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: (510 commits) staging: speakup: fix failure handling staging: usbip: remove double giveback of URB Staging: batman-adv: Remove batman-adv from staging Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize staging: hv: remove unneeded osd_schedule_callback staging: hv: convert channel_mgmt.c to not call osd_schedule_callback staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback staging: brcm80211: Fix WL_ logging macros Staging: IIO: DDS: AD9833 / AD9834 driver Staging: IIO: dds.h convenience macros Staging: IIO: Direct digital synthesis abi documentation staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE staging: brcm80211: Remove unused ETHER_TYPE_ #defines staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN staging: brcm80211: Convert ETHER_IS to is__ether_addr staging: brcm80211: Remove unused ether_ #defines and struct staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr staging: brcm80211: Remove unused #defines ETHER__LOCALADDR Staging: comedi: Fix checkpatch.pl issues in file s526.c ... Fix up trivial conflict in drivers/video/udlfb.c commit 0252208eb52f6fe8731a47804eddc7ba93f60a87 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 11:55:27 2011 -0200 perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1) And a test for it: [acme@felicio linux]$ perf test 1: vmlinux symtab matches kallsyms: Ok 2: detect open syscall event: Ok 3: detect open syscall event on all cpus: Ok [acme@felicio linux]$ Translating C the test does: 1. generates different number of open syscalls on each CPU by using sched_setaffinity 2. Verifies that the expected number of events is generated on each CPU It works as expected. 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 91b5c98c2e062f982423686c77b8bf31f37fa196 Author: Dan Rosenberg Date: Mon Jan 10 16:00:54 2011 -0800 caif: don't set connection request param size before copying data The size field should not be set until after the data is successfully copied in. Signed-off-by: Dan Rosenberg Signed-off-by: David S. Miller commit 56949d414acd30353fdba4b64876a0a7953a7b77 Author: Russell King Date: Mon Jan 10 23:55:59 2011 +0000 ARM: udelay: prevent math rounding resulting in short udelays We perform the microseconds to loops calculation using a number of multiplies and shift rights. Each shift right rounds down the resulting value, which can result in delays shorter than requested. Ensure that we always round up. Signed-off-by: Russell King commit 76d9cc454a8d0bb7484616a4b8136280068c8a8b Author: Jamie Iles Date: Mon Jan 10 11:05:06 2011 +0000 spi: tegra: don't treat NULL clk as an error Some platforms have been known to return NULL from clk_get() if they support only a single struct clk. Whilst tegra doesn't do this, make the drivers consistent with others. Signed-off-by: Jamie Iles Acked-by: Russell King Signed-off-by: Grant Likely commit 443e6221e465efa8efb752a8405a759ef1161af9 Merge: 0caca69 1a7d946 Author: Linus Torvalds Date: Mon Jan 10 15:39:48 2011 -0800 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: (36 commits) sony-laptop: support new hotkeys on the P, Z and EC series platform/x86: Consistently select LEDS Kconfig options sony-laptop: fix sparse non-ANSI function warning intel_ips: fix sparse non-ANSI function warning Support KHLB2 in the compal laptop driver acer-wmi: Enabled Acer Launch Manager mode [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf() acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state acer-wmi: Detect the WiFi/Bluetooth/3G devices available acer-wmi: Add 3G rfkill sysfs file acer-wmi: Add acer wmi hotkey events support platform/x86: Kconfig: Replace select by depends on ACPI_WMI ideapad: pass ideapad_priv as argument (part 2) ideapad: pass ideapad_priv as argument (part 1) ideapad: add markups, unify comments and return result when init ideapad: add hotkey support ideapad: let camera power control entry under platform driver ideapad: add platform driver for ideapad fujitsu-laptop: fix compiler warning on pnp_ids ... commit 0caca697a2d173c6beff3c24e7d9481b732bd131 Merge: ecacc6c 751c88a Author: Linus Torvalds Date: Mon Jan 10 15:39:23 2011 -0800 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: m68knommu: Need to check __get_user()/__put_user() result m68knommu: signal.c __user annotations m68knommu: Equivalent of "m68k: handle new gcc's" m68knommu: f_pcr has been gone since headers' merge m68knommu: Don't lose state if sigframe setup fails m68knommu: Handle multiple pending signals m68knommu: Switch to saner sigsuspend m68knommu: Don't bother with SA_ONESHOT m68k: Check __get_user()/__put_user() return value m68k: Missing syscall_trace() on sigreturn m68k: Fix stack mangling logics in sigreturn m68k: If we fail to set sigframe up, just leave regs alone... m68k: Don't lose state if sigframe setup fails m68k: Simplify the singlestepping handling in signals m68k: Switch to saner sigsuspend() m68k: Resetting sa_handler in local copy of k_sigaction is pointless m68k/sun3: Kill pte_unmap() warnings commit eda77982729b7170bdc9e8855f0682edf322d277 Author: Dave Chinner Date: Tue Jan 11 10:22:40 2011 +1100 xfs: serialise unaligned direct IOs When two concurrent unaligned, non-overlapping direct IOs are issued to the same block, the direct Io layer will race to zero the block. The result is that one of the concurrent IOs will overwrite data written by the other IO with zeros. This is demonstrated by the xfsqa test 240. To avoid this problem, serialise all unaligned direct IOs to an inode with a big hammer. We need a big hammer approach as we need to serialise AIO as well, so we can't just block writes on locks. Hence, the big hammer is calling xfs_ioend_wait() while holding out other unaligned direct IOs from starting. We don't bother trying to serialised aligned vs unaligned IOs as they are overlapping IO and the result of concurrent overlapping IOs is undefined - the result of either IO is a valid result so we let them race. Hence we only penalise unaligned IO, which already has a major overhead compared to aligned IO so this isn't a major problem. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 4d8d15812fd9bc96d0da11467d23e0373feae933 Author: Dave Chinner Date: Tue Jan 11 10:23:42 2011 +1100 xfs: factor common write setup code The buffered IO and direct IO write paths share a common set of checks and limiting code prior to issuing the write. Factor that into a common helper function. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 637bbc75d9fda57c7bc77ce5ee37e29a77a0520d Author: Dave Chinner Date: Tue Jan 11 10:17:30 2011 +1100 xfs: split buffered IO write path from xfs_file_aio_write Complete the split of the different write IO paths by splitting the buffered IO write path out of xfs_file_aio_write(). This makes the different mechanisms of the write patchs easier to follow. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit f0d26e860b6c496464c5c8165d7df08dabde01fa Author: Dave Chinner Date: Tue Jan 11 10:15:36 2011 +1100 xfs: split direct IO write path from xfs_file_aio_write The current xfs_file_aio_write code is a mess of locking shenanigans to handle the different locking requirements of buffered and direct IO. Start to clean this up by disentangling the direct IO path from the mess. This also removes the failed direct IO fallback path to buffered IO. XFS handles all direct IO cases without needing to fall back to buffered IO, so we can safely remove this unused path. This greatly simplifies the logic and locking needed in the write path. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 487f84f3f80bc6f00c59725e822653d3ec174b85 Author: Dave Chinner Date: Wed Jan 12 11:37:10 2011 +1100 xfs: introduce xfs_rw_lock() helpers for locking the inode We need to obtain the i_mutex, i_iolock and i_ilock during the read and write paths. Add a set of wrapper functions to neatly encapsulate the lock ordering and shared/exclusive semantics to make the locking easier to follow and get right. Note that this changes some of the exclusive locking serialisation in that serialisation will occur against the i_mutex instead of the XFS_IOLOCK_EXCL. This does not change any behaviour, and it is arguably more efficient to use the mutex for such serialisation than the rw_sem. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 4c5cfd1b4157fb75d43b44a147c2feba6422fc4f Author: Dave Chinner Date: Tue Jan 11 10:14:16 2011 +1100 xfs: factor post-write newsize updates Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit edafb6da9aa725e4de5fe758fe81644b6167f9a2 Author: Dave Chinner Date: Tue Jan 11 10:14:06 2011 +1100 xfs: factor common post-write isize handling code Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit a363f0c2030cb9781e7e458f4a9e354b6c43d7ce Author: Dave Chinner Date: Tue Jan 11 10:13:53 2011 +1100 xfs: ensure sync write errors are returned xfs_file_aio_write() only returns the error from synchronous flushing of the data and inode if error == 0. At the point where error is being checked, it is guaranteed to be > 0. Therefore any errors returned by the data or fsync flush will never be returned. Fix the checks so we overwrite the current error once and only if an error really occurred. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit ecacc6c70cf77a52a22af66c879873202522d6ce Merge: e773202 4bfc2b2 Author: Linus Torvalds Date: Mon Jan 10 14:52:44 2011 -0800 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] Avoid array overflow if there are too many cpus in SRAT table [IA64] Remove unlikely from cpu_is_offline [IA64] irq_ia64, use set_irq_chip [IA64] perfmon: Change vmalloc to vzalloc and drop memset. [IA64] eliminate race condition in smp_flush_tlb_mm commit e773202e227c8ebbf369b9b924e15cca4d93824b Merge: abf8792 d2a4097 Author: Linus Torvalds Date: Mon Jan 10 14:50:38 2011 -0800 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: ux500: allow 5500 and 8500 to be built together ux500: modem_irq is only for 5500 ux500: dynamic SOC detection ux500: rename MOP board Kconfig ux500: remove build-time changing macros commit abf8792d0e1b203e303ed1c02437e0e10a39dcda Merge: e0e736f e14411d Author: Linus Torvalds Date: Mon Jan 10 14:50:08 2011 -0800 Merge branch 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm: msm: add SMP support for msm msm: hotplug: support cpu hotplug on msm msm: timer: SMP timer support for msm msm: scm-boot: Support for setting cold/warm boot addresses msm: Secure Channel Manager (SCM) support commit 18cbc7d94c1248fdc850ef6bac1cd8e22ef0738f Author: Enric Balletbo i Serra Date: Mon Jan 10 13:26:14 2011 +0000 omap3: igep2: Add keypad support Support twl4030 keypad and gpio keys on IGEP v2. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit a271c6cd209674118e5ec221de922bc59c0c9454 Author: Enric Balletbo i Serra Date: Mon Jan 10 13:26:13 2011 +0000 omap3: igep3: Fix IGEP module second MMC channel power supply The second MMC channel (used by the WLAN/BT module) is not linked to power regulator. This causes the WLAN/BT module to fail being detected if CONFIG_REGULATOR_DUMMY is not set. This patch adds the two regulators that actually feed the WLAN/BT module (1v8 from the TWL4030 VIO LDO, and a fixed 3v3). With that patch, the second channel is properly detected. Also change vmmc1 to use symbolic names instead of direct device reference. Signed-off-by: Enric Balletbo i Serra Acked-by: Marc Zyngier Signed-off-by: Tony Lindgren commit 11b8fca53a84992c74f05a091102c32eb40f1a08 Author: Timur Tabi Date: Mon Jan 10 13:28:32 2011 -0600 ASoC: cs4270: use the built-in register cache support Update the CS4270 driver to use ASoC's internal codec register cache feature. This change allows ASoC to perform the low-level I2C operations necessary to read the register cache. Support is also added for initializing the register cache with an array of known power-on default values. The CS4270 driver was handling the register cache itself, but somwhere along the conversion to multi-compaonent, this feature broke. Signed-off-by: Timur Tabi Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7b0d4b71f5b17f22914bc6b2e36c4cd7cdc56a28 Author: Enric Balletbo i Serra Date: Mon Jan 10 13:26:12 2011 +0000 omap3: igep3: Add USB EHCI support for IGEP module The OMAP3 IGEP module has one EHCI interface on board using USB2HS port. GPIO183 is used as PHY reset. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 274353674dd0337bdeeaee08a9f2047777b07ab0 Merge: 1740d48 d7cd5c7 Author: Tony Lindgren Date: Mon Jan 10 14:23:41 2011 -0800 Merge branch 'ehci-omap-clock' into omap-fixes commit d7cd5c73cec2dfa9f259a2adcf802c9f8fcc125f Author: Santosh Shilimkar Date: Sun Jan 9 22:16:13 2011 +0000 omap3: clocks: Fix build error 'CK_3430ES2' undeclared here At latest mainline commit 0c21e3aaf6a, omap2plus build is broken. This patch is trivial fix for the missed usb clock node for CK_3430ES2PLUS flag update. CHK include/generated/compile.h CC arch/arm/mach-omap2/clock3xxx_data.o arch/arm/mach-omap2/clock3xxx_data.c:3289: error: 'CK_3430ES2' undeclared here (not in a function) make[1]: *** [arch/arm/mach-omap2/clock3xxx_data.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Signed-off-by: Santosh Shilimkar Acked-by: Anand Gadiyar Acked-by: Paul Walmsley [tony@atomide.com: updated mask to include CK_36XX] Signed-off-by: Tony Lindgren commit 80ce3f67e75ffa14ad99b26457a7e9558b8b001a Author: Casey Leedom Date: Mon Jan 10 13:53:43 2011 -0800 cxgb4vf: fix mailbox data/control coherency domain race For the VFs, the Mailbox Data "registers" are actually backed by T4's "MA" interface rather than PL Registers (as is the case for the PFs). Because these are in different coherency domains, the write to the VF's PL-register-backed Mailbox Control can race in front of the writes to the MA-backed VF Mailbox Data "registers". So we need to do a read-back on at least one byte of the VF Mailbox Data registers before doing the write to the VF Mailbox Control register. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit b11a25aaeccc29d5090d1ce9776af20e3ee99ab9 Author: amit salecha Date: Mon Jan 10 00:15:23 2011 +0000 qlcnic: change module parameter permissions o Updating module parameter after driver load is not supported except auto_fw_reset parameter. Changing these parameter after driver load, can have weird result. o Update driver version to 5.0.15. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 13b93ed924a82affd1e3a48f631cbb12c552199d Author: Sony Chacko Date: Mon Jan 10 00:15:22 2011 +0000 qlcnic: fix ethtool diagnostics test IRQ diag test was getting executed only when both register test and link test passed. The test should get executed if ETH_TEST_FL_OFFLINE flag is set. Signed-off-by: Sony Chacko Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 0e5f20b656c14d91efe61240d44b6f4b53ea939e Author: amit salecha Date: Mon Jan 10 00:15:21 2011 +0000 qlcnic: fix flash fw version read Driver is reading flash fw version from defined address, this address may be invalid. Indeed Driver should read address for fw version through flash layout table. Flash layout table has defined region and address for fw version address should be read from fw image region. Driver has check for old firmware, this bug can cause driver load fail. This patch will try to read fw version from flash image region, if that fails, read from defined address. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit facb4edc1e0e849ea98e147a821e60d6d6272c0a Author: Dan Carpenter Date: Mon Jan 10 04:06:58 2011 +0000 phonet: some signedness bugs Dan Rosenberg pointed out that there were some signed comparison bugs in the phonet protocol. http://marc.info/?l=full-disclosure&m=129424528425330&w=2 The problem is that we check for array overflows but "protocol" is signed and we don't check for array underflows. If you have already have CAP_SYS_ADMIN then you could use the bugs to get root, or someone could cause an oops by mistake. Signed-off-by: Dan Carpenter Acked-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit c599bd6b9ac8926b03e6bf332a8c14ae2ffb43a3 Author: Mike Frysinger Date: Mon Jan 10 02:54:32 2011 +0000 netdev: bfin_mac: let boards set vlan masks Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 2d70a3d42de642e1d78355338b63cf064dc0f345 Author: Sonic Zhang Date: Mon Jan 10 02:54:33 2011 +0000 netdev: bfin_mac: disable hardware checksum if writeback cache is enabled With writeback caches, corrupted RX packets will be sent up the stack without any error markings. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 53ed29841dfffa71c68e5cd3e601da195235ff5b Author: Mike Frysinger Date: Mon Jan 10 02:54:31 2011 +0000 netdev: bfin_mac: drop unused Mac data We don't use this local "Mac" data anywhere (since we rely on the netdev's storage), so punt it. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 5ca1bb5aceb0bccf532ffc21588585a925cdee20 Author: Mike Frysinger Date: Mon Jan 10 02:54:30 2011 +0000 netdev: bfin_mac: mark setup_system_regs as static No need for this to be exported since it is only used in this driver. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit c6dd5098f47268976f7d0af3dad29084fd8b6b98 Author: Mike Frysinger Date: Mon Jan 10 02:54:29 2011 +0000 netdev: bfin_mac: clean up printk messages Use netdev_* and pr_* helper funcs for output rather than printk. Signed-off-by: Mike Frysinger Signed-off-by: David S. Miller commit 0cc43a1806f078f7fd414850d8f1f1761696e4af Author: Jean Delvare Date: Mon Jan 10 22:11:23 2011 +0100 i2c: Constify i2c_client where possible Helper functions for I2C and SMBus transactions don't modify the i2c_client that is passed to them, so it can be marked const. Signed-off-by: Jean Delvare commit af5a60baaee66e2f891dbb9a8519ca28ab7da7cd Author: Jean Delvare Date: Mon Jan 10 22:11:23 2011 +0100 i2c-algo-bit: Complain about masters which can't read SCL The I2C specification explicitly describes both SDA and SCL as bidirectional lines. An I2C master with a read-only SCL is thus not compliant. If a slow slave stretches the clock, errors will happen, so the bus can't be considered as reliable. Signed-off-by: Jean Delvare commit f451171c5ac829e55581c81caf2cb01e1c0a5c5f Author: Jean Delvare Date: Mon Jan 10 22:11:23 2011 +0100 i2c-algo-bit: Refactor adapter registration Use a function pointer to decide whether to call i2c_add_adapter or i2c_add_numbered_adapter. This makes the code more compact than the current strategy of having the common code in a separate function. Signed-off-by: Jean Delvare commit 92ed1a76ca31774eb27de14b2215841367c68056 Author: Peter Korsgaard Date: Mon Jan 10 22:11:23 2011 +0100 i2c: Add generic I2C multiplexer using GPIO API Add an i2c mux driver providing access to i2c bus segments using a hardware MUX sitting on a master bus and controlled through gpio pins. E.G. something like: ---------- ---------- Bus segment 1 - - - - - | | SCL/SDA | |-------------- | | | |------------| | | | | | Bus segment 2 | | | Linux | GPIO 1..N | MUX |--------------- Devices | |------------| | | | | | | | Bus segment M | | | |---------------| | ---------- ---------- - - - - - SCL/SDA of the master I2C bus is multiplexed to bus segment 1..M according to the settings of the GPIO pins 1..N. Signed-off-by: Peter Korsgaard Signed-off-by: Jean Delvare commit b18a5c80eb2e7e9c72d23f1960b09d78ddf7e5b0 Author: Joe Perches Date: Mon Jan 10 22:11:22 2011 +0100 i2c-nforce2: Remove unnecessary cast of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: Jean Delvare commit 665a96b70bfccec6eab2e8d3c770e357e14294ea Author: Ben Hutchings Date: Mon Jan 10 22:11:22 2011 +0100 i2c-i801: Include Commit 5a0e3ad6af8660be21ca98a971cd00f331318c05 added direct inclusion of to those source files that appeared to need it, but somehow missed this. On most architectures is still indirectly included, but there are exceptions such as alpha. Signed-off-by: Ben Hutchings Signed-off-by: Jean Delvare commit e6e1ee936d61d697735d17517678a626b7701ce4 Author: Jens Axboe Date: Mon Jan 10 21:50:33 2011 +0100 cciss: reinstate proper FIFO order of command queue list Commit 8a3173de inadvertently changed the ordering when switching to hlists. Change to regular list heads so we can use tail list adds, this improves performance. Signed-off-by: Jens Axboe commit 9af762719e8f8fa282de02997dced593030eb238 Author: David Dillow Date: Fri Nov 26 15:34:46 2010 -0500 IB/srp: consolidate hot-path variables into cache lines Put the variables accessed together in the hot-path into common cachelines, and separate them by RW vs RO to avoid false dirtying. We keep a local copy of the lkey and rkey in the target to avoid traversing pointers (and associated cache lines) to find them. Reviewed-by: Bart Van Assche Signed-off-by: David Dillow commit e9684678221441f886b4d7c74f8770bb0981737a Author: Bart Van Assche Date: Fri Nov 26 15:08:38 2010 -0500 IB/srp: stop sharing the host lock with SCSI We don't need protection against the SCSI stack, so use our own lock to allow parallel progress on separate CPUs. Signed-off-by: Bart Van Assche [ broken out and small cleanups by David Dillow ] Signed-off-by: David Dillow commit 94a9174c630c8465ed9e97ecd242993429930c05 Author: Bart Van Assche Date: Fri Nov 26 14:50:09 2010 -0500 IB/srp: reduce lock coverage of command completion We only need the lock to cover list and credit manipulations, so push those into srp_remove_req() and update the call chains. We reorder the request removal and command completion in srp_process_rsp() to avoid the SCSI mid-layer sending another command before we've released our request and added any credits returned by the target. This prevents us from returning HOST_BUSY unneccesarily. Signed-off-by: Bart Van Assche [ broken out, small cleanups, and modified to avoid potential extraneous HOST_BUSY returns by David Dillow ] Signed-off-by: David Dillow commit 76c75b258f1fe6abac6af2356989ad4d6518886e Author: Bart Van Assche Date: Fri Nov 26 14:37:47 2010 -0500 IB/srp: reduce local coverage for command submission and EH We only need locks to protect our lists and number of credits available. By pre-consuming the credit for the request, we can reduce our lock coverage to just those areas. If we don't actually send the request, we'll need to put the credit back into the pool. Signed-off-by: Bart Van Assche [ broken out and small cleanups by David Dillow ] Signed-off-by: David Dillow commit 536ae14e7588e85203d4b4147c041309be5b3efb Author: Bart Van Assche Date: Fri Nov 26 13:58:27 2010 -0500 IB/srp: don't move active requests to their own list We use req->scmnd != NULL to indicate an active request, so there's no need to keep a separate list for them. We can afford the array iteration during error handling, and dropping it gives us one less item that needs lock protection. Signed-off-by: Bart Van Assche [ broken out and small cleanups by David Dillow ] Signed-off-by: David Dillow commit 4e5518ca53be29c1ec3c00089c97bef36bfed515 Author: Stanislaw Gruszka Date: Mon Jan 10 12:56:05 2011 +0100 hostap_cs: fix sleeping function called from invalid context pcmcia_request_irq() and pcmcia_enable_device() are intended to be called from process context (first function allocate memory with GFP_KERNEL, second take a mutex). We can not take spin lock and call them. It's safe to move spin lock after pcmcia_enable_device() as we still hold off IRQ until dev->base_addr is 0 and driver will not proceed with interrupts when is not ready. Patch resolves: https://bugzilla.redhat.com/show_bug.cgi?id=643758 Reported-and-tested-by: rbugz@biobind.com Cc: stable@kernel.org # 2.6.34+ Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 3c4a8cc46e8cc17910020964689f3faf6bffb8ad Author: Indan Zupancic Date: Sat Jan 8 12:17:27 2011 +0100 ipw2200: Check for -1 INTA in tasklet too. This is an attempt to fix a long standing open bug: http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=1334 The interrupt handler checks for INTA being -1, apparently that means that the hardware is gone. But the interrupt handler defers actual interrupt processing to a tasklet. By the time the tasklet is run and checks INTA again, the hardware might be gone and INTA be -1, which confuses the driver because all event bits are set. The patch applies to 2.6.37. Signed-off-by: Indan Zupancic Signed-off-by: John W. Linville commit ed70c6e60ee51b0fb46752ab4fd372a071da59d8 Author: Michael Büsch Date: Fri Jan 7 19:48:05 2011 +0100 ssb: Ignore dangling ethernet cores on wireless devices Some Broadcom based wireless devices contain dangling ethernet cores. This triggers the ssb probing mechanism and tries to load the b44 driver on this core. Ignore the dangling core in the ssb core scanning code to avoid access to the core and failure of b44 probing. Signed-off-by: Michael Buesch Tested-by: Larry Finger Signed-off-by: John W. Linville commit 3b5c5827d1f80ad8ae844a8b1183f59ddb90fe25 Author: Christian Lamparter Date: Thu Jan 6 23:47:52 2011 +0100 p54: fix sequence no. accounting off-by-one error P54_HDR_FLAG_DATA_OUT_SEQNR is meant to tell the firmware that "the frame's sequence number has already been set by the application." Whereas IEEE80211_TX_CTL_ASSIGN_SEQ is set for frames which lack a valid sequence number and either the driver or firmware has to assign one. Yup, it's the exact opposite! Cc: Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 016134eee334d51262f10ce3261976ea40a57878 Author: Johannes Berg Date: Thu Jan 6 22:36:47 2011 +0100 mac80211: add doc short section on LED triggers Just create a section to collect the LED trigger functions and add a very short description as to what drivers should do. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 45007fd590c6b099cec5d36ea7056b00f8b4916a Author: Johannes Berg Date: Thu Jan 6 22:36:46 2011 +0100 nl80211: add/fix mesh docs Some mesh attribute/command docs are missing or have errors in the name so they don't match, fix all of them. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f52555a4b2d229079155e6642ec09afa63d10cab Author: Johannes Berg Date: Thu Jan 6 22:36:45 2011 +0100 cfg80211: add mesh join/leave callback docs When I made the patch to add mesh join/leave I didn't pay attention to docs because it was a proof of concept, and then when we actually did merge it I forgot -- add docs now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 610dbc980f7ad886313278ce946287f24b44cf55 Author: Johannes Berg Date: Thu Jan 6 22:36:44 2011 +0100 mac80211: add missing docs for off-chan TX flag The flag is IEEE80211_TX_CTL_TX_OFFCHAN and I had added that in a previous patch but forgotten docs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 55de80d64545e5c4cca7f574fdf04b1f02a5f8fd Author: Sujith Manoharan Date: Wed Jan 5 01:06:21 2011 +0530 ath9k_htc: Really fix packet injection The chainmask value along with other configuration has to be set on the target for packet injection. Fix this and also move the monitor interface addition before the channel set segment to ensure that the opmode is updated properly. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 4976b4eb9d083f035aa97afec560c7e1c16c6afd Author: Johannes Berg Date: Tue Jan 4 13:02:32 2011 +0100 mac80211: add remain-on-channel docs Add documentation for the new callbacks that I forgot in the patch adding the callbacks. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6d50192c17d4481c0e34c1ed2ae24fd7bc16e121 Author: Sujith Manoharan Date: Tue Jan 4 13:43:39 2011 +0530 ath9k_hw: Fix RX handling for USB devices Commit "ath9k_hw: Abort rx if hw is not coming out of full sleep in reset" uncondionally added aborting RX DMA in a HW reset, though it is a bit unclear as to why this is needed. Anyway, RX DMA is handled in the target for USB devices, and this would interfere with normal operations (scanning etc.), so fix this. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 69bdacc8fbac32e4dc804ab13cafe3c1bbdcba9d Author: Sujith Manoharan Date: Tue Jan 4 13:17:05 2011 +0530 ath9k_hw: Fix thermal issue with UB94 Hardcode the output voltage of x-PA bias LDO to the lowest value for UB94. The card doesn't get too hot now. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 07422063d43612762d53fac8b6df213c96f4b1f6 Author: Sujith Manoharan Date: Tue Jan 4 13:16:54 2011 +0530 ath9k_hw: Fix calibration for AR9287 devices AR9287 based devices have issues with ADC gain calibration which would cause uplink throughput drops in HT40 mode. Remove ADC gain from the supported calibration algorithms. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 6cae913d6c06557fee81aa8a181eafcc9a76516a Author: Sujith Manoharan Date: Tue Jan 4 13:16:37 2011 +0530 ath9k_hw: Fix chip test USB devices do not require the chip test routine. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 7959d55679e4360205c9ebc89d40a5503c53bae2 Author: William Hubbs Date: Thu Dec 16 13:26:58 2010 -0600 staging: speakup: fix failure handling fix the failure handling in kobjects and the main function so that we release the virtual keyboard if we exit due to another failure. Signed-off-by: William Hubbs Signed-off-by: Greg Kroah-Hartman commit 7571f089d7522a95c103558faf313c7af8856ceb Author: Márton Németh Date: Mon Dec 13 21:59:09 2010 +0100 staging: usbip: remove double giveback of URB In the vhci_urb_dequeue() function the TCP connection is checked twice. Each time when the TCP connection is closed the URB is unlinked and given back. Remove the second attempt of unlinking and giving back of the URB completely. This patch fixes the bug described at https://bugzilla.kernel.org/show_bug.cgi?id=24872 . Signed-off-by: Márton Németh Cc: stable Signed-off-by: Greg Kroah-Hartman commit 68c404b18f6fba404b2753622d0459c68ee128ae Merge: d035c36 6650239 Author: Trond Myklebust Date: Mon Jan 10 14:48:02 2011 -0500 Merge branch 'bugfixes' into nfs-for-2.6.38 Conflicts: fs/nfs/nfs2xdr.c fs/nfs/nfs3xdr.c fs/nfs/nfs4xdr.c commit 6650239a4b01077e80d5a4468562756d77afaa59 Author: Trond Myklebust Date: Sat Jan 8 17:45:38 2011 -0500 NFS: Don't use vm_map_ram() in readdir vm_map_ram() is not available on NOMMU platforms, and causes trouble on incoherrent architectures such as ARM when we access the page data through both the direct and the virtual mapping. The alternative is to use the direct mapping to access page data for the case when we are not crossing a page boundary, but to copy the data into a linear scratch buffer when we are accessing data that spans page boundaries. Signed-off-by: Trond Myklebust Tested-by: Marc Kleine-Budde Cc: stable@kernel.org [2.6.37] commit e0e736fc0d33861335e2a132e4f688f7fd380c61 Merge: a089488 aeda4ac Author: Linus Torvalds Date: Mon Jan 10 11:18:59 2011 -0800 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: (30 commits) MAINTAINERS: Add tomoyo-dev-en ML. SELinux: define permissions for DCB netlink messages encrypted-keys: style and other cleanup encrypted-keys: verify datablob size before converting to binary trusted-keys: kzalloc and other cleanup trusted-keys: additional TSS return code and other error handling syslog: check cap_syslog when dmesg_restrict Smack: Transmute labels on specified directories selinux: cache sidtab_context_to_sid results SELinux: do not compute transition labels on mountpoint labeled filesystems This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running. SELinux: merge policydb_index_classes and policydb_index_others selinux: convert part of the sym_val_to_name array to use flex_array selinux: convert type_val_to_struct to flex_array flex_array: fix flex_array_put_ptr macro to be valid C SELinux: do not set automatic i_ino in selinuxfs selinux: rework security_netlbl_secattr_to_sid SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in selinuxfs.c SELinux: standardize return code handling in policydb.c ... commit 1740d483ba4d79f9fa6984dccd7152b6b208f1bf Author: Anand Gadiyar Date: Mon Jan 10 14:42:15 2011 +0000 arm: omap4: pandaboard: turn on PHY reference clock at init The SMSC 3320 USB PHY on the OMAP4 Pandaboard needs a 19.2 MHz reference clock. This clock is provided from the OMAP4's fref_clk3 pad. Recent changes to clock44xx_data.c made the clock framework aware of the existence of these fref_clk[i] lines. If the option CONFIG_OMAP_RESET_CLOCKS is enabled in the kernel, then the clock framework will turn these clocks off during bootup. Explicitly request and keep this clock enabled at init for the Pandaboard, so that the PHY receives this clock at all times. Reported-by: Ming Lei Signed-off-by: Anand Gadiyar Cc: Benoit Cousson Reviewed-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 83723d60717f8da0f53f91cf42a845ed56c09662 Author: Eric Dumazet Date: Mon Jan 10 20:11:38 2011 +0100 netfilter: x_tables: dont block BH while reading counters Using "iptables -L" with a lot of rules have a too big BH latency. Jesper mentioned ~6 ms and worried of frame drops. Switch to a per_cpu seqlock scheme, so that taking a snapshot of counters doesnt need to block BH (for this cpu, but also other cpus). This adds two increments on seqlock sequence per ipt_do_table() call, its a reasonable cost for allowing "iptables -L" not block BH processing. Reported-by: Jesper Dangaard Brouer Signed-off-by: Eric Dumazet CC: Patrick McHardy Acked-by: Stephen Hemminger Acked-by: Jesper Dangaard Brouer Signed-off-by: Pablo Neira Ayuso commit 9d084a3d5dffd076a9a006164ea0dbd9c495f2b0 Author: Fabien Marteau Date: Mon Jan 10 11:01:13 2011 -0800 Input: add Austria Microsystem AS5011 joystick driver This is driver for EasyPoint AS5011 2 axis joystick chip. This chip is plugged on an I2C bus. Tested on ARM processor (i.MX27). Signed-off-by: Fabien Marteau Signed-off-by: Dmitry Torokhov commit d96336b05d718b03ff03c94c0dc0cc283a29d534 Author: Josh Hunt Date: Mon Dec 27 13:46:38 2010 -0800 ext2: Resolve 'dereferencing pointer to incomplete type' when enabling EXT2_XATTR_DEBUG When I enable EXT2_XATTR_DEBUG in fs/ext2/xattr.c I get a build error stating the following: CC fs/ext2/xattr.o fs/ext2/xattr.c: In function 'ext2_xattr_cache_insert': fs/ext2/xattr.c:841: error: dereferencing pointer to incomplete type fs/ext2/xattr.c:846: error: dereferencing pointer to incomplete type make[2]: *** [fs/ext2/xattr.o] Error 1 make[1]: *** [fs/ext2] Error 2 make: *** [fs] Error 2 These lines reference ext2_xattr_cache->c_entry_count which is defined in struct mb_cache. struct mb_cache is currently only defined in fs/mbcache.c. Moving struct mb_cache definition to include/linux/mbcache.h to resolve the issue. Signed-off-by: Josh Hunt Signed-off-by: Jan Kara commit 8057b9653923bd762d89ccb730c76cba40ce96f0 Author: Tobias Klauser Date: Thu Dec 9 15:39:34 2010 +0100 ext3: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Jan Kara commit 0ed0cca7aa87b1f5708f597075013c20d8359667 Author: Tobias Klauser Date: Thu Dec 9 15:39:00 2010 +0100 ext2: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Jan Kara commit a4ae3094869f18e26ece25ad175bbe4cd740e60b Author: Eric Sandeen Date: Tue Dec 7 11:55:27 2010 -0600 ext3: speed up file creates by optimizing rec_len functions 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, thanks to page size limits. Similar changes already exist in the ext4 codebase. The directory entry checking can also be optimized a bit by sprinkling in some unlikely() conditions to move the error handling out of line. bonnie++ sequential file creates on a 512MB ramdisk speeds up from about 77,000/s to about 82,000/s, about a 6% improvement. Signed-off-by: Eric Sandeen Signed-off-by: Jan Kara commit 40a063f6691ce937a3d00c9700b6964b5ec4e022 Author: Eric Sandeen Date: Tue Dec 7 11:51:05 2010 -0600 ext2: speed up file creates by optimizing rec_len functions 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, thanks to page size limits. The directory entry checking can also be optimized a bit by sprinkling in some unlikely() conditions to move the error handling out of line. bonnie++ sequential file creates on a 512MB ramdisk speeds up from about 2200/s to about 2500/s, about a 14% improvement. Signed-off-by: Eric Sandeen Signed-off-by: Jan Kara commit 156e74312f1ffc0a2639c24c771c5a0e106f0505 Author: Namhyung Kim Date: Thu Nov 25 01:53:13 2010 +0900 ext3: Add more journal error check Check return value of ext3_journal_get_write_acccess() and ext3_journal_dirty_metadata(). Signed-off-by: Namhyung Kim Signed-off-by: Jan Kara commit 41dc6385bd6cd3366c1b4bede33688521eb21db9 Author: Namhyung Kim Date: Thu Nov 25 01:53:12 2010 +0900 ext3: Add journal error check in resize.c Check return value of ext3_journal_get_write_access() and ext3_journal_dirty_metadata(). Signed-off-by: Namhyung Kim Signed-off-by: Jan Kara commit 055adcbd7da75868697e767adc4f3272f6cae76c Author: Joe Perches Date: Tue Nov 23 18:49:54 2010 -0800 quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout Use %pV in __quota_error so a single printk can not be interleaved with other logging messages. Add __attribute__((format (printf, 3, 4))) so format and arguments can be verified by compiler. Make sure printk formats and arguments match. Block # needed a pointer dereference. Signed-off-by: Joe Perches Signed-off-by: Jan Kara commit 9c52749232b5cef506877ac633ea14083bd17e02 Author: Lukas Czerner Date: Mon Nov 22 12:29:18 2010 +0100 ext3: Add FITRIM handling The ioctl takes fstrim_range structure (defined in include/linux/fs.h) as an argument specifying a range of filesystem to trim and the minimum size of an continguous extent to trim. After the FITRIM is done, the number of bytes passed from the filesystem down the block stack to the device for potential discard is stored in fstrim_range.len. This number is a maximum discard amount from the storage device's perspective, because FITRIM called repeatedly will keep sending the same sectors for discard. fstrim_range.len will report the same potential discard bytes each time, but only sectors which had been written to between the discards would actually be discarded by the storage device. Further, the kernel block layer reserves the right to adjust the discard ranges to fit raid stripe geometry, non-trim capable devices in a LVM setup, etc. These reductions would not be reflected in fstrim_range.len. Thus fstrim_range.len can give the user better insight on how much storage space has potentially been released for wear-leveling, but it needs to be one of only one criteria the userspace tools take into account when trying to optimize calls to FITRIM. Thanks to Greg Freemyer for better commit message. Signed-off-by: Lukas Czerner Signed-off-by: Jan Kara commit b853b96b1dbdc05fc8eae141a595366d8172962b Author: Lukas Czerner Date: Mon Nov 22 12:29:17 2010 +0100 ext3: Add batched discard support for ext3 Walk through allocation groups and trim all free extents. It can be invoked through FITRIM ioctl on the file system. The main idea is to provide a way to trim the whole file system if needed, since some SSD's may suffer from performance loss after the whole device was filled (it does not mean that fs is full!). It search for free extents in allocation groups specified by Byte range start -> start+len. When the free extent is within this range, blocks are marked as used and then trimmed. Afterwards these blocks are marked as free in per-group bitmap. [JK: Fixed up error handling and trimming of a single group] Signed-off-by: Lukas Czerner Reviewed-by: Jan Kara Reviewed-by: Dmitry Monakhov Signed-off-by: Jan Kara commit d002ebf1d8daa5a317645b1c4a3a0b7ea2abc9ac Author: Eric Sandeen Date: Mon Jan 10 13:03:35 2011 -0500 ext4: don't pass entire map to check_eofblocks_fl Since check_eofblocks_fl() only uses the m_lblk portion of the map structure, we may as well pass that directly, rather than passing the entire map, which IMHO obfuscates what parameters check_eofblocks_fl() cares about. Not a big deal, but seems tidier and less confusing, to me. Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit 1c5b9e9065567876c2d4a7a16d78f0fed154a5bf Author: Theodore Ts'o Date: Mon Jan 10 12:51:28 2011 -0500 ext4: fix memory leak in ext4_free_branches Commit 40389687 moved a call to ext4_forget() out of ext4_free_branches and let ext4_free_blocks() handle calling bforget(). But that change unfortunately did not replace the call to ext4_forget() with brelse(), which was needed to drop the in-use count of the indirect block's buffer head, which lead to a memory leak when deleting files that used indirect blocks. Fix this. Thanks to Hugh Dickins for pointing this out. Cc: stable@kernel.org Signed-off-by: "Theodore Ts'o" commit a5196f8cdfbf6ccb20f093aaf48852d6d23b4e0b Author: Theodore Ts'o Date: Mon Jan 10 12:47:07 2011 -0500 ext4: remove ext4_mb_return_to_preallocation() This function was never implemented, except for a BUG_ON which was tripping when ext4 is run without a journal. The problem is that although the comment asserts that "truncate (which is the only way to free block) discards all preallocations", ext4_free_blocks() is also called in various error recovery paths when blocks have been allocated, but for various reasons, we were not able to use those data blocks (for example, because we ran out of memory while trying to manipulate the extent tree, or some other similar situation). In addition to the fact that this function isn't implemented except for the incorrect BUG_ON, the single caller of this function, ext4_free_blocks(), doesn't use it all if the journal is enabled. So remove the (stub) function entirely for now. If we decide it's better to add it back, it's only going to be useful with a relatively large number of code changes anyway. Google-Bug-Id: 3236408 Cc: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit 3889fd57ea3c58209354862523275774fca9db03 Author: Jiaying Zhang Date: Mon Jan 10 12:47:05 2011 -0500 ext4: flush the i_completed_io_list during ext4_truncate Ted first found the bug when running 2.6.36 kernel with dioread_nolock mount option that xfstests #13 complained about wrong file size during fsck. However, the bug exists in the older kernels as well although it is somehow harder to trigger. The problem is that ext4_end_io_work() can happen after we have truncated an inode to a smaller size. Then when ext4_end_io_work() calls ext4_convert_unwritten_extents(), we may reallocate some blocks that have been truncated, so the inode size becomes inconsistent with the allocated blocks. The following patch flushes the i_completed_io_list during truncate to reduce the risk that some pending end_io requests are executed later and convert already truncated blocks to initialized. Note that although the fix helps reduce the problem a lot there may still be a race window between vmtruncate() and ext4_end_io_work(). The fundamental problem is that if vmtruncate() is called without either i_mutex or i_alloc_sem held, it can race with an ongoing write request so that the io_end request is processed later when the corresponding blocks have been truncated. Ted and I have discussed the problem offline and we saw a few ways to fix the race completely: a) We guarantee that i_mutex lock and i_alloc_sem write lock are both hold whenever vmtruncate() is called. The i_mutex lock prevents any new write requests from entering writeback and the i_alloc_sem prevents the race from ext4_page_mkwrite(). Currently we hold both locks if vmtruncate() is called from do_truncate(), which is probably the most common case. However, there are places where we may call vmtruncate() without holding either i_mutex or i_alloc_sem. I would like to ask for other people's opinions on what locks are expected to be held before calling vmtruncate(). There seems a disagreement among the callers of that function. b) We change the ext4 write path so that we change the extent tree to contain the newly allocated blocks and update i_size both at the same time --- when the write of the data blocks is completed. c) We add some additional locking to synchronize vmtruncate() and ext4_end_io_work(). This approach may have performance implications so we need to be careful. All of the above proposals may require more substantial changes, so we may consider to take the following patch as a bandaid. Signed-off-by: Jiaying Zhang Signed-off-by: "Theodore Ts'o" commit b40971426a837e9dc9c66e1b6bbcb3874eafe4e0 Author: Theodore Ts'o Date: Mon Jan 10 12:46:59 2011 -0500 ext4: add error checking to calls to ext4_handle_dirty_metadata() Call ext4_std_error() in various places when we can't bail out cleanly, so the file system can be marked as in error. Signed-off-by: "Theodore Ts'o" commit 5a344a505093dd65f82f338ffdb7208321b3630e Author: Zhao Yakui Date: Mon Jan 10 16:35:45 2011 +0800 ACPI: Reevaluate whether the T-state is supported or not after cpu is online/offline After one CPU is offlined, it is unnecessary to switch T-state for it. So it will be better that the throttling is disabled after the cpu is offline. At the same time after one cpu is online, we should check whether the T-state is supported and then set the corresponding T-state flag. Signed-off-by: Zhao Yakui Signed-off-by: Len Brown commit daef1f35ea1e2cca125eecd5f078f40b55eb9105 Author: Zhao Yakui Date: Mon Jan 10 16:35:44 2011 +0800 ACPI: Check the returned value of set_cpus_allowed_ptr before T-state operation Now before it executes the T-state operation on one CPU, it will try to migrate to the target CPU. Especially this is required on the system that uses the MSR_IA32_THERMAL_CONTROL register to switch T-state. But unfortunately it doesn't check whether the migration is successful or not. In such case we will get/set the incorrect T-state on the offline CPU as it fails in the migration to the offline CPU. Signed-off-by: Zhao Yakui Signed-off-by: Len Brown commit d2a40972ec70bd2060d3c46050a101a9678d2991 Author: Rabin Vincent Date: Wed Dec 8 11:08:01 2010 +0530 ux500: allow 5500 and 8500 to be built together Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 5ec65521c99178a87f4c859101a92c36f4701fd7 Author: Rabin Vincent Date: Wed Dec 8 11:08:00 2010 +0530 ux500: modem_irq is only for 5500 Signed-off-by: Rabin Vincent [Modified to hit the right file] Signed-off-by: Linus Walleij commit abf12d719a2c9e45f7f90c02a3a25107206ed57a Author: Rabin Vincent Date: Wed Dec 8 11:07:59 2010 +0530 ux500: dynamic SOC detection Dynamically detect the DBx500 SOC an revision based on the ASIC ID. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 5dc55e0a39434ec8bec7978aef2dc00c91a530ba Author: Rabin Vincent Date: Wed Dec 8 11:07:58 2010 +0530 ux500: rename MOP board Kconfig Rename the MOP board Kconfig entries to the same name as the machine type, so that the machine_is_*() macros work correctly. Signed-off-by: Rabin Vincent [Updated to match changes in the tree] Signed-off-by: Linus Walleij commit 92389ca8362c42952c7ebb8a0350ac522dcde0f4 Author: Rabin Vincent Date: Wed Dec 8 11:07:57 2010 +0530 ux500: remove build-time changing macros To allow the possiblity of building U8500 and U5500 support in the same image. Signed-off-by: Rabin Vincent [Rebased to latest changes in Russells tree] Signed-off-by: Linus Walleij commit ca6e909f9bebe709bc65a3ee605ce32969db0452 Author: Jan Kara Date: Mon Jan 10 12:30:39 2011 -0500 ext4: fix trimming of a single group When ext4_trim_fs() is called to trim a part of a single group, the logic will wrongly set last block of the interval to 'len' instead of 'first_block + len'. Thus a shorter interval is possibly trimmed. Fix it. CC: Lukas Czerner Cc: stable@kernel.org Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 6c5a6cb998854f3c579ecb2bc1423d302bcb1b76 Author: Andrew Morton Date: Mon Jan 10 12:30:17 2011 -0500 ext4: fix uninitialized variable in ext4_register_li_request fs/ext4/super.c: In function 'ext4_register_li_request': fs/ext4/super.c:2936: warning: 'ret' may be used uninitialized in this function It looks buggy to me, too. Cc: Lukas Czerner Cc: stable@kernel.org Signed-off-by: Andrew Morton Signed-off-by: "Theodore Ts'o" commit 8aefcd557d26d0023a36f9ec5afbf55e59f8f26b Author: Theodore Ts'o Date: Mon Jan 10 12:29:43 2011 -0500 ext4: dynamically allocate the jbd2_inode in ext4_inode_info as necessary Replace the jbd2_inode structure (which is 48 bytes) with a pointer and only allocate the jbd2_inode when it is needed --- that is, when the file system has a journal present and the inode has been opened for writing. This allows us to further slim down the ext4_inode_info structure. Signed-off-by: "Theodore Ts'o" commit 353eb83c1422c6326eaab30ce044a179c6018169 Author: Theodore Ts'o Date: Mon Jan 10 12:18:25 2011 -0500 ext4: drop i_state_flags on architectures with 64-bit longs We can store the dynamic inode state flags in the high bits of EXT4_I(inode)->i_flags, and eliminate i_state_flags. This saves 8 bytes from the size of ext4_inode_info structure, which when multiplied by the number of the number of in the inode cache, can save a lot of memory. Signed-off-by: "Theodore Ts'o" commit 8a2005d3f84457b7d7d8646ab5195341d9e5f06a Author: Theodore Ts'o Date: Mon Jan 10 12:13:42 2011 -0500 ext4: reorder ext4_inode_info structure elements to remove unneeded padding By reordering the elements in the ext4_inode_info structure, we can reduce the padding needed on an x86_64 system by 16 bytes. Signed-off-by: "Theodore Ts'o" commit b05e6ae58a13b56e3e11882c1fc71948c9b29760 Author: Theodore Ts'o Date: Mon Jan 10 12:13:26 2011 -0500 ext4: drop ec_type from the ext4_ext_cache structure We can encode the ec_type information by using ee_len == 0 to denote EXT4_EXT_CACHE_NO, ee_start == 0 to denote EXT4_EXT_CACHE_GAP, and if neither is true, then the cache type must be EXT4_EXT_CACHE_EXTENT. This allows us to reduce the size of ext4_ext_inode by another 8 bytes. (ec_type is 4 bytes, plus another 4 bytes of padding) Signed-off-by: "Theodore Ts'o" commit 01f49d0b9d0209dc1194255b11601e4b94447b36 Author: Theodore Ts'o Date: Mon Jan 10 12:13:03 2011 -0500 ext4: use ext4_lblk_t instead of sector_t for logical blocks This fixes a number of places where we used sector_t instead of ext4_lblk_t for logical blocks, which for ext4 are still 32-bit data types. No point wasting space in the ext4_inode_info structure, and requiring 64-bit arithmetic on 32-bit systems, when it isn't necessary. Signed-off-by: "Theodore Ts'o" commit f232109773ff5b0c840a6761d74940b9cf0d66ec Author: Theodore Ts'o Date: Mon Jan 10 12:12:36 2011 -0500 ext4: replace i_delalloc_reserved_flag with EXT4_STATE_DELALLOC_RESERVED Remove the short element i_delalloc_reserved_flag from the ext4_inode_info structure and replace it a new bit in i_state_flags. Since we have an ext4_inode_info for every ext4 inode cached in the inode cache, any savings we can produce here is a very good thing from a memory utilization perspective. Signed-off-by: "Theodore Ts'o" commit ad4fb9cafe100a4a9de6e0529015e584d94ac8dc Author: Kazuya Mio Date: Mon Jan 10 12:12:28 2011 -0500 ext4: fix 32bit overflow in ext4_ext_find_goal() ext4_ext_find_goal() returns an ideal physical block number that the block allocator tries to allocate first. However, if a required file offset is smaller than the existing extent's one, ext4_ext_find_goal() returns a wrong block number because it may overflow at "block - le32_to_cpu(ex->ee_block)". This patch fixes the problem. ext4_ext_find_goal() will also return a wrong block number in case a file offset of the existing extent is too big. In this case, the ideal physical block number is fixed in ext4_mb_initialize_context(), so it's no problem. reproduce: # dd if=/dev/zero of=/mnt/mp1/tmp bs=127M count=1 oflag=sync # dd if=/dev/zero of=/mnt/mp1/file bs=512K count=1 seek=1 oflag=sync # filefrag -v /mnt/mp1/file Filesystem type is: ef53 File size of /mnt/mp1/file is 1048576 (256 blocks, blocksize 4096) ext logical physical expected length flags 0 128 67456 128 eof /mnt/mp1/file: 2 extents found # rm -rf /mnt/mp1/tmp # echo $((512*4096)) > /sys/fs/ext4/loop0/mb_stream_req # dd if=/dev/zero of=/mnt/mp1/file bs=512K count=1 oflag=sync conv=notrunc result (linux-2.6.37-rc2 + ext4 patch queue): # filefrag -v /mnt/mp1/file Filesystem type is: ef53 File size of /mnt/mp1/file is 1048576 (256 blocks, blocksize 4096) ext logical physical expected length flags 0 0 33280 128 1 128 67456 33407 128 eof /mnt/mp1/file: 2 extents found result(apply this patch): # filefrag -v /mnt/mp1/file Filesystem type is: ef53 File size of /mnt/mp1/file is 1048576 (256 blocks, blocksize 4096) ext logical physical expected length flags 0 0 66560 128 1 128 67456 66687 128 eof /mnt/mp1/file: 2 extents found Signed-off-by: Kazuya Mio Signed-off-by: "Theodore Ts'o" commit dabd991f9d8e3232bb4531c920daddac8d10d313 Author: Namhyung Kim Date: Mon Jan 10 12:11:16 2011 -0500 ext4: add more error checks to ext4_mkdir() Check return value of ext4_journal_get_write_access, ext4_journal_dirty_metadata and ext4_mark_inode_dirty. Move brelse() under 'out_stop' to release bh properly in case of journal error. Signed-off-by: Namhyung Kim Signed-off-by: "Theodore Ts'o" commit f1dffc4c5431c6bd8972489636573c5cd09ab672 Author: Eric Paris Date: Mon Jan 10 12:11:00 2011 -0500 ext4: ext4_ext_migrate should use NULL not 0 ext4_ext_migrate() calls ext4_new_inode() and passes 0 instead of a pointer to a struct qstr. This patch uses NULL, to make it obvious to the caller that this was a pointer. Signed-off-by: Eric Paris Signed-off-by: "Theodore Ts'o" commit f7c21177af0b32a2cd9ee36189637f0c1f0e1e17 Author: Theodore Ts'o Date: Mon Jan 10 12:10:55 2011 -0500 ext4: Use ext4_error_file() to print the pathname to the corrupted inode Where the file pointer is available, use ext4_error_file() instead of ext4_error_inode(). Signed-off-by: "Theodore Ts'o" commit f9a62d090cf47fae2fe6f6bd8eb9f24482573fd8 Author: Dan Carpenter Date: Mon Jan 10 12:10:50 2011 -0500 ext4: use IS_ERR() to check for errors in ext4_error_file d_path() returns an ERR_PTR and it doesn't return NULL. This is in ext4_error_file() and no one actually calls ext4_error_file(). Signed-off-by: Dan Carpenter commit 13195184a8bc119dbd2f905db325a453047971cb Author: Dan Carpenter Date: Mon Jan 10 12:10:44 2011 -0500 ext4: test the correct variable in ext4_init_pageio() This is a copy and paste error. The intent was to check "io_page_cachep". We tested "io_page_cachep" earlier. Signed-off-by: Dan Carpenter Signed-off-by: "Theodore Ts'o" commit 1f605b302724120777a1c38743cb20e2c8807333 Author: Wang Sheng-Hui Date: Mon Jan 10 12:10:37 2011 -0500 ext2: remove dead code in ext2_xattr_get Reviewed-by: Dan Carpenter Signed-off-by: Wang Sheng-Hui Signed-off-by: "Theodore Ts'o" commit 6e9510b0e0de657ca7c7bfb10ced80b4d237dd58 Author: Wang Sheng-Hui Date: Mon Jan 10 12:10:30 2011 -0500 ext2,ext3,ext4: clarify comment for extN_xattr_set_handle Signed-off-by: Wang Sheng-Hui Signed-off-by: "Theodore Ts'o" commit eaeef86718249f5c75b1370f77a9bc11f196a01c Author: Theodore Ts'o Date: Mon Jan 10 12:10:07 2011 -0500 ext4: clean up ext4_xattr_list()'s error code checking and return strategy Any time you see code that tries to add error codes together, you should want to claw your eyes out... Signed-off-by: "Theodore Ts'o" commit 932596366760e3f0dac9998665af1c49afcc4285 Author: Lukas Czerner Date: Mon Jan 10 12:09:59 2011 -0500 ext4: remove warning message from ext4_issue_discard helper ext4_issue_discard is supposed to be helper for calling discard, however in case that underlying device does not support discard it prints out the warning message and clears the DISCARD t_mount_opt flag. Since it can be (and is) used by others, it should not do anything and let the caller to handle the error case. This commit removes warning message and flag setting from ext4_issue_discard and use it just in place where it is really needed (release_blocks_on_commit). FITRIM ioctl should not set any flags nor it should print out warning messages, so get rid of the warning as well. Signed-off-by: Lukas Czerner commit 4f531501e44206862735e81ddf2b70d0dcf6acf6 Author: Lukas Czerner Date: Mon Jan 10 12:04:55 2011 -0500 ext4: fix possible overflow in ext4_trim_fs() When determining last group through ext4_get_group_no_and_offset() the result may be wrong in cases when range->start and range-len are too big, because it may overflow when summing up those two numbers. Fix that by checking range->len and limit its value to ext4_blocks_count(). This commit was tested by myself with expected result. Signed-off-by: Lukas Czerner commit 1a7d946993aaf2a79e9c65abbe169a108e351bcb Author: Mattia Dongili Date: Sat Jan 8 18:47:29 2011 +0900 sony-laptop: support new hotkeys on the P, Z and EC series Add new mappings for assist, VAIO, zoom and eject buttons present on refurbished P, Z and EC models. Reported-by: Gyorgy Jeney Reported-by: Stephan Mueller Cc: Dmitry Torokhov Cc: Matthew Garrett Signed-off-by: Mattia Dongili Signed-off-by: Matthew Garrett commit a08948812b30653eb2c536ae613b635a989feb6f Merge: 0bd2cbc 6099469 Author: Linus Torvalds Date: Mon Jan 10 08:57:46 2011 -0800 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: Support for Dallas Semiconductor DS620 hwmon: driver for Sensirion SHT21 humidity and temperature sensor hwmon: Add humidity attribute to sysfs ABI hwmon: sysfs ABI updates hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp hwmon: (lm95241) Rewrite to avoid using macros hwmon: (applesmc) Fix checkpatch errors and fix value range checks hwmon: (applesmc) Update copyright information hwmon: (applesmc) Silence driver hwmon: (applesmc) Simplify feature sysfs handling hwmon: (applesmc) Dynamic creation of fan files hwmon: (applesmc) Extract all features generically hwmon: (applesmc) Handle new temperature format hwmon: (applesmc) Dynamic creation of temperature files hwmon: (applesmc) Introduce a register lookup table hwmon: (applesmc) Use pr_fmt and pr_ hwmon: (applesmc) Relax the severity of device init failure hwmon: (applesmc) Add MacBookAir3,1(3,2) support hwmon: (w83627hf) Use pr_fmt and pr_ hwmon: (w83627ehf) Use pr_fmt and pr_ ... commit 0bd2cbcdfaff9cb22267d66fc843fa4f73f0c281 Merge: 57cc721 a081748 Author: Linus Torvalds Date: Mon Jan 10 08:57:03 2011 -0800 Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits) of/flattree: forward declare struct device_node in of_fdt.h ipmi: explicitly include of_address.h and of_irq.h sparc: explicitly cast negative phandle checks to s32 powerpc/405: Fix missing #{address,size}-cells in i2c node powerpc/5200: dts: refactor dts files powerpc/5200: dts: Change combatible strings on localbus powerpc/5200: dts: remove unused properties powerpc/5200: dts: rename nodes to prepare for refactoring dts files of/flattree: Update dtc to current mainline. of/device: Don't register disabled devices powerpc/dts: fix syntax bugs in bluestone.dts of: Fixes for OF probing on little endian systems of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF of/flattree: Add of_flat_dt_match() helper function of_serial: explicitly include of_irq.h of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree of/flattree: Reorder unflatten_dt_node of/flattree: Refactor unflatten_dt_node of/flattree: Add non-boottime device tree functions of/flattree: Add Kconfig for EARLY_FLATTREE ... Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant. commit 0c51a4d8abd6ed5ba55f828840c6b78ab672644b Author: Mark Brown Date: Mon Jan 10 14:37:02 2011 +0000 platform/x86: Consistently select LEDS Kconfig options Currently the x86 platform devices are not consistent about selecting or depending on the LEDs Kconfig variables, and this inconsistency leads to Kconfig getting upset and refusing to offer LEDs (even on non-x86 platforms): drivers/platform/x86/Kconfig:422:error: recursive dependency detected! drivers/platform/x86/Kconfig:422: symbol EEEPC_WMI depends on ACPI_WMI drivers/platform/x86/Kconfig:438: symbol ACPI_WMI is selected by ACER_WMI drivers/platform/x86/Kconfig:18: symbol ACER_WMI depends on LEDS_CLASS drivers/leds/Kconfig:10: symbol LEDS_CLASS is selected by EEEPC_WMI Fix this by always selecting rather than depending on the symbols as slightly more drivers use this approach already and it seems more user friendly. Signed-off-by: Mark Brown Signed-off-by: Matthew Garrett commit a46a780835f394869e1fbbef8b528a1e02193e78 Author: Randy Dunlap Date: Sat Jan 8 19:56:44 2011 -0800 sony-laptop: fix sparse non-ANSI function warning Fix sparse warning for non-ANSI function declaration: drivers/platform/x86/sony-laptop.c:1134:35: warning: non-ANSI function declaration of function 'sony_nc_rfkill_update' Signed-off-by: Randy Dunlap Cc: Matthew Garrett Cc: Mattia Dongili Signed-off-by: Matthew Garrett commit 7027d8b570244f0fa3aaebccf0bcd8e95e172631 Author: Randy Dunlap Date: Sat Jan 8 19:55:40 2011 -0800 intel_ips: fix sparse non-ANSI function warning Fix sparse warning for non-ANSI function declaration: drivers/platform/x86/intel_ips.c:1477:25: warning: non-ANSI function declaration of function 'ips_link_to_i915_driver' Signed-off-by: Randy Dunlap Cc: Matthew Garrett Signed-off-by: Matthew Garrett commit 57cc7215b70856dc6bae8e55b00ecd7b1d7429b1 Author: Alexey Dobriyan Date: Mon Jan 10 08:18:25 2011 +0200 headers: kobject.h redux Remove kobject.h from files which don't need it, notably, sched.h and fs.h. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 37721e1b0cf98cb65895f234d8c500d270546529 Author: Alexey Dobriyan Date: Mon Jan 10 08:17:10 2011 +0200 headers: path.h redux Remove path.h from sched.h and other files. Signed-off-by: Alexey Dobriyan Signed-off-by: Linus Torvalds commit 9f99a2f0e44663517b99b69a3e4a499d0ba877df Merge: 8c8ae4e 110e7c7 Author: Linus Torvalds Date: Mon Jan 10 08:48:46 2011 -0800 Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen/event: validate irq before get evtchn by irq xen/fb: fix potential memory leak xen/fb: fix xenfb suspend/resume race. xen: disable ACPI NUMA for PV guests xen/irq: Cleanup the find_unbound_irq commit 8c8ae4e8cd5a67467192f3361eeec463694f8ed8 Merge: a1e8fad d9b8ca8 Author: Linus Torvalds Date: Mon Jan 10 08:48:29 2011 -0800 Merge branch 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: HVM X2APIC support apic: Move hypervisor detection of x2apic to hypervisor.h commit a1e8fad5900fa94adb500c6e0dfd60a307f7a3c9 Merge: e316633 a45b061 Author: Linus Torvalds Date: Mon Jan 10 08:38:01 2011 -0800 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: Fix a crash during slabinfo -v tracing/slab: Move kmalloc tracepoint out of inline code slub: Fix slub_lock down/up imbalance slub: Fix build breakage in Documentation/vm slub tracing: move trace calls out of always inlined functions to reduce kernel code size slub: move slabinfo.c to tools/slub/slabinfo.c commit e3166331a3288dd7184548896a1c7ab682f0dbe8 Merge: 1693ed2 0719e1d Author: Linus Torvalds Date: Mon Jan 10 08:29:25 2011 -0800 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: Documentation/kbuild: add info that 'choice' can have a symbol name kbuild: add numeric --set-val option to scripts/config headers_check: Fix warning text headers_check: better search for functions in headers scripts/coccinelle: update for compatability with Coccinelle 0.2.4 tags: put function prototypes back! Kconfig: fix single letter command in scripts/config gitignore: add scripts/recordmcount commit 1693ed284f14a288c29f7265f9d71103e4c10821 Merge: f28b1c8 ee81b78 Author: Linus Torvalds Date: Mon Jan 10 08:28:38 2011 -0800 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: deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/ deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb kbuild: create linux-headers package in deb-pkg kbuild, deb-pkg: support overriding userland architecture kbuild, deb-pkg: select userland architecture based on UTS_MACHINE kbuild, deb-pkg: Fix build with paranoid umask commit f28b1c8aaa97a68028bb894bffb1690185c62b01 Merge: 0c05384 39177ec Author: Linus Torvalds Date: Mon Jan 10 08:28:17 2011 -0800 Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: nconf: handle comment entries within choice/endchoice kconfig: fix warning kconfig: Make expr_copy() take a const argument kconfig: simplify select-with-unmet-direct-dependency warning kconfig: add more S_INT and S_HEX consistency checks kconfig: fix `zconfdebug' extern declaration kconfig/conf: merge duplicate switch's case kconfig: fix typos kbuild/gconf: add dummy inline for bind_textdomain_codeset() kbuild/nconf: fix spaces damage kconfig: nuke second argument of conf_write_symbol() kconfig: do not define AUTOCONF_INCLUDED kconfig: the day kconfig warns about "select"-abuse has come commit 0c05384a5a1af2352b8c244cf32f480ba6cbf024 Merge: 1542dec bc91c9f Author: Linus Torvalds Date: Mon Jan 10 08:27:52 2011 -0800 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: mkuboot.sh: Fail if mkimage is missing gen_init_cpio: checkpatch fixes gen_init_cpio: Avoid race between call to stat() and call to open() modpost: Fix address calculation in reloc_location() Make fixdep error handling more explicit checksyscalls: Fix stand-alone usage modpost: Put .zdebug* section on white list kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all kbuild: introduce HDR_ARCH_LIST for headers_install_all headers_install: check exit status of unifdef gen_init_cpio: remove leading `/' from file names scripts/genksyms: fix header usage fixdep: use hash table instead of a single array commit 1542dec1c9109fdcd1c53460f064096f24fc49d2 Merge: facc7a9 2ad2c32 Author: Linus Torvalds Date: Mon Jan 10 08:22:33 2011 -0800 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: pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies. pata_hpt37x: actually limit HPT370 to UltraDMA/66 pata_hpt3x2n: coding style cleanup pata_hpt37x: coding style cleanup pata_hpt366: coding style cleanup pata_hpt3x2n: calculate average f_CNT pata_hpt3x2n: clarify about HPT371N support pata_hpt{37x|3x2n}: SATA mode filtering [libata] avoid needlessly passing around ptr to SCSI completion func [libata] new driver acard_ahci, for ATP8620 host controller commit 12f7e0364375ba1ba55abcc5ac082b68fb526c80 Author: Jiri Pirko Date: Mon Jan 10 14:14:23 2011 -0200 perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail on ppc64: /usr/include/bits/local_lim.h:#define PTHREAD_STACK_MIN 131072 therefore following set of commands: gives: perf.2.6.37test: builtin-sched.c:493: create_tasks: Assertion `!(err)' failed. So make sure we do not set stack size lower than PTHREAD_STACK_MIN. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110110160417.GB2685@psychotron.brq.redhat.com> Signed-off-by: Jiri Pirko Signed-off-by: Arnaldo Carvalho de Melo commit facc7a96d443d84060a8679c3fcc51d20d4981c3 Merge: c8940ec 4ead364 Author: Linus Torvalds Date: Mon Jan 10 08:15:37 2011 -0800 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: (34 commits) HID: roccat: Update sysfs attribute doc HID: roccat: don't use #pragma pack HID: roccat: Add support for Roccat Kone[+] v2 HID: roccat: reduce number of functions in kone and pyra drivers HID: roccat: declare meaning of pack pragma usage in driver headers HID: roccat: use class for char device for sysfs attribute creation sysfs: Introducing binary attributes for struct class HID: hidraw: add compatibility ioctl() for 32-bit applications. HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report() HID: picolcd: fix misuse of logical operation in place of bitop HID: usbhid: base runtime PM on modern API HID: replace offsets values with their corresponding BTN_* defines HID: hid-mosart: support suspend/resume HID: hid-mosart: ignore buttons report HID: hid-picolcd: don't use flush_scheduled_work() HID: simplify an index check in hid_lookup_collection HID: Hoist assigns from ifs HID: Remove superfluous __inline__ HID: Use vzalloc for vmalloc/memset(,0...) HID: Add and use hid_: dev_ equivalents ... commit c8940eca75e6d1ea57f6c491a30bd1023c64c9ad Merge: 78c92a9 3ae22e8 Author: Linus Torvalds Date: Mon Jan 10 08:14:53 2011 -0800 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: spi / PM: Support dev_pm_ops PM: Prototype the pm_generic_ operations PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally PM: Use dev_name() in core device suspend and resume routines PM: Permit registration of parentless devices during system suspend PM: Replace the device power.status field with a bit field PM: Remove redundant checks from core device resume routines PM: Use a different list of devices for each stage of device suspend PM: Avoid compiler warning in pm_noirq_op() PM: Use pm_wakeup_pending() in __device_suspend() PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending() PM: Prevent dpm_prepare() from returning errors unnecessarily PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3) PM / Hibernate: When failed, in_suspend should be reset PM / Hibernate: hibernation_ops->leave should be checked too Freezer: Fix a race during freezing of TASK_STOPPED tasks PM: Use proper ccflag flag in kernel/power/Makefile PM / Runtime: Fix comments to match runtime callback code commit 78c92a9fd4b6abbbc1fe1ec335c697cb4e63f252 Merge: b65f0d6 410cf2b Author: Linus Torvalds Date: Mon Jan 10 08:14:02 2011 -0800 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: use split transaction timeout only for split transactions firewire: ohci: consolidate context status flags firewire: ohci: cache the context run bit firewire: ohci: flush AT contexts after bus reset - addendum firewire: ohci: flush AT contexts after bus reset for OHCI 1.2 firewire: net: set carrier state at ifup firewire: net: add carrier detection firewire: net: ratelimit error messages firewire: ohci: restart iso DMA contexts on resume from low power mode firewire: ohci: restore GUID on resume. firewire: ohci: use common buffer for self IDs and AR descriptors firewire: ohci: optimize iso context checks in the interrupt handler firewire: make PHY packet header format consistent firewire: ohci: properly clear posted write errors firewire: ohci: flush MMIO writes in the interrupt handler firewire: ohci: fix AT context initialization error handling firewire: ohci: Asynchronous Reception rewrite firewire: core: Update WARN uses firewire: nosy: char device is not seekable commit b65f0d673a0280a49b80f44c9a62e5dfc1ec203f Merge: f3ea597 365e215 Author: Linus Torvalds Date: Mon Jan 10 07:50:40 2011 -0800 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: unfold nilfs_dat_inode function nilfs2: do not pass sbi to functions which can get it from inode nilfs2: get rid of nilfs_mount_options structure nilfs2: simplify nilfs_mdt_freeze_buffer nilfs2: get rid of loaded flag from nilfs object nilfs2: fix a checkpatch error in page.c nilfs2: fiemap support nilfs2: mark buffer heads as delayed until the data is written to disk nilfs2: call nilfs_error inside bmap routines fs/nilfs2/super.c: Use printf extension %pV MAINTAINERS: add nilfs2 git tree entry commit a4b1696916abc4a0b6b11fc4cc2cd52421a0c7ac Author: Clemens Ladisch Date: Mon Jan 10 16:37:19 2011 +0100 ALSA: oxygen: add some card names Instead of the generic Oxygen, use the actual card name, if known. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit a1f80fcfd51c81960bb32601d9aa0acda9d62504 Author: Clemens Ladisch Date: Mon Jan 10 16:36:23 2011 +0100 ALSA: oxygen: do not show chip revision in card longname Apparently, the revision is 2 on all sold sound cards, so this information is not actually useful. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 64878dfbf755446f025965b742e56e4739a33b37 Author: Clemens Ladisch Date: Mon Jan 10 16:35:38 2011 +0100 ALSA: oxygen: X-Meridian: add S/PDIF source selection Add a mixer control to select between the on-board and extension board S/PDIF inputs for the X-Meridian (2G). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 860cffd57acff68e8bc5465f4dd3b7d338fb8e62 Author: Clemens Ladisch Date: Mon Jan 10 16:34:15 2011 +0100 ALSA: oxygen: add digital input validity check switch Add a mixer control to prevent capturing S/PDIF samples that are not marked as valid (non-audio or corrupted samples). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit af39917d5a59d82f50bf9f5fadaa53944e5abf76 Author: Clemens Ladisch Date: Mon Jan 10 16:32:54 2011 +0100 MAINTAINERS: add myself Add entries for the remaining drivers that I'm maintaining. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit f3ea597251ac859a1c0e7b9e266877f1ac828009 Merge: f9f265f 20054bd Author: Linus Torvalds Date: Mon Jan 10 07:47:11 2011 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: use CreationTime like an i_generation field cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo cifs: show "acl" in DebugData Features when it's compiled in cifs: move "ntlmssp" and "local_leases" options out of experimental code cifs: replace some hardcoded values with preprocessor constants cifs: remove unnecessary locking around sequence_number [CIFS] Fix minor merge conflict in fs/cifs/dir.c CIFS: Simplify cifs_open code CIFS: Simplify non-posix open stuff (try #2) CIFS: Add match_port check during looking for an existing connection (try #4) CIFS: Simplify ipv*_connect functions into one (try #4) cifs: Support NTLM2 session security during NTLMSSP authentication [try #5] cifs: don't overwrite dentry name in d_revalidate commit 061b869eca6f725b0119f7dff833288a44bf46c0 Author: Clemens Ladisch Date: Mon Jan 10 16:30:54 2011 +0100 ALSA: usb-audio: add Edirol SD-90 PCM support Add support for the 24-bit audio I/Os of the Edirol SD-90 interface. Reported-any-tested-by: Jim Grusendorf Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 2a1803a7291e82823effef0b48b0039324d224c6 Author: Clemens Ladisch Date: Mon Jan 10 16:30:13 2011 +0100 ALSA: usb-audio: use enum control info helper Simplify info callbacks by using the snd_ctl_enum_info() helper function. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit bed6896d0be1de12eb6237a43a4beaaf7dcfb42c Author: Clemens Ladisch Date: Mon Jan 10 16:29:06 2011 +0100 ALSA: ymfpci: use enum control info helper Simplify the info callback by using the snd_ctl_enum_info() helper function. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 60c4ce4a0c2ffbd37d6604f68fa4408ca7226157 Author: Clemens Ladisch Date: Mon Jan 10 16:28:19 2011 +0100 ALSA: cmipci: use enum control info helper Simplify info callbacks by using the snd_ctl_enum_info() helper function. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit dd1224aa3ebfdef6cddcfb68ddcd0e682eaf9f84 Author: Clemens Ladisch Date: Mon Jan 10 16:27:26 2011 +0100 ALSA: bt87x: use enum control info helper Simplify the info callback by using the snd_ctl_enum_info() helper function. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 9600732b6caba595f34acf2abd930098ec9a0b2b Author: Clemens Ladisch Date: Mon Jan 10 16:25:44 2011 +0100 ALSA: core, oxygen, virtuoso: add an enum control info helper Introduce the helper function snd_ctl_enum_info() to fill out the elem_info fields for an enumerated control. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit b532d6b8d3aa163e1dc143bc729e9ee92f75baf5 Author: Clemens Ladisch Date: Mon Jan 10 16:23:57 2011 +0100 ALSA: virtuoso: add Xonar HDAV1.3 Slim support Add experimental support for the Asus Xonar HDAV1.3 Slim sound card. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 66410bfdf14f7c2ad3b2d4a8adeab41d368b6f05 Author: Clemens Ladisch Date: Mon Jan 10 16:20:29 2011 +0100 ALSA: oxygen: add Xonar DG support Add experimental support for the Asus Xonar DG sound card. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 8443d2eb81e30dcc027e531eaa442cdb2477c5ab Author: Clemens Ladisch Date: Mon Jan 10 16:17:26 2011 +0100 ALSA: oxygen: add X-Meridian 2G support Add support for the AuzenTech X-Meridian 7.1 2G sound card. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 8c50b75979a198194a38d38d855f9d7e9cac2889 Author: Clemens Ladisch Date: Mon Jan 10 16:16:32 2011 +0100 ALSA: oxygen: add more PCI IDs Add PCI IDs for some unknown models. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit ce2c492090aa55ff2764f473abdb3c5a76b4a7c4 Author: Clemens Ladisch Date: Mon Jan 10 16:16:08 2011 +0100 ALSA: virtuoso: reduce MCLK in double rate modes For the CSxxxx and AKxxxx DAC/ADC chips, the MCLK factor in double rate modes (64-96 kHz) can be reduced to 128x without reducing sound quality. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 110e7c7e4f8a61a34e0ab88fc9bdf4d5c6d220b2 Author: Joe Jin Date: Fri Jan 7 14:50:12 2011 +0800 xen/event: validate irq before get evtchn by irq When retrieving the event channel number from irq, the irq number may not be valid under some conditions. So far that can be when we suspend/resume and irq ends with -1. Validate and return sanitized irq and provide diagnostics information. [v3: added unlikely on the WARN path] [v2: reworded the commit message] Signed-off-by: Joe Jin Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Gurudas Pai Cc: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit 5b8bf2a54fb13e40519ee846ce27bc8a2d7a7878 Author: Clemens Ladisch Date: Mon Jan 10 16:14:52 2011 +0100 ALSA: oxygen: simplify model-specific MCLK handling Replace the get_i2s_mclk callback with tables of MCLK values. This simplifies the MCLK-handling code in both the framework and the model- specific drivers. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit fc550e95921e109f3778a6b2dc560d63388810ab Author: Joe Jin Date: Fri Jan 7 18:20:54 2011 +0800 xen/fb: fix potential memory leak This patch fixes a potential memory leak when xenfb connect to the backend fails. Thanks for Ian's review and comments. [v2: reworded the commit message a bit] Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Joe Jin Tested-by: Gurudas Pai Acked-by: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit 731f3ab66a23dab28a359e87364f53d221b3d366 Author: Joe Jin Date: Fri Jan 7 18:17:17 2011 +0800 xen/fb: fix xenfb suspend/resume race. When migrating guests over a long period we hit this: <1>BUG: unable to handle kernel paging request at 0000000b819fdb98 <1>IP: [] notify_remote_via_irq+0x13/0x34 <4>PGD 94b10067 PUD 0 <0>Oops: 0000 [#1] SMP .. snip.. Call Trace: [] xenfb_send_event+0x5c/0x5e [] ? xen_restore_fl_direct_end+0x0/0x1 [] ? _spin_unlock_irqrestore+0x16/0x18 [] xenfb_refresh+0x1b1/0x1d7 [] ? sys_imageblit+0x1ac/0x458 [] xenfb_imageblit+0x2f/0x34 [] soft_cursor+0x1b5/0x1c8 [] bit_cursor+0x4b6/0x4d7 [] ? xen_restore_fl_direct_end+0x0/0x1 [] ? _spin_unlock_irqrestore+0x16/0x18 [] ? bit_cursor+0x0/0x4d7 [] fb_flashcursor+0xff/0x111 [] ? fb_flashcursor+0x0/0x111 [] worker_thread+0x14d/0x1ed [] ? autoremove_wake_function+0x0/0x3d [] ? _spin_unlock_irqrestore+0x16/0x18 [] ? worker_thread+0x0/0x1ed [] kthread+0x6e/0x76 [] child_rip+0xa/0x20 [] ? int_ret_from_sys_call+0x7/0x1b [] ? retint_restore_args+0x5/0x6 [] ? child_rip+0x0/0x20 Code: 6b ff 0c 8b 87 a4 db 9f 81 66 85 c0 74 08 0f b7 f8 e8 3b ff ff ff c9 c3 55 48 89 e5 48 83 ec 10 0f 1f 44 00 00 89 ff 48 6b ff 0c <8b> 87 a4 db 9f 81 66 85 c0 74 14 48 8d 75 f0 0f b7 c0 bf 04 00 RIP [] notify_remote_via_irq+0x13/0x34 RSP CR2: 0000000b819fdb98 ---[ end trace 098b4b74827595d0 ]--- The root cause of the panic is the race between the resume and reconnect to the backend. Clearing the 'update_wanted' flag of xenfb before disconnecting from the backend fixes this issue. Signed-off-by: Joe Jin Signed-off-by: Konrad Rzeszutek Wilk Tested-by: Gurudas Pai Acked-by: Ian Campbell Cc: Jeremy Fitzhardinge Cc: Andrew Morton commit c1f5db1a53a7286f6c818f71016ae6aced814d27 Author: Ian Campbell Date: Fri Dec 3 09:54:03 2010 +0000 xen: disable ACPI NUMA for PV guests Xen does not currently expose PV-NUMA information to PV guests. Therefore disable NUMA for the time being to prevent the kernel picking up on an host-level NUMA information which it might come across in the firmware. [ Added comment - Jeremy ] Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit bc29e262c3062682c6099bd455ae8544916f723e Author: Clemens Ladisch Date: Mon Jan 10 16:11:32 2011 +0100 ALSA: virtuoso: use headphone gain setting only on front DAC Do not apply the headphone gain offset to any but the front DAC. These DACs would not be used in headphone mode, so this saves a few register writes. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a Merge: 7d44b04 b9d4105 Author: Linus Torvalds Date: Mon Jan 10 07:46:26 2011 -0800 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: sanitize work_start() in lowcomms.c dlm: reduce cond_resched during send dlm: use TCP_NODELAY dlm: Use cmwq for send and receive workqueues dlm: Handle application limited situations properly. commit c97e2dc48457642e2f1c6183b986549b7fa0113a Author: Clemens Ladisch Date: Mon Jan 10 16:11:05 2011 +0100 ALSA: virtuoso: handle DAC oversampling automatically Remove the DAC Oversampling mixer control because this setting does not make much sense. For cards with the H6 daughterboard, 128x oversampling was disabled anyway because these high MCLK frequency would not be compatible with the connector cable. For cards without the H6 daughterboard, 128x gives a slightly higher output quality; there is no reason to reduce it to 64x except for saving power, but then these cards have not been designed to be power efficient anyway (the D2's blinkenlights cannot be disabled). Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 00b8dd7dd71ef129176731d5fa24f5e298797599 Author: Clemens Ladisch Date: Mon Jan 10 16:09:23 2011 +0100 ALSA: virtuoso: use lower master clock with H6 daughterboard Because of the unshielded connector cable, it is important to use as low a master clock frequency as possible with the H6. For double rate modes (64-96 kHz), the MCLK rate is unconditionally lowered from 512x to 256x because the higher rate would not improve anything. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d353eaa9a8133cdad8c1da23c84f9f529a23f0c2 Author: Clemens Ladisch Date: Mon Jan 10 16:07:11 2011 +0100 ALSA: virtuoso: configure correct master clock frequency on the CS2000 The clock output of the CS2000, which is used as master clock for the DACs, was using half the actual master clock frequency for some reason. Using the theoretically correct frequency seems also to work in practice. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit dd203fa97bd5df18dbb0af5acf3e9a8beea33f74 Author: Clemens Ladisch Date: Mon Jan 10 16:05:38 2011 +0100 ALSA: virtuoso: remove non-working controls on Essence ST Deluxe On the Xonar Essence ST Deluxe, remove all mixer controls that would require I2C communication with the third DAC, which does not work because of an addressing conflict with the CS2000 chip. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 03ff959dd4e290ed909fd57dec79ccd0262c4095 Author: Clemens Ladisch Date: Mon Jan 10 16:03:17 2011 +0100 ALSA: virtuoso: change PCM1796 format to I2S Change the PCM format used for the PCM1796 from left-justified to I2S to ensure that the correct format is used even for the Essence ST Deluxe's center/LFE DAC, where I2C does not work because of an address conflict with the CS2000 chip. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 79815e004c75dcc2be6433737b5678cee80035db Author: Clemens Ladisch Date: Mon Jan 10 16:02:32 2011 +0100 ALSA: virtuoso: wait for PCM1796 clock to become stable The PCM1796 needs the master clock for I2C communication to work, so add delays after clock changes to ensure that the clock is stable when we try to write the DACs' registers. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 4106055cedea86596391f36deacd05616333fbb3 Author: Clemens Ladisch Date: Mon Jan 10 16:01:57 2011 +0100 ALSA: virtuoso: do not use fast I2C speed To make the I2C communication reliable when using the H6 daughterboard, reduce the I2C clock frequency. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 5ea310ff8d651246cf001ebc894d2f294123328a Author: Clemens Ladisch Date: Mon Jan 10 16:01:17 2011 +0100 ALSA: oxygen: fix SPI clocks slower than 6.25 MHz Fix wrong register bits for SPI clock cycle times longer than 160 ns, and adjust the polling loop timeout for these speeds. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d2119c05e9aee7e44055220726bb8814a2e242c3 Author: Clemens Ladisch Date: Mon Jan 10 16:00:34 2011 +0100 ALSA: oxygen: remove oxygen_model::private_data field The number of DACs can now be deduced from the dac_channels_mixer field, so the private_data field is no longer needed. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 1f4d7be7293aecd5f8469a46f606f62f0f05d84c Author: Clemens Ladisch Date: Mon Jan 10 15:59:38 2011 +0100 ALSA: oxygen: allow different number of PCM and mixer channels For cards like the Xonar HDAV1.3, differentiate between the number of PCM channels that can be played and the number of channels whose volume can be adjusted. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7d44b0440147d83a65270205b22e7d365de28948 Merge: 0dc1488 1baa26b Author: Linus Torvalds Date: Mon Jan 10 07:43:54 2011 -0800 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: fix ioctl ABI fuse: allow batching of FORGET requests fuse: separate queue for FORGET requests fuse: ioctl cleanup Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done the RCU-freeing of the inode in fuse_destroy_inode(). commit 0dc1488527a3c01383a50e5df7187219567586a3 Author: Randy Dunlap Date: Sat Jan 8 19:40:33 2011 -0800 pipe_fs_i.h: fix kernel-doc warning Fix kernel-doc notation warnings in pipe_fs_i.h: Warning(include/linux/pipe_fs_i.h:58): No description found for parameter 'buffers' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 175881db8916a5f5cdf920d32214caef588870fd Author: Randy Dunlap Date: Sat Jan 8 19:38:02 2011 -0800 hrtimer.h: fix kernel-doc warning Fix new kernel-doc notation warning in hrtimer.h: Warning(include/linux/hrtimer.h:150): Excess struct/union/enum/typedef member 'first' description in 'hrtimer_clock_base' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 2a8c0c68487a68441e701f493f43fd547d87c8df Author: Randy Dunlap Date: Sat Jan 8 19:37:20 2011 -0800 fs: fix dcache.h kernel-doc notation Fix new kernel-doc notation warning in dcache.h: Warning(include/linux/dcache.h:316): Excess function parameter 'Returns' description in '__d_rcu_to_refcount' Signed-off-by: Randy Dunlap Cc: Nick Piggin Signed-off-by: Linus Torvalds commit 39191628ed169510db2f3f472e1ec14e08f9690f Author: Randy Dunlap Date: Sat Jan 8 19:36:21 2011 -0800 fs: fix namei.c kernel-doc notation Fix new kernel-doc notation warnings in fs/namei.c and spell ECHILD correctly. Warning(fs/namei.c:218): No description found for parameter 'flags' Warning(fs/namei.c:425): Excess function parameter 'Returns' description in 'nameidata_drop_rcu' Warning(fs/namei.c:478): Excess function parameter 'Returns' description in 'nameidata_dentry_drop_rcu' Warning(fs/namei.c:540): Excess function parameter 'Returns' description in 'nameidata_drop_rcu_last' Signed-off-by: Randy Dunlap Cc: Nick Piggin Signed-off-by: Linus Torvalds commit aa7bc7ef73efc46d7c3a0e185eefaf85744aec98 Author: Arnaldo Carvalho de Melo Date: Mon Jan 10 13:36:24 2011 -0200 perf tools: Emit clearer message for sys_perf_event_open ENOENT return Improve sys_perf_event_open ENOENT return handling in top and record, just like 5a3446b does for stat. Cc: 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 bcb2f0f517ebae7350526bbde8912ad187147e2d Author: Takashi Iwai Date: Mon Jan 10 15:45:23 2011 +0100 ALSA: hda - Add support for multiple headphone/speaker controls for Realtek So far, Realtek auto-parser assumed that the multiple pins are only for line-outs, and assigned the channel names like Front, Surround, etc for the multiple outputs. But, there are devices that have multiple headphones, and these can be better controlled with the corresponding control-name like "Headphone" with indicies. Signed-off-by: Takashi Iwai commit b2d0576055bd1cafcd91a23cf85064815f1396cd Author: Takashi Iwai Date: Mon Jan 10 14:47:35 2011 +0100 ALSA: hda - Fix multi-headphone handling for Realtek codecs When multiple headphone pins are defined without line-out pins, the driver takes them as primary outputs. But it forgot to set line_out_type to HP by assuming there is some rest of HP pins. This results in some mis-handling of these pins for Realtek codec parser. It takes as if these are pure line-out jacks. Signed-off-by: Takashi Iwai Cc: commit 5a3446bc648d86a99a895e93d28d7df00bbbfb3c Author: David Ahern Date: Sun Jan 9 11:21:12 2011 -0700 perf stat: better error message for unsupported events For unsupported events (e.g., H/W events when running in a VM) perf stat currently fails with the error message: Error: open_counter returned with 2 (No such file or directory). /bin/dmesg may provide additional information. Fatal: Not all events could be opened. dmesg is of no help and it is not clear as to why it fails to open the counter. This patch changes the error message to Error: cache-misses event is not supported. Fatal: Not all events could be opened. Cc: Ingo Molnar Cc: Paul Mackerras Cc: a.p.zijlstra@chello.nl LPU-Reference: <1294597272-17335-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit e462dc553ea5e09d4713e7c35a11ed331dc6f369 Author: Arnaldo Carvalho de Melo Date: Mon Jan 10 10:48:47 2011 -0200 perf sched: Fix allocation result check Bug introduced in ce47dc56. Reported-by: Mike Galbraith Cc: Chris Samuel 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 a780c6e86851c6479851186c5d5b9fb2b201bec7 Author: Mike Frysinger Date: Fri Jan 7 22:44:06 2011 +0000 Blackfin: encode cpu-rev into uImage name Encoding the cpu family name apparently confuses people when they try to boot an image on a sub-variant, so encode the specific cpu name and the silicon rev instead. Signed-off-by: Mike Frysinger commit b66acb63f5593ac11e39ab1cf17e1f987bc5ff9c Author: Mike Frysinger Date: Fri Dec 10 20:42:59 2010 +0000 Blackfin: bf54x: don't ack GPIO ints when unmasking them When unmasking a GPIO interrupt on a BF54x part, the code will implicitly ack any pending interrupts. This is not what unmasking should do and can cause people to miss interrupts from their devices, so punt the code. Reported-by: Rutger Hofman Signed-off-by: Mike Frysinger commit 25f3ff2c445822793d22ac51e3dcb22a694e3cd4 Author: Mike Frysinger Date: Mon Dec 6 21:12:23 2010 +0000 Blackfin: sram_free_with_lsl: do not ignore return value of sram_free If there was an error in the lower free functions, we need to pass that back up so the calling process is able to check things. Signed-off-by: Mike Frysinger commit a8b19886097032df38bd521cece4bc538fee2266 Author: Mike Frysinger Date: Wed Nov 24 09:23:04 2010 +0000 Blackfin: boards: add missing "static" to peripheral lists Signed-off-by: Mike Frysinger commit 3ea9f2bf5a3b91ba18af9f25bfc9a32677ea47d8 Author: Andreas Schallenberg Date: Wed Nov 24 22:15:16 2010 +0000 Blackfin: DNP5370: new board port Signed-off-by: Andreas Schallenberg Signed-off-by: Mike Frysinger commit d57bc0feaa958bc8a6a0b9d3a29f78c699e50d2a Author: Sonic Zhang Date: Tue Nov 23 10:00:15 2010 +0000 Blackfin: bf518f-ezbrd: fix dsa resources On bf518-ezbrd with DSA Ethernet switch enabled, on chip MAC is connecting to phy at address 3. If allowing the netdevice framework to probe both 3 phys of the switch when registering MAC phy, phy at address 1 is checked for link active status other than phy at address 3. If connecting a cable to port 2 and leave port 1 open, link status in phy 2 and 3 are online, while that in phy 1 is offline. So, the phy layer sets wrong offline status to net device on port 3. In this case, no data can be transferred via ethernet port 2. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 874f6cfd3a05d5452064531078cae9b19a5e790c Author: Mike Frysinger Date: Wed Nov 17 07:34:58 2010 +0000 Blackfin: move "-m elf32bfin" to general LDFLAGS Common code now invokes the linker directly which causes build failures when using an FDPIC toolchain. So move the emulation setting out of the module-specific LDFLAGS and into the common LDFLAGS. Signed-off-by: Mike Frysinger commit 9fc205283f8b163fba611a40226afdd82f4f29d3 Author: Vivi Li Date: Wed Nov 17 04:26:19 2010 +0000 Blackfin: kgdb_test: make sure to initialize num2 We check its value at runtime, so we want to avoid garbage across runs. Signed-off-by: Vivi Li Signed-off-by: Mike Frysinger commit b68233e7f0126dfe59e1a064da9e37827c1f35ec Author: Sonic Zhang Date: Wed Nov 17 06:52:39 2010 +0000 Blackfin: kgdb: disable preempt schedule when running single step in kgdb Otherwise, gdb continue operation after a breakpoint is hit may trap into endless breakpoint. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 900de05182d520ff66378e74a7b18f7d9971a32d Author: Sonic Zhang Date: Wed Nov 17 06:19:28 2010 +0000 Blackfin: kgdb: disable interrupt when single stepping in ADEOS When ADEOS and kgdb are both enabled, single step in linux kernel may be scheduled to Xenomai core after return from interrupt handlers. This blocks gdb continue operation after a break point is hit. So, disable interrupt when running gdb single step. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 84e97c1014a2afe1a07beb1b6de5f2d867b368fd Author: Sonic Zhang Date: Tue Nov 16 09:41:07 2010 +0000 Blackfin: SMP: kgdb: apply anomaly 257 work around When run kgdb testing, it looks like coreb hangs in single step or trap exception without handling anomaly 05000257 properly on bf561 v0.5. But, the anomaly list says it apply to bf561 v0.4 and bellow. Apply its work around to 0.5 temporarily until the behavior and the root cause can be confirmed by the hardware team. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 503f3d30c6f29c58fce77bfe47b04e3c667e7640 Author: Mike Frysinger Date: Sun Nov 14 00:02:53 2010 +0000 Blackfin: fix building IPIPE code when XIP is enabled The low level assembly needs to use the pseudo_long_call helper so that we use the right call insn when doing kernel XIP. Signed-off-by: Mike Frysinger commit 064cc44e62283227524c8e84ff247939728dec79 Author: Sonic Zhang Date: Fri Nov 12 05:54:32 2010 +0000 Blackfin: SMP: kgdb: flush core internal write buffer before flushinv KGDB single step in SMP kernel may hang forever in flushinv without a CSYNC ahead. This is because the core internal write buffers need to be flushed before invalidating the data cache to make sure the insn fetch is not out of sync. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit e54b673081d12c46b47fdfe1772656cb2b43721d Author: Sonic Zhang Date: Fri Nov 12 02:45:38 2010 +0000 Blackfin: sport_uart resources: remove unused secondary RX/TX pins The SPORT/UART driver doesn't use the secondary channel pins, so don't try and request them thus keeping other drivers from using them. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit e01b5b129661ee1eaddd4f2a0d8df6cb170339a5 Author: Stefan Weil Date: Sun Nov 7 22:14:53 2010 +0100 Blackfin: tll6527m: fix spelling in unused code (struct name) platfrom -> platform This changes a struct name. The related code is conditionally compiled and won't work because the include file linux/gpio-decoder.h is missing, so removing this code would be an even better solution. If the missing include file is added, it must fix the spelling, too. Signed-off-by: Stefan Weil Signed-off-by: Mike Frysinger commit 624fab3bcdb46fd9678b5aa3d084c5208d925e48 Author: Sonic Zhang Date: Fri Nov 5 11:29:46 2010 +0000 Blackfin: bf527-ezkit: add adau1373 chip address Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 398834330cb07ba66fca5fb23a51075a67e4d4fa Author: Sonic Zhang Date: Thu Nov 4 08:01:37 2010 +0000 Blackfin: no-mpu: fix masking of small uncached dma region When using an uncached DMA region less than 1 MiB, we try to mask off the whole last 1 MiB for it. Unfortunately, this fails as we forgot to subtract one from the calculated mask, leading to the region still be marked as cacheable. Reported-by: Andrew Rook Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 36e11ab23e22243b9c608a08c8d68ca5686b6c9b Author: Steven Miao Date: Wed Nov 3 09:25:09 2010 +0000 Blackfin: pm: drop irq save/restore in standby and suspend to mem callback Since linux-2.6.31, the kernel suspend framework will do disable_irq/enable_irq, so save/restore irq in standby and suspend to mem callback should be dropped. Otherwise the common code notices things are enabled and complains. Signed-off-by: Steven Miao Signed-off-by: Mike Frysinger commit 527a1a83cc1ba4fc3e0f708cff062b834fbbcab9 Author: Michael Hennerich Date: Thu Oct 28 11:31:28 2010 +0000 MAINTAINERS: update Analog Devices support info Add more Analog Devices driver entries and refine the differences between Blackfin-specific code and processor independent drivers. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit e15124c14c12a3809dfce4517a2afcbe1cf9b346 Author: Mike Frysinger Date: Thu Oct 28 15:34:09 2010 -0400 Blackfin: dpmc.h: pull in new pll.h Any consumer of dpmc.h expects to use VR_CTL, so also pull in the new mach/pll.h header for those functions. Signed-off-by: Mike Frysinger commit 77c90e3d35c17c371fbef91fa6e180e954c1faba Author: Mike Frysinger Date: Wed Oct 27 20:21:51 2010 +0000 Blackfin: bf54x: add MMR layout for PINT Signed-off-by: Mike Frysinger commit ec5109e7ca086359c46fe5351121d0e125a2879b Author: Mike Frysinger Date: Wed Oct 27 16:32:24 2010 -0400 Blackfin: bf561: SMP: add multicore pll handlers Signed-off-by: Mike Frysinger commit 10cdc1a78a02bb1d76b28b146083cb060399d86f Author: Mike Frysinger Date: Wed Oct 27 15:29:26 2010 -0400 Blackfin: unify pll.h headers Signed-off-by: Mike Frysinger commit 73a400646b8e26615f3ef1a0a4bc0cd0d5bd284c Author: Yi Li Date: Thu Dec 17 08:20:32 2009 +0000 Blackfin: SMP: rewrite IPI handling to avoid memory allocation Currently, sending an interprocessor interrupt (IPI) requires building up a message dynamically which means memory allocation. But often times, we will want to send an IPI in low level contexts where allocation is not possible which may lead to a panic(). So create a per-cpu static array for the message queue and use that instead. Further, while we have two supplemental interrupts, we are currently only using one of them. So use the second one for the most common IPI message of all -- smp_send_reschedule(). This avoids ugly contention for locks which in turn would require an IPI message ... In general, this improves SMP performance, and in some cases allows the SMP port to work in places it wouldn't before. Such as the PREEMPT_RT state where the slab is protected by a per-cpu spin lock. If the slab kmalloc/kfree were to put the task to sleep, and that task was actually the IPI handler, then the system falls down yet again. After running some various stress tests on the system, the static limit of 5 messages seems to work. On the off chance even this overflows, we simply panic(), and we can review that scenario to see if the limit needs to be increased a bit more. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 2c1657c29f810d0ba32cde54cba1e916815493e5 Author: Graf Yang Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: SMP: relocate blackfin_core_id() definition Since we're breaking apart some inter-header dependencies to avoid more circular loops, move the blackfin_core_id() definition to the func that it is based upon. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 05c3457ec2d5d02aec58d246179df19d6b2de752 Author: Mike Frysinger Date: Wed Oct 27 10:07:33 2010 -0400 Blackfin: SMP: fix build breakage in cache.h The SMP code needs "asmlinkage" which linkage.h provides. Signed-off-by: Mike Frysinger commit 54d756ed1a6498f403980ece028b61719cfbe813 Author: Graf Yang Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: SMP: add missing arch_{read,write}_lock_flags helpers Common code expects these to be defined for SMP ports, so add them. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 49fcc7b16f23167f0ee945228bd811a1a2728c77 Author: Graf Yang Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: bf561: fix mem_map.h SMP overrides The BF561 mem_map.h header has the __ASSEMBLY__/CONFIG_SMP checks out of order which leads to build errors for assembly code that happens to include this file. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 75734e660665b9bb5da8fc06beb491b716f9af77 Author: Graf Yang Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: SMP: tweak platform_request_ipi() usage This function takes an irq_handler_t function, but the prototype in the header doesn't match the function definition. This is due to the smp headers needing to avoid circular dependencies. So change the function to take a simple pointer. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 71a516adb6f3f178b0a961c55e7da75f8947afa5 Author: Mike Frysinger Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: SMP: fix asm/bitops.h errors The common asm-generic non-atomic bitops.h defines test_bit() for us, but we need to use our own version. So redirect the definition of this func to avoid having to inline the rest of the asm-generic file. Signed-off-by: Mike Frysinger commit 9c199b5965c76f90b297e01accb933624dc8d242 Author: Graf Yang Date: Mon Sep 21 11:51:31 2009 +0000 Blackfin: SMP: fix cpumask misbehavior The cpu maps are defines provided by common linux/cpumask.h, not local variables. So stop exporting them locally and include the right header for their definition. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 71a66287d9c2fd07f1017f23db6ccc68ac4c4a96 Author: Graf Yang Date: Fri Mar 12 04:24:21 2010 +0000 Blackfin: SMP: rename the arch_xxx lock funcs to __raw_xxx The external functions are named __raw_xxx, not arch_xxx, so rename the prototypes to match reality. This fixes some simple build errors in the bfin_ksyms.c code which exports these helpers to modules. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 57afb399350b45c0067f4979ce9f0c754239b048 Author: Sonic Zhang Date: Wed Sep 9 10:46:19 2009 +0000 serial: bfin_5xx: move resources into board files Rather than maintain Kconfig entries where people have to enter raw numbers and hardcode lists of addresses/pins in the driver itself, push it all to platform resources. This lets us simplify the driver, the Kconfig, and gives board porters greater flexibility. In the process, we need to also start supporting the early platform interface. Not a big deal, but it causes the patch to be bigger than a simple resource relocation. All the Blackfin boards already have their resources updated and in place for this change. Signed-off-by: Sonic Zhang Acked-by: Greg Kroah-Hartman Signed-off-by: Mike Frysinger commit 94a038c2e6228727ae0549af75e97b9b634cd468 Author: Mike Frysinger Date: Wed Oct 27 10:06:32 2010 -0400 Blackfin: bf561: update a few more SIC_SYSCR locations Looks like I missed a few new spots when renaming the SICA macros. Signed-off-by: Mike Frysinger commit a2ce077ab3ea30b61a39038cc8d14119c0b2e90a Author: Mike Frysinger Date: Wed Oct 27 00:08:46 2010 -0400 Blackfin: drop asm/irq.h include from mach headers These were only included because of the irq handling of the PLL funcs, and those PLL funcs have been moved out into their own header now. Signed-off-by: Mike Frysinger commit 53ee5826546df6b1a989393f8701d1380a441449 Author: Mike Frysinger Date: Tue Oct 26 23:56:12 2010 -0400 Blackfin: bf51x/bf52x: drop redundant "base" def/cdef header The defBF512.h header exists only to include defBF51x_base.h, and it is the only place where defBF51x_base.h is included. So move the contents of the defBF51x_base.h header into the defBF512.h header. Same situation for the other def/cdef pairs. Signed-off-by: Mike Frysinger commit 1a5c226528990515c603bae04233016411b44159 Author: Mike Frysinger Date: Tue Oct 26 23:46:22 2010 -0400 Blackfin: clean up mach header includes The main asm/blackfin.h header will pull in mach/blackfin.h to get all the fun Blackfin defines. So having any of the sub-mach headers trying to include asm/blackfin.h makes no sense -- punt it. The mach/blackfin.h header takes care of including the part-specific def headers which in turn will include any other needed def file. Similarly, it takes care of pulling in the part-specific cdef header. So move this logic out of the blackfin.h when necessary. Further, make sure the cdef headers do not waste time including the def headers again. Since all parts need the common def/cdef headers, move this logic out of the part-specific headers and into the mach/blackfin.h file. Finally, we need to split the BF539 def header since the BF538 does not have MXVR and we don't want to expose those MMRs. So now all parts should have the same behavior: mach/blackfin.h asm/def_LPBlackfin.h part-specific def.h if ! asm asm/cdef_LPBlackfin.h part-specific cdef.h And the sub def/cdef headers only tail into what they need. Signed-off-by: Mike Frysinger commit 51946b10cfc741bfdcb82ea6ba65e775702f3a27 Author: Mike Frysinger Date: Tue Oct 26 22:55:28 2010 -0400 Blackfin: bf533: merge fio_flag back into normal mach headers We don't want the BF533 to be different in terms of its MMR headers, so merge the FIO_FLAG helpers back into the normal place. To avoid circular dependencies with headers, turn the inline C funcs into CPP defines. Not like there will be any code size differences. Signed-off-by: Mike Frysinger commit c31b3f73855821d8292904a7c36f5ec9d2ba2c5b Author: Mike Frysinger Date: Tue Oct 26 21:40:31 2010 -0400 Blackfin: bf561-ezkit: add SMP defconfig Since the SMP code paths tend to compile fail a lot, start a SMP defconfig so our nightly build tools will automatically test it. Signed-off-by: Mike Frysinger commit 30e9b95a8233c11f53e0763e339621271865a4ec Author: Mike Frysinger Date: Tue Oct 26 21:30:29 2010 -0400 Blackfin: bf533: convert boards to gpio framework We don't want people banging on MMRs directly. As for the ip0x board, it shouldn't need to muck with the CS pin directly as the Blackfin SPI bus master driver takes care of driving this. Signed-off-by: Mike Frysinger commit 4de2bf8786ec8ec9a45b556e1ddf5c80c807a361 Author: Mike Frysinger Date: Mon Oct 25 21:11:10 2010 -0400 Blackfin: push gpio (port) defines into common headers Signed-off-by: Mike Frysinger commit 9887f41533c860777b2fcf2eccf04f95980ab52a Author: Mike Frysinger Date: Mon Oct 25 21:10:43 2010 -0400 Blackfin: bf54x: drop unused legacy MMR names Signed-off-by: Mike Frysinger commit 5e3bcf30d655c2e277c77b523347685d06bb9d31 Author: Mike Frysinger Date: Mon Oct 25 18:11:09 2010 +0000 Blackfin: dma: constify MMR pointer array The array of pointers is never written, so constify it. Signed-off-by: Mike Frysinger commit 9346dba55672a6f04b7bfd1faa081ff149995a3f Author: Mike Frysinger Date: Mon Oct 25 08:04:44 2010 +0000 Blackfin: standardize DMAC traffic control MMRs & MDMA MMRs Use the same naming convention for DMA traffic MMRs (most were legacy anyways) so we can avoid useless ifdef trees. Same goes for MDMA names -- this actually allows us to undo a bunch of ifdef redirects that existed for this purpose alone. Signed-off-by: Mike Frysinger commit 6c8e75a06c8ee32c68ce90afa4a0fe093327b0e4 Author: Mike Frysinger Date: Mon Oct 25 08:02:30 2010 +0000 Blackfin: bfin_dma.h: start a header for DMA MMR layout Signed-off-by: Mike Frysinger commit cfbf1677a336d5e3db6e80d1ed58fbf4b29450ed Author: Mike Frysinger Date: Tue Feb 16 04:03:18 2010 -0500 Blackfin: switch to asm-generic/io.h Acked-by: Arnd Bergmann Signed-off-by: Mike Frysinger commit efb2d31c1c62de9a0e42b2b1981d1a90fc0b4618 Author: Mike Frysinger Date: Tue Oct 26 21:52:59 2010 -0400 asm-generic/io.h: add reads[bwl]/writes[bwl] helpers A bunch of arches define reads[bwl]/writes[bwl] helpers for accessing memory mapped registers. Since the Blackfin ones aren't specific to Blackfin code, move them to the common asm-generic/io.h for people. Acked-by: Arnd Bergmann Signed-off-by: Mike Frysinger commit 21aa8ec362b59458bea1144494ae53ca2d8b13ed Author: Mike Frysinger Date: Mon Jan 10 02:45:57 2011 -0500 net/irda: bfin_sir: back out transitional defines Now that the common header is sane, we can drop the transitional cruft. Signed-off-by: Mike Frysinger commit b1524e29e318e79b2d04bcbd651a7af8dff32bb3 Author: Mike Frysinger Date: Mon Sep 28 03:16:01 2009 +0000 Blackfin: bfin_serial.h: unify heavily duplicated serial code Each Blackfin port has been duplicating UART structures and defines when there really is no need for it. So start a new bfin_serial.h header to unify all these pieces and give ourselves a fresh start. Signed-off-by: Mike Frysinger commit 709465d6ea0466454ef547e7d1065db2b23033a9 Author: Mike Frysinger Date: Thu Oct 28 15:43:50 2010 -0400 net/irda: bfin_sir: pull in serial headers for defines We're in the process of cleaning up the global Blackfin namespace, so the bfin_sir driver needs to pull in the serial header explicitly now. This does add a little transitional cruft to keep things compiling, but a follow up patch in this series will cull that. Signed-off-by: Mike Frysinger commit 759a3f3f3171c521229dda2335e5ab105f6fdc40 Author: Bob Liu Date: Fri Sep 17 11:09:57 2010 +0000 Blackfin: musb-boards: push clkin value to platform resources In order to not touch the driver file for different xtal usage, push the clkin value to board file and calculate the register value instead of hardcoding it. Signed-off-by: Bob Liu Signed-off-by: Mike Frysinger commit 1a314ad4b0e3d6d76fb04c0481e95bd026c57749 Author: Graf Yang Date: Thu Jan 28 10:46:55 2010 +0000 Blackfin: SMP: fix hotplug building after irq header shuffle Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit b60fc60ceab36cbba218888b52e87998fca06936 Author: Vasily Khoruzhick Date: Thu Jan 6 22:15:49 2011 +0200 ASoC: RX1950: Enable Mic Jack during glue driver init Enable Mic Jack during glue driver init, otherwise capture will not work. Signed-off-by: Vasily Khoruzhick Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3daa7ea650d59ae86926f0ced4c4ccd99ab33fda Author: Jesper Juhl Date: Thu Jan 6 22:19:47 2011 +0100 ALSA: Don't leak in sound/core/oss/pcm_oss.c::snd_pcm_hw_param_near() snd_pcm_hw_param_near() will leak the memory allocated to 'save' if the call to snd_pcm_hw_param_max() returns less than zero. This patch makes sure we never leak. Signed-off-by: Jesper Juhl Signed-off-by: Takashi Iwai commit ca6cd851d7d22767d68b674590d836f468d1913a Author: Daniel T Chen Date: Sat Jan 8 18:25:27 2011 -0500 ALSA: hda: Use vostro model quirk for Dell Vostro 1014 BugLink: https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5184 A user reported on the alsa-devel mailing list that he needs to use the vostro model quirk to have audible playback, so apply it for his PCI SSID. Reported-and-tested-by: Fernando Lemos Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 22f21d51bb20e7aef1167b71c4c3c0ff0efa9bf6 Author: David Henningsson Date: Fri Jan 7 07:53:39 2011 +0100 ALSA: HDA: Add Lenovo vendor quirk for Conexant 205xx BugLink: http://bugs.launchpad.net/bugs/689036 Many new Lenovos need the ideapad quirk. Also, since the auto parser for this chip is far from optimal, the regression risk is low (although not zero). Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 5322bf2790fb91328aac1783bb1963ea3a172bcf Author: David Henningsson Date: Wed Jan 5 11:03:56 2011 +0100 ALSA: HDA: Fix volume control indices for Mics (Realtek) If more than one mic is present with different locations, e g "Front Mic" and "Rear Mic", they can use the same index (0), since their names are different. Previous behavior was to have "Front Mic" as index 1, causing it to be ignored by e g PulseAudio. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 5f99f86a801f937ed51deedc36ad4efc47d95cdd Author: David Henningsson Date: Tue Jan 4 15:24:24 2011 +0100 ALSA: HDA: Rename "Mic Boost" to "Mic Boost Volume" BugLink: http://bugs.launchpad.net/bugs/697240 If the "Volume" suffix is not given, alsa-lib gets confused and loses the dB information at the simple element level. Boosts generally affects both playback and capture, as they are applied early in the chain. Hence no "Playback" or "Capture" in the suffix. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit bdfe6f452f9005731a6784c88503432864343240 Author: David Henningsson Date: Tue Jan 4 06:30:53 2011 +0100 ALSA: HDA: Add internal mic for IDT 92HD88B BugLink: http://bugs.launchpad.net/bugs/696493 According to datasheet (and real-world testing), IDT 92HD88B can have internal mics at NID 0x11 and 0x20, so enable them accordingly. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 70c673a48072ff73425b82800479e66f918b8718 Merge: 1052802 e03fa05 Author: Takashi Iwai Date: Mon Jan 10 10:49:13 2011 +0100 Merge branch 'fix/hda' into topic/hda commit 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c Author: Sumit Semwal Date: Thu Dec 2 11:27:14 2010 +0000 OMAP: DSS2: Introduce omap_channel as an omap_dss_device parameter, add new overlay manager. A panel connects to one of the overlay managers of DSS through some interface block. On OMAP4, specifying the type of the display is not sufficient to conclude which manager the panel should be connected to. Hence, a new member 'channel' is introduced in omap_dss_device structure to determine which manager the panel uses. The dss_recheck_connections() called in dss_driver_probe() uses this channel parameter to set the correct manager to the corresponding omap_dss_device. The channel parameter is used only once to ensure the correct managers are set for each panel. The parameter dssdev->manager->id will take care of ensuring that the panel and then the interface driver configures the correct DISPC channel. Also, add a new Overlay Manager in manager.c, make other changes needed for LCD2 channel. Signed-off-by: Sumit Semwal Signed-off-by: Mukund Mittal Signed-off-by: Samreen Signed-off-by: Tomi Valkeinen commit 6ced40bfc01f016de89b65d9c733c1fb5eeb06d0 Author: Archit Taneja Date: Thu Dec 2 11:27:13 2010 +0000 OMAP: DSS2: Use dss_features to handle DISPC bits removed on OMAP4 DISPC_CONFIG bits LCDENABLEPOL, LCDENABLESIGNAL, PCKFREEENABLE and FUNCGATED have been removed from OMAP4, use dss_features to handle them correctly. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 2a205f34b8fb2b86887b177befa7b42efd7a60b9 Author: Sumit Semwal Date: Thu Dec 2 11:27:12 2010 +0000 OMAP: DSS2: LCD2 Channel Changes for DISPC DISPC functions are modified in order to work when the manager is LCD2. This includes: Adding new IRQs specific to LCD2 and their handling. Provide dumps of the new manager's registers. Provide dumps of the new manager's clocks. Checks for channel for registers DISPC_CONTROL2 and DISPC_CONFIG2 which can't be parametrized. Signed-off-by: Sumit Semwal Signed-off-by: Mukund Mittal Signed-off-by: Samreen Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit ff1b2cde3f551c9b56887b41e0ebbf2907566a7d Author: Sumit Semwal Date: Thu Dec 2 11:27:11 2010 +0000 OMAP: DSS2: Change remaining DISPC functions for new omap_channel argument The following dispc functions are also changed to incorporate channel as an argument: -dispc_lclk_rate() -dispc_pclk_rate() -dispc_set_pol_freq() -dispc_set_clock_div() -dispc_get_clock_div() Signed-off-by: Sumit Semwal Signed-off-by: Mukund Mittal Signed-off-by: Samreen Signed-off-by: Archit Taneja [tomi.valkeinen@nokia.com: fixed trivial compile error] Signed-off-by: Tomi Valkeinen commit 64ba4f748a005a44c03c98e082d8ee157f4ee66f Author: Sumit Semwal Date: Thu Dec 2 11:27:10 2010 +0000 OMAP: DSS2: Introduce omap_channel argument to DISPC functions used by interface drivers The interface drivers (dsi.c, sdi.c etc) need to call dispc functions with dssdev->manager->id as a parameter to specify the DISPC channel which they want to configure/use, this is required as the same functions are now used to configure dispc registers of different channels. The following dispc functions are changed to incorporate channel as an argument: -dispc_enable_fifohandcheck() -dispc_set_lcd_size() -dispc_set_parallel_interface_mode() -dispc_set_tft_data_lines() -dispc_set_lcd_display_type() -dispc_set_lcd_timings() Signed-off-by: Sumit Semwal Signed-off-by: Mukund Mittal Signed-off-by: Samreen Signed-off-by: Archit Taneja [tomi.valkeinen@nokia.com: fixed trivial compile error] Signed-off-by: Tomi Valkeinen commit 8613b0005d315582a988bbeb2249d69df343eb3a Author: Sumit Semwal Date: Thu Dec 2 11:27:09 2010 +0000 OMAP: DSS2: Represent DISPC register defines with channel as parameter On OMAP4, we have a new DISPC channel for Overlay Manager LCD2. There is a set of regsiters for LCD2 channel similar to the existing LCD channel, like DISPC_CONTROL2, DISPC_DIVISOR2, DISPC_CONFIG2 and so on. Introduce new enum members for LCD2 Channel and corresponding Overlay Manager in display.h. Represent the following DISPC register defines with channel as a parameter to differentiate between LCD and LCD2 registers (and also DIGIT in some cases): DISPC_DEFAULT_COLOR, DISPC_TRANS_COLOR, DISPC_TIMING_H, DISPC_TIMING_V, DISPC_POL_FREQ, DISPC_DIVISOR, DISPC_SIZE_LCD, DISPC_DATA_CYCLEk, DISPC_CPR_COEF_R, DISPC_CPR_COEF_G and DISPC_CPR_COEF_B This parametrization helps in reducing the number of register defines for DISPC. Replace the existing reads/writes to these registers in this new way. Also, Introduce defines for registers DISPC_CONTROL2 and DISPC_CONFIG2 which are used exclusively for LCD2 channel. Signed-off-by: Sumit Semwal Signed-off-by: Mukund Mittal Signed-off-by: Samreen Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit d50cd0373ad380fcc7f6fb4e020be4239174756d Author: Archit Taneja Date: Thu Dec 2 11:27:08 2010 +0000 OMAP: DSS2: Add dss_features for omap4 and overlay manager related features Initialize a dss_features struct for omap4. Add support for LCD2 manager by introducing a new member in dss_feat_id. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 8dad2ab6727f4dd9fdef06b890d736d7c6d1a725 Author: Archit Taneja Date: Thu Nov 25 17:58:10 2010 +0530 OMAP: DSS2: Clean up DISPC color mode validation checks The supported set of color modes varies for different DISPC pipelines(plane) and omap version. This makes the checks for validation of a color mode more complicated as new omap versions are added. A dss_feature function is created which tells if a color_mode is supported for a plane on the current omap revision. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit ac1427e13b114f0c394fbc9bb7616f47d03bdba2 Author: Bryan Wu Date: Thu Nov 18 09:45:59 2010 +0800 OMAP: DSS2: Add back authors of panel-generic.c based drivers Signed-off-by: Bryan Wu Signed-off-by: Tomi Valkeinen commit da9d2f47aa74f20b07ebbe04676b67ead2672abf Author: Bryan Wu Date: Wed Nov 17 13:34:35 2010 +0000 OMAP: DSS2: remove generic DPI panel driver duplicated panel drivers Still keep sharp_ls_panel driver, because it contains blacklight control driver. Signed-off-by: Bryan Wu Acked-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 89747c9141cd750a610974d93f71492922b8cbd7 Author: Bryan Wu Date: Wed Nov 17 13:34:34 2010 +0000 OMAP: use generic DPI panel driver in board files Still keep sharp_ls_panel, since the sharp_ls_panel driver contains blacklight control driver code which will be moved out later. Then we can use generic DPI driver for sharp_ls_panel. Signed-off-by: Bryan Wu Acked-by: Archit Taneja Acked-by: Tony Lindgren Signed-off-by: Tomi Valkeinen commit a9a62b6a886545960488cae3b97acb482361b802 Author: Bryan Wu Date: Wed Nov 17 13:34:33 2010 +0000 OMAP: DSS2: Add generic DPI panel display driver Generic DPI panel driver includes the driver and 4 similar panel configurations. It will match the panel name which is passed from platform data and setup the right configurations. With generic DPI panel driver, we can remove those 4 duplicated panel display drivers. In the future, it is simple for us just add new panel configuration date in panel-generic-dpi.c to support new display panel. Signed-off-by: Bryan Wu Acked-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 36e8c27f3bee5e58f96b0a79d65922fa9e53b030 Author: Samreen Date: Tue Nov 16 12:49:07 2010 +0100 OMAP: DSS2: OMAPFB: Add null pointer check A null pointer check added. And using kstrdup() instead of kmalloc() & strcpy() Signed-off-by: Samreen Signed-off-by: Tomi Valkeinen commit ed3f90954654a5d9d07b30d39434392a644602fb Author: Kishore Y Date: Mon Nov 15 07:09:04 2010 +0100 OMAP3: Enable display on ZOOM2/3/3630SDP Enable Display on zoom2, zoom3 and 3630sdp boards. Signed-off-by: Mukund Mittal Signed-off-by: Kishore Y Signed-off-by: Samreen Signed-off-by: Tomi Valkeinen commit a64903357596c64f3848d448033eb5cc7563c00d Author: Kishore Y Date: Mon Nov 15 07:09:03 2010 +0100 OMAP3: ZOOM2/3/3630SDP: Add display board file for OMAP3 Board-zoom-display.c added as a common file for display functionality on boards zoom2, zoom3 and 3630sdp. Signed-off-by: Mukund Mittal Signed-off-by: Kishore Y Signed-off-by: Rajkumar N Signed-off-by: Samreen Signed-off-by: Tomi Valkeinen commit 2d2afa46e320b22d1ddcd430d62d6363b0a7e2b9 Author: Erik Gilling Date: Tue Oct 26 05:12:36 2010 +0200 OMAP: DSS2: Add NEC NL8048HL11-01B display panel NEC WVGA LCD NL8048HL11-01B panel support has been added. This panel is being used in zoom2/zoom3/3630 sdp boards. Signed-off-by: Mukund Mittal Signed-off-by: Rajkumar N Signed-off-by: Samreen CC: Subbu Venkatesh CC: Erik Gilling Signed-off-by: Tomi Valkeinen commit fd28a39071cee34ec59021f620f6dfca5f89ac9b Author: Rajkumar N Date: Thu Nov 4 12:28:42 2010 +0100 OMAP3630: DSS2: Enable Pre-Multiplied Alpha Support Enable dss to process color formats with pre-mulitplied alpha. With this we can have alpha values defined for each pixel and hence can have different blending values for each pixel. sysfs entry has been created for this and pre-multiplied alpha support is turned off by default. Signed-off-by: Sudeep Basavaraj Signed-off-by: Rajkumar N Signed-off-by: Samreen Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 8fbde10aff726c9b5a1a2fe878a072b937d32476 Author: Samreen Date: Thu Nov 4 12:28:41 2010 +0100 OMAP3: DSS2: Split OMAP3 has feature for 3430 & 3630 Splitting the OMAP3 dss has feature separately for omap3430 & omap3630 Signed-off-by: Samreen Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 712247a6811530acdd604fa21574ccf1f2d80838 Author: Archit Taneja Date: Mon Nov 8 12:56:21 2010 +0100 OMAP: DSS2: Fix: Read correct bit in dispc_enable_alpha_blending() Read correct DISPC_CONFIG bit when the channel is DIGIT, remove extra line at the end of the function. Signed-off-by: Archit Taneja Signed-off-by: Tomi Valkeinen commit 4aed89d6b515b9185351706ca95cd712c9d8d6a3 Author: Pierre Tardy Date: Thu Jan 6 16:23:29 2011 +0100 x86, lapic-timer: Increase the max_delta to 31 bits Latest atom socs(penwell) does not have hpet timer. As their local APIC timer is clocked at 400KHZ, and the current code limit their Initial Counter register to 23 bits, they cannot sleep more than 1.34 seconds which leads to ~2 spurious wakeup per second (1 per thread) These SOCs support 32bit timer so we change the max_delta to at least 31bits. So we can at least sleep for 300 seconds. We could not find any previous chip errata where lapic would only have 23 bit precision As powertop is suggesting to activate HPET to "sleep longer", this could mean this problem is already known. Problem is here since very first implementation of lapic timer as a clock event e9e2cdb [PATCH] clockevents: i386 drivers. Signed-off-by: Suresh Siddha Signed-off-by: Pierre Tardy Acked-by: Thomas Gleixner Cc: Arjan van de Ven Cc: Adrian Bunk Cc: H. Peter Anvin Cc: john stultz Cc: Roman Zippel Cc: Andi Kleen LKML-Reference: <1294327409-19426-1-git-send-email-pierre.tardy@intel.com> Signed-off-by: Ingo Molnar commit 9adcc4a127be6c979eae1ae34083261f2ec5dfec Merge: 30285c6 d906f0e Author: Ingo Molnar Date: Mon Jan 10 09:35:57 2011 +0100 Merge branch 'x86/numa' into x86/urgent Merge reason: Topic is ready for upstream. Signed-off-by: Ingo Molnar commit 30285c6f03be05f6f894b50d03bcb638886e3936 Merge: 91d88ce 1c2a48c Author: Ingo Molnar Date: Mon Jan 10 09:34:42 2011 +0100 Merge branch 'x86/apic-cleanups' into x86/urgent Merge reason: Topic is ready for upstream. Signed-off-by: Ingo Molnar commit d15be32c30e6108cdab76ca895a19b5f8b88b5ca Author: Amerigo Wang Date: Fri Jan 7 16:43:54 2011 +0800 microblaze: remove obsolete DEBUG_BOOTMEM "git grep" shows this is the last piece of code using DEBUG_BOOTMEM, so remove it. Signed-off-by: WANG Cong Signed-off-by: Michal Simek commit 20c040ce2176be4be250503497a0a103a3fb3b3e Merge: 7f01af0 3c0eee3 Author: Michal Simek Date: Mon Jan 10 09:29:29 2011 +0100 Merge commit 'v2.6.37' into next commit 797a455d2c682476c3797dbfecf5bf84c1e3b9d3 Author: Jens Axboe Date: Mon Jan 10 09:06:44 2011 +0100 block: ensure that completion error gets properly traced We normally just use the BIO_UPTODATE flag to signal 0/-EIO. If we have more information available, we should pass that along to the trace output. Signed-off-by: Jens Axboe commit 0174b0c30a9de25dcb0d3049defcfad0c2947a36 Author: Michael S. Tsirkin Date: Mon Jan 10 10:03:20 2011 +0200 vhost: fix signed/unsigned comparison To detect that a sequence number is done, we are doing math on unsigned integers so the result is unsigned too. Not what was intended for the <= comparison. The result is user stuck forever in flush call. Convert to int to fix this. Further, get rid of ({}) to make code clearer. Signed-off-by: Michael S. Tsirkin commit 45b9f509b7f5d2d792b3c03b78ddc8ec543e921b Author: Alexander Duyck Date: Thu Jan 6 14:29:59 2011 +0000 ixgbe: update ntuple filter configuration This change fixes several issues found in ntuple filtering while I was doing the ATR refactor. Specifically I updated the masks to work correctly with the latest version of ethtool, I cleaned up the exception handling and added detailed error output when a filter is rejected, and corrected several bits that were set incorrectly in ixgbe_type.h. The previous version of this patch included a printk that was left over from me fixing the filter setup. This patch does not include that printk. Signed-off-by: Alexander Duyck Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 69830529b26e6dc9582a4b65ab88f40f050cf94e Author: Alexander Duyck Date: Thu Jan 6 14:29:58 2011 +0000 ixgbe: further flow director performance optimizations This change adds a compressed input type for atr signature hash computation. It also drops the use of the set functions when setting up the ATR input since we can then directly setup the hash input as two dwords that can be stored and passed as registers. With these changes the cost of computing the has is low enough that we can perform a hash computation on each TCP SYN flagged packet allowing us to drop the number of flow director misses considerably in tests such as netperf TCP_CRR. Signed-off-by: Alexander Duyck Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 905e4a4163c4e807daf1f1f6b8f958e762a834a8 Author: Alexander Duyck Date: Thu Jan 6 14:29:57 2011 +0000 ixgbe: cleanup flow director hash computation to improve performance This change cleans up the layout of the flow director data, and the algorithm used to calculate the hash resulting in a 35x / 3500% performance increase versus the old flow director hash computation. The overall effect is only a 1% increase in transactions per second though due to the fact that only 1 packet in 20 are actually hashed upon. TCP_RR before: Socket Size Request Resp. Elapsed Trans. Send Recv Size Size Time Rate bytes Bytes bytes bytes secs. per sec 16384 87380 1 1 60.00 23059.27 16384 87380 TCP_RR after: Socket Size Request Resp. Elapsed Trans. Send Recv Size Size Time Rate bytes Bytes bytes bytes secs. per sec 16384 87380 1 1 60.00 23239.98 16384 87380 Signed-off-by: Alexander Duyck Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 2d39d576fad0fd4bb79a0de26fca50a4be1ffdc1 Author: Yi Zou Date: Thu Jan 6 14:29:56 2011 +0000 ixgbe: make sure per Rx queue is disabled before unmapping the receive buffer When disable the Rx logic globally, we would also want to disable the per Rx queue receive logic by per queue Rx control register RXDCTL so no more DMA is happening from the packet buffer to the receive buffer associated with the Rx ring, before we start unmapping Rx ring receive buffer. The hardware may take max of 100us before the corresponding Rx queue is really disabled. Added ixgbe_disable_rx_queue() for this purpose. Signed-off-by: Yi Zou Tested-by: Stephen Ko Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 5377a4160bb65ee4dd11b4b1d081d86d56d92bff Author: Dirk Brandewie Date: Thu Jan 6 14:29:54 2011 +0000 e1000: Add support for the CE4100 reference platform This patch adds support for the gigabit phys present on the CE4100 reference platforms. Signed-off-by: Dirk Brandewie Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 77996d1d4c1cf0059f5c2d1cea9d5135ac1b8c91 Author: Bruce Allan Date: Thu Jan 6 14:29:53 2011 +0000 e1000e: add custom set_d[0|3]_lplu_state function pointer for 82574 82574 needs to configure Low Power Link Up (or LPLU) differently than the other parts in the 8257x family supported by the driver. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 31dbe5b4ac6fca72dec946e4d0fa7f0913f1d9b1 Author: Bruce Allan Date: Thu Jan 6 14:29:52 2011 +0000 e1000e: power off PHY after reset when interface is down Some Phys supported by the driver do not remain powered off across a reset of the device when the interface is down, e.g. on 82571, but not on 82574. This patch powers down (only when WoL is disabled) the PHY after a reset if the interface is down and the ethtool diagnostics are not currently running. The ethtool diagnostic function required a minor re-factor as a result, and the e1000_[get|put]_hw_control() functions are renamed since they are no longer static to netdev.c as they are needed by the ethtool diagnostics. A couple minor whitespace issues were cleaned up, too. Reported-by: Arthur Jones Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit fe46f58fa61f025564a3c1e80b789885cb4b0f30 Author: Bruce Allan Date: Thu Jan 6 14:29:51 2011 +0000 e1000e: use either_crc_le() rather than re-write it For the 82579 jumbo frame workaround, there is no need to re-write the CRC calculation functionality already found in the kernel's ether_crc_le(). Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e0dc4f125456e57347a6d016bd7209f064135b1d Author: Bruce Allan Date: Thu Jan 6 14:29:50 2011 +0000 e1000e: properly bounds-check string functions Use string functions with bounds checking rather than their non-bounds checking counterparts, and do not hard code these boundaries. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 482fed85e64958f678a138a4b5f8891190d2b169 Author: Bruce Allan Date: Thu Jan 6 14:29:49 2011 +0000 e1000e: convert calls of ops.[read|write]_reg to e1e_[r|w]phy Cleans up the code a bit by using the driver-specific e1e_rphy and e1e_wphy macros instead of the full function pointer variants. Fix a couple whitespace issue with two already existing calls to e1e_wphy. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dd93f95e92283498f2497a632a81c167444668b5 Author: Bruce Allan Date: Thu Jan 6 14:29:48 2011 +0000 e1000e: cleanup variables set but not used The ICR register is clear on read and we don't care what the returned value is when resetting the hardware so the icr variable(s) can be removed. We should not ignore the return from e1000_lv_jumbo_workaround_ich8lan() and from e1000_get_phy_id_82571() (dump a debug message when it fails and when an unknown Phy id is returned). Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0363466866d901fbc658f4e63dd61e7cc93dd0af Author: Jesse Gross Date: Sun Jan 9 06:23:35 2011 +0000 net offloading: Convert checksums to use centrally computed features. In order to compute the features for other offloads (primarily scatter/gather), we need to first check the ability of the NIC to offload the checksum for the packet. Since we have already computed this, we can directly use the result instead of figuring it out again. Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit 02932ce9e2c136e6fab2571c8e0dd69ae8ec9853 Author: Jesse Gross Date: Sun Jan 9 06:23:34 2011 +0000 net offloading: Convert skb_need_linearize() to use precomputed features. This switches skb_need_linearize() to use the features that have been centrally computed. In doing so, this fixes a problem where scatter/gather should not be used because the card does not support checksum offloading on that type of packet. On device registration we only check that some form of checksum offloading is available if scatter/gatther is enabled but we must also check at transmission time. Examples of this include IPv6 or vlan packets on a NIC that only supports IPv4 offloading. Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit 91ecb63c074d802f8cf103f1dafb4aed24d0f24c Author: Jesse Gross Date: Sun Jan 9 06:23:33 2011 +0000 net offloading: Convert dev_gso_segment() to use precomputed features. This switches dev_gso_segment() to use the device features computed by the centralized routine. In doing so, it fixes a problem where it would always use dev->features, instead of those appropriate to the number of vlan tags if any are present. Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit fc741216db156994c554ac31c1151fe0e00d8f0e Author: Jesse Gross Date: Sun Jan 9 06:23:32 2011 +0000 net offloading: Pass features into netif_needs_gso(). Now that there is a single function that can compute the device features relevant to a packet, we don't want to run it for each offload. This converts netif_needs_gso() to take the features of the device, rather than computing them itself. Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit f01a5236bd4b140198fbcc550f085e8361fd73fa Author: Jesse Gross Date: Sun Jan 9 06:23:31 2011 +0000 net offloading: Generalize netif_get_vlan_features(). netif_get_vlan_features() is currently only used by netif_needs_gso(), so it only concerns itself with GSO features. However, several other places also should take into account the contents of the packet when deciding whether to offload to hardware. This generalizes the function to return features about all of the various forms of offloading. Since offloads tend to be linked together, this avoids duplicating the logic in each location (i.e. the scatter/gather code also needs the checksum logic). Suggested-by: Michał Mirosław Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit 9497a0518e8183959e45da05f317f1cb36f2cd7c Author: Jesse Gross Date: Sun Jan 9 06:23:30 2011 +0000 net offloading: Accept NETIF_F_HW_CSUM for all protocols. We currently only have software fallback for one type of checksum: the TCP/UDP one's complement. This means that a protocol that uses hardware offloading for a different type of checksum (FCoE, SCTP) must directly check the device's features and do the right thing ahead of time. By the time we get to dev_can_checksum(), we're only deciding whether to apply the one algorithm in software or hardware. NETIF_F_HW_CSUM has the same capabilities as the software version, so we should always use it if present. The primary advantage of this is multiply tagged vlans can use hardware checksumming. Signed-off-by: Jesse Gross Signed-off-by: David S. Miller commit 365e215ce1f154e288ff0f7c9acbdf5421f57949 Author: Ryusuke Konishi Date: Mon Dec 27 00:07:30 2010 +0900 nilfs2: unfold nilfs_dat_inode function nilfs_dat_inode function was a wrapper to switch between normal dat inode and gcdat, a clone of the dat inode for garbage collection. This function got obsolete when the gcdat inode was removed, and now we can access the dat inode directly from a nilfs object. So, we will unfold the wrapper and remove it. Signed-off-by: Ryusuke Konishi commit bcbc8c648d6cc88f771435d8031c1a13e00945ed Author: Ryusuke Konishi Date: Mon Dec 27 00:05:49 2010 +0900 nilfs2: do not pass sbi to functions which can get it from inode This removes argument for passing nilfs_sb_info structure from nilfs_set_file_dirty and nilfs_load_inode_block functions. We can get a pointer to the structure from inodes. [Stephen Rothwell : fix conflict with commit b74c79e99389cd79b31fcc08f82c24e492e63c7e] Signed-off-by: Ryusuke Konishi commit 06df0f999247a3153c3ec284c7ada36ef785eb97 Author: Ryusuke Konishi Date: Mon Dec 27 00:04:06 2010 +0900 nilfs2: get rid of nilfs_mount_options structure Only mount_opt member is used in the nilfs_mount_options structure, and we can simplify it. Signed-off-by: Ryusuke Konishi commit a7a8447edef2cfa9b28cc3892993d9fafb362671 Author: Ryusuke Konishi Date: Mon Dec 27 00:03:02 2010 +0900 nilfs2: simplify nilfs_mdt_freeze_buffer nilfs_page_get_nth_block() function used in nilfs_mdt_freeze_buffer() always returns a valid buffer head, so its validity check can be removed. Signed-off-by: Ryusuke Konishi commit 888da23c2f70ca2e9897b725322a6456285ee9c4 Author: Ryusuke Konishi Date: Mon Dec 27 00:01:28 2010 +0900 nilfs2: get rid of loaded flag from nilfs object NILFS_LOADED flag of the nilfs object is not used now, so this will remove it. Signed-off-by: Ryusuke Konishi commit ae53a0a2ce2a89f1aa824a5fc6d2099907cfb409 Author: Ryusuke Konishi Date: Sun Dec 26 23:30:02 2010 +0900 nilfs2: fix a checkpatch error in page.c Will correct the following checkpatch error: ERROR: trailing whitespace #494: FILE: page.c:494: + $ Signed-off-by: Ryusuke Konishi commit 622daaff0a8975fb5c5b95f24f3234550ba32e92 Author: Ryusuke Konishi Date: Sun Dec 26 16:38:43 2010 +0900 nilfs2: fiemap support This adds fiemap to nilfs. Two new functions, nilfs_fiemap and nilfs_find_uncommitted_extent are added. nilfs_fiemap() implements the fiemap inode operation, and nilfs_find_uncommitted_extent() helps to get a range of data blocks whose physical location has not been determined. nilfs_fiemap() collects extent information by looping through nilfs_bmap_lookup_contig and nilfs_find_uncommitted_extent routines. Signed-off-by: Ryusuke Konishi commit 27e6c7a3ce29ae5fa5bec4ed5917f8508bfac120 Author: Ryusuke Konishi Date: Sun Dec 26 16:28:28 2010 +0900 nilfs2: mark buffer heads as delayed until the data is written to disk Nilfs does not allocate new blocks on disk until they are actually written to. To implement fiemap, we need to deal with such blocks. To allow successive fiemap patch to distinguish mapped but unallocated regions, this marks buffer heads of those new blocks as delayed and clears the flag after the blocks are written to disk. Signed-off-by: Ryusuke Konishi commit e828949e5b42bfd234ee537cdb7c5e3a577958a3 Author: Ryusuke Konishi Date: Fri Nov 19 15:26:20 2010 +0900 nilfs2: call nilfs_error inside bmap routines Some functions using nilfs bmap routines can wrongly return invalid argument error (i.e. -EINVAL) that bmap returns as an internal code for btree corruption. This fixes the issue by catching and converting the internal EINVAL to EIO and calling nilfs_error function inside bmap routines. Signed-off-by: Ryusuke Konishi commit b004a5eb0babec7ef91558f73315ef49e5a1f285 Author: Joe Perches Date: Tue Nov 9 16:35:21 2010 -0800 fs/nilfs2/super.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Ryusuke Konishi commit af1761f268ff2a58f2ea22e9b9de6359f7b2048e Author: Ryusuke Konishi Date: Tue Nov 23 23:37:23 2010 +0900 MAINTAINERS: add nilfs2 git tree entry NILFS2 filesystem section of the MAINTAINERS file lacks an entry of scm tree. This adds it. Signed-off-by: Ryusuke Konishi commit 56bec7c009872ef33fe452ea75fecba481351b44 Author: Alex Deucher Date: Wed Jan 5 11:57:52 2011 -0500 drm/radeon/kms: disable underscan by default Lots of HDMI TVs overscan the incoming image by default. The underscan option was added as a way to compensate for that by underscanning the image so that the edges would not be cut off on an overscanning TV. However, the TV provides no way of knowing whether it is overscanning or not. If the user has disabled overscan on their TV or has a TV that does not overscan, you will get black bars around the edges of your screen. Prior to the patch we got complaints and bug reports from users with overscanning TVs, now with the patch, we get lots of complaints and bug reports from users with non-overscanning TVs. There's no good default, but on average there have been more users complaining about it being on by default than off, so change it to off. This will probably result in a new deluge of overscanning TV user complaints. There's no winning. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c268cd36cc8fd543f58aee0392c78bb92e54edcb Author: Alex Deucher Date: Fri Dec 17 10:27:25 2010 -0500 drm/radeon/kms: only enable hdmi features if the monitor supports audio This avoids some issues in the current hdmi audio code for monitors without audio. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit eee3a96c6368f47df8df5bd4ed1843600652b337 Author: françois romieu Date: Sat Jan 8 02:17:26 2011 +0000 r8169: delay phy init until device opens. It workarounds the 60s firmware load failure timeout for the non-modular case. Signed-off-by: Francois Romieu Signed-off-by: David S. Miller commit 697d0e338c7fd392cf73bf120150ab6e5516a3a3 Author: Randy Dunlap Date: Sat Jan 8 17:41:42 2011 +0000 net: fix kernel-doc warning in core/filter.c Fix new kernel-doc notation warning in net/core/filter.c: Warning(net/core/filter.c:172): No description found for parameter 'fentry' Warning(net/core/filter.c:172): Excess function parameter 'filter' description in 'sk_run_filter' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 928c41e7a15d1164bb725f3445575f4651b5b9f0 Author: Randy Dunlap Date: Sat Jan 8 17:39:21 2011 +0000 net/sock.h: make some fields private to fix kernel-doc warning(s) Fix new kernel-doc notation warning in sock.h by annotating skc_dontcopy_* as private fields. Warning(include/net/sock.h:163): No description found for parameter 'skc_dontcopy_end[0]' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf Author: Jan Engelhardt Date: Fri Jan 7 03:15:05 2011 +0000 netlink: test for all flags of the NLM_F_DUMP composite Due to NLM_F_DUMP is composed of two bits, NLM_F_ROOT | NLM_F_MATCH, when doing "if (x & NLM_F_DUMP)", it tests for _either_ of the bits being set. Because NLM_F_MATCH's value overlaps with NLM_F_EXCL, non-dump requests with NLM_F_EXCL set are mistaken as dump requests. Substitute the condition to test for _all_ bits being set. Signed-off-by: Jan Engelhardt Acked-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit dba5a68ae147d0672d4b9259f3ece37777f8b2fa Author: Rafael J. Wysocki Date: Fri Jan 7 11:12:05 2011 +0000 forcedeth: Do not use legacy PCI power management The forcedeth driver uses the legacy PCI power management, so it has to do PCI-specific things in its ->suspend() and ->resume() callbacks and some of them are not done correctly. Convert forcedeth 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 with nVidia Corporation MCP55 Ethernet (rev a2). Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit 14934efab62201c176c620bd598b34b59acb6796 Merge: 86aa778 bfbb234 Author: David S. Miller Date: Sun Jan 9 16:16:57 2011 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit f9db92cb8084c756890ddf953e9329588c59e8e8 Author: Alagu Sankar Date: Mon Jan 3 12:43:27 2011 +0530 mmc: davinci: add support for SDIO irq handling This patch adds support for handling SDIO interrupt on DaVinci MMC/SD controller. The patch has been tested on DM355 and DA850 EVMs with Marvell Libertas based SDIO wireless LAN card. Signed-off-by: Alagu Sankar Signed-off-by: Sekhar Nori Signed-off-by: Chris Ball commit 86aa77854f47ab6f5f9c687507af1f57d2b89004 Author: Stephen Hemminger Date: Sun Jan 9 15:54:15 2011 -0800 sky2: convert to new VLAN model (v0.2) This converts sky2 to new VLAN offload flags control via ethtool. It also allows for transmit offload of vlan tagged frames which was not possible before. Signed-off-by: Stephen Hemminger Reviewed-by: Jesse Gross Signed-off-by: David S. Miller commit 2aca31e765f756408ebc8408378afa5795d1ae49 Author: Stephen Hemminger Date: Thu Jan 6 18:40:36 2011 +0000 sky2: fix limited auto negotiation The sky2 driver would always try all possible supported speeds even if the user only asked for a limited set of speed/duplex combinations. Reported-by: Mohsen Hariri Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 9bcb8018cf7af1f00f35cad4b121897cac077269 Author: Vladislav Zolotarov Date: Sun Jan 9 02:20:34 2011 +0000 bnx2x: Fix the race on bp->stats_pending. Fix the race on bp->stats_pending between the timer and a LINK_UP event handler. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 084d6cbb13e351f48ecd87cc8718ace6b72845e8 Author: Vladislav Zolotarov Date: Sun Jan 9 02:20:19 2011 +0000 bnx2x: Move to D0 before clearing MSI/MSI-X configuration. Move to D0 before clearing MSI/MSI-X configuration. Otherwise MSI/MSI-X won't be cleared. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4a33bc03ab66631e844080bf1189d2afd7aae929 Author: Vladislav Zolotarov Date: Sun Jan 9 02:20:04 2011 +0000 bnx2x: registers dump fixes Fixes in registers dump: - Properly calculate dump length for 57712. - Prevent HW blocks parity attentions when dumping registers in order to prevent false parity errors handling. - Update the bnx2x_dump.h file: old one had a few bugs that could cause fatal HW error as a result of a registers dump. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0744db2394ff1ee908169e38ab9308163c4cede5 Author: Vladislav Zolotarov Date: Sun Jan 9 02:19:40 2011 +0000 bnx2x: Don't prevent RSS configuration in INT#x and MSI interrupt modes. Don't prevent RSS configuration in INT#x and MSI interrupt modes. Otherwise Rx hash key won't be available. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 6a75da4a1a1d220fc3e32b816e83c258617505c5 Author: Jesper Juhl Date: Sun Jan 9 11:32:38 2011 +0000 Madge Ambassador ATM Adapter driver: Always release_firmware() in ucode_init() and don't leak memory. Failure to call release_firmware() will result in memory leak in drivers/atm/ambassador.c::ucode_init(). This patch makes sure we always call release_firmware() when needed, thus removing the leak(s). Yes, I know checkpatch complains about this patch, but it was either that or completely mess up the existing style, so I opted to use the existing style and live with the checkpatch related flak. Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit 26877c794407855f65c056d7914b2e72ae9b93b8 Author: Jesper Juhl Date: Thu Jan 6 10:50:29 2011 +0000 hamradio: Resolve memory leak due to missing firmware release in add_mcs() Failure to release_firmware() in drivers/net/hamradio/yam.c::add_mcs() causes memory leak. This patch should fix it. Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit 20054bd65703f7504a9daceabc2a060828fde36c Author: Jeff Layton Date: Fri Jan 7 11:30:27 2011 -0500 cifs: use CreationTime like an i_generation field Reduce false inode collisions by using the CreationTime like an i_generation field. This way, even if the server ends up reusing a uniqueid after a delete/create cycle, we can avoid matching the inode incorrectly. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit b5680e0b591f2701c5ba7d5fc8f96b55414073c8 Author: Shawn Guo Date: Wed Jan 5 21:13:13 2011 +0000 net/fec: add dual fec support for mx28 This patch is to add mx28 dual fec support. Here are some key notes for mx28 fec controller. - The mx28 fec controller naming ENET-MAC is a different IP from FEC used on other i.mx variants. But they are basically compatible on software interface, so it's possible to share the same driver. - ENET-MAC design on mx28 made an improper assumption that it runs on a big-endian system. As the result, driver has to swap every frame going to and coming from the controller. - The external phys can only be configured by fec0, which means fec1 can not work independently and both phys need to be configured by mii_bus attached on fec0. - ENET-MAC reset will get mac address registers reset too. - ENET-MAC MII/RMII mode and 10M/100M speed are configured differently FEC. - ETHER_EN bit must be set to get ENET-MAC interrupt work. Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit bcc67771ed8ee31cc1f2b1e033ae822b40c72ff9 Author: Shawn Guo Date: Wed Jan 5 21:13:12 2011 +0000 net/fec: improve pm for better suspend/resume The following commit made a fix to use fec_enet_open/fec_enet_close over fec_enet_init/fec_stop for suspend/resume, because fec_enet_init does not allow to have a working network interface at resume. e3fe8558c7fc182972c3d947d88744482111f304 net/fec: fix pm to survive to suspend/resume This fix works for i.mx/mxc fec controller, but fails on mx28 fec which gets a different interrupt logic design. On i.mx fec, interrupt can be triggered even bit ETHER_EN of ECR register is not set. But on mx28 fec, ETHER_EN must be set to get interrupt work. Meanwhile, MII interrupt is mandatory to resume the driver, because MDIO read/write changed to interrupt mode by commit below. 97b72e4320a9aaa4a7f1592ee7d2da7e2c9bd349 fec: use interrupt for MDIO completion indication fec_restart/fec_stop comes out as the solution working for both cases. Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit 49da97dcb6b00a6869bbc3fa6ec7fdfd8a6e41a3 Author: Shawn Guo Date: Wed Jan 5 21:13:11 2011 +0000 net/fec: add mac field into platform data and consolidate fec_get_mac Add mac field into fec_platform_data and consolidate function fec_get_mac to get mac address in following order. 1) module parameter via kernel command line fec.macaddr=0x00,0x04,... 2) from flash in case of CONFIG_M5272 or fec_platform_data mac field for others, which typically have mac stored in fuse 3) fec mac address registers set by bootloader Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit 8649a230e33320b00f778a6f7c17a2764e844730 Author: Shawn Guo Date: Wed Jan 5 21:13:10 2011 +0000 net/fec: remove the use of "index" which is legacy The "index" becomes legacy since fep->pdev->id starts working to identify the instance. Moreover, the call of fec_enet_init(ndev, 0) always passes 0 to fep->index. This makes the following code in fec_get_mac buggy. /* Adjust MAC if using default MAC address */ if (iap == fec_mac_default) dev->dev_addr[ETH_ALEN-1] = fec_mac_default[ETH_ALEN-1] + fep->index; It may be the time to remove "index" and use fep->pdev->id instead. Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit 862f0982eadcea0e114576c57ea426d3d51a69a6 Author: Shawn Guo Date: Wed Jan 5 21:13:09 2011 +0000 net/fec: fix MMFR_OP type in fec_enet_mdio_write FEC_MMFR_OP_WRITE should be used than FEC_MMFR_OP_READ in a mdio write operation. It's probably a typo introduced by commit: e6b043d512fa8d9a3801bf5d72bfa3b8fc3b3cc8 netdev/fec.c: add phylib supporting to enable carrier detection (v2) Signed-off-by: Shawn Guo Signed-off-by: David S. Miller commit aeda4ac3efc29e4d55989abd0a73530453aa69ba Merge: d2e7ad1 350e4f3 Author: James Morris Date: Mon Jan 10 10:40:42 2011 +1100 Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next commit d44a9fe2c8af3fee8edb203e9b11e507851c50fa Author: Jeff Layton Date: Fri Jan 7 11:30:29 2011 -0500 cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo We call CIFSSMBUnixSetPathInfo in these functions, but we have a filehandle since an open was just done. Switch these functions to use CIFSSMBUnixSetFileInfo instead. In practice, these codepaths are only used if posix opens are broken. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ca40b714b8f9f20118b7071cb7cf49954166dbdf Author: Jeff Layton Date: Fri Jan 7 11:30:29 2011 -0500 cifs: show "acl" in DebugData Features when it's compiled in ...and while we're at it, reduce the number of calls into the seq_* functions by prepending spaces to strings. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit b4d6fcf13f417464c13c6fde46e87c495ba6b6ee Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: move "ntlmssp" and "local_leases" options out of experimental code I see no real need to leave these sorts of options under an EXPERIMENTAL ifdef. Since you need a mount option to turn this code on, that only blows out the testing matrix. local_leases has been under the EXPERIMENTAL tag for some time, but it's only the mount option that's under this label. Move it out from under this tag. The NTLMSSP code is also under EXPERIMENTAL, but it needs a mount option to turn it on, and in the future any distro will reasonably want this enabled. Go ahead and move it out from under the EXPERIMENTAL tag. Signed-off-by: Jeff Layton Acked-by: Suresh Jayaraman Signed-off-by: Steve French commit 1397f2ee4be65542fdc3460c7e8b6317779ea680 Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: replace some hardcoded values with preprocessor constants A number of places that deal with RFC1001/1002 negotiations have bare "15" or "16" values. Replace them with RFC_1001_NAME_LEN and RFC_1001_NAME_LEN_WITH_NULL. The patch also cleans up some checkpatch warnings for code surrounding the changes. This should apply cleanly on top of the patch to remove Local_System_Name. Reported-and-Reviwed-by: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French commit a0f8b4fb4cab4bc32caaf34fc0a0c9d5dd369186 Author: Jeff Layton Date: Fri Jan 7 11:30:28 2011 -0500 cifs: remove unnecessary locking around sequence_number The server->sequence_number is already protected by the srv_mutex. The GlobalMid_lock is unneeded here. Reviewed-by: Shirish Pargaonkar Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 5edddaab1d5d6143c23fef119a24ea768915681a Author: David S. Miller Date: Sun Jan 9 15:36:46 2011 -0800 sparc64: Fix bootup regression due to perf init ordering. Commit 004417a6d468e24399e383645c068b498eed84ad ("perf, arch: Cleanup perf-pmu init vs lockup-detector") move the perf events init to be an early_initcall. But this won't work properly unless the dependencies for this code initialize beforehand. Fix it by making cpu_type_probe and pcr_arch_init be an early_initcall as well. Reported-by: Sam Ravnborg Signed-off-by: David S. Miller commit c3307cd6a7ca91c257795c5275e887a3eafb6880 Merge: 0ba41e4 187f3da Author: Dave Airlie Date: Mon Jan 10 09:27:06 2011 +1000 Merge branch 'drm-radeon-ni' of ../drm-radeon-next into drm-core-next * 'drm-radeon-ni' of ../drm-radeon-next: (30 commits) radeon: consolidate asic-specific function decls for pre-r600 drm/radeon/kms: add NI pci ids drm/radeon/kms: don't enable pcie gen2 on NI yet drm/radeon/kms: add radeon_asic struct for NI asics drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init drm/radeon/kms: add ucode loader for NI drm/radeon/kms: add support for DCE5 display LUTs drm/radeon/kms: add ni_reg.h drm/radeon/kms: add bo blit support for NI drm/radeon/kms: always use writeback/events for fences on NI drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5 drm/radeon/kms: add backend map workaround for barts drm/radeon/kms: fill gpu init for NI asics drm/radeon/kms: add disabled vbios accessor for NI asics drm/radeon/kms: handle NI thermal controller drm/radeon/kms: parse DCE5 encoder caps when setting up encoders drm/radeon/kms: dvo dpms updates for DCE5 drm/radeon/kms: dac dpms updates for DCE5 drm/radeon/kms: DCE5 atom dig encoder updates drm/radeon/kms: DCE5 atom transmitter control updates ... commit 197a1eeb7f89c1d2ba93713398e9655899aa973e Author: Steve French Date: Sun Jan 9 23:26:56 2011 +0000 [CIFS] Fix minor merge conflict in fs/cifs/dir.c Signed-off-by: Steve French commit 0ba41e449fd0f45f5b29c1009020ab1b298bedda Author: Chris Wilson Date: Sat Jan 8 15:10:41 2011 +0000 drm: Restore the old_fb upon modeset failure ... or else we may end up disabling the wrong framebuffer, leading to an OOPS, e.g: [ 6033.229012] kernel BUG at drivers/gpu/drm/i915/i915_gem.c:3271! [ 6033.229012] invalid opcode: 0000 [#1] SMP [ 6033.229012] last sysfs file: /sys/devices/virtual/backlight/acpi_video0/uevent [ 6033.229012] Modules linked in: sunrpc cpufreq_ondemand acpi_cpufreq mperf snd_hda_codec_analog snd_hda_intel snd_hda_codec snd_hwdep snd_seq snd_seq_device snd_pcm snd_timer thinkpad_acpi ppdev snd r852 sm_common iTCO_wdt uvcvideo i2c_i801 iTCO_vendor_support microcode wmi nand videodev nand_ids nand_ecc snd_page_alloc parport_pc parport mtd soundcore joydev v4l1_compat pcspkr uinput ipv6 sdhci_pci sdhci mmc_core yenta_socket i915 drm_kms_helper drm i2c_algo_bit i2c_core video output [last unloaded: scsi_wait_scan] [ 6033.229012] [ 6033.229012] Pid: 4834, comm: Xorg Not tainted 2.6.37-rc8+ #25 7661BL5/7661BL5 [ 6033.229012] EIP: 0060:[] EFLAGS: 00013246 CPU: 0 [ 6033.229012] EIP is at i915_gem_object_unpin+0x23/0x76 [i915] [ 6033.229012] EAX: f68a4000 EBX: f6831f00 ECX: 000600fa EDX: f68a8000 [ 6033.229012] ESI: f68a4014 EDI: f68a42b8 EBP: f2169c44 ESP: f2169c3c [ 6033.229012] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 [ 6033.229012] Process Xorg (pid: 4834, ti=f2168000 task=f21c8000 task.ti=f2168000) [ 6033.229012] Stack: [ 6033.229012] f3a84800 f68a4014 f2169c54 f87045d8 f3a84800 f872d9a8 f2169c68 f7fd8091 [ 6033.229012] f3b952a4 00000000 f68a414c f2169cf0 f7fd9377 00000000 00000000 f7fd98b0 [ 6033.229012] f7fd9f4e 0000000f f7f328a0 00000000 00000000 00000000 f2169ca4 f68a414c [ 6033.229012] Call Trace: [ 6033.229012] [] ? intel_crtc_disable+0x36/0x41 [i915] [ 6033.229012] [] ? drm_helper_disable_unused_functions+0xcd/0xf9 [drm_kms_helper] [ 6033.229012] [] ? drm_crtc_helper_set_config+0x62a/0x7f7 [drm_kms_helper] [ 6033.229012] [] ? __slab_free+0x1b/0xa4 [ 6033.229012] [] ? drm_fb_helper_initial_config+0x466/0x497 [drm_kms_helper] [ 6033.229012] [] ? drm_fb_helper_restore+0x10/0x2a [drm_kms_helper] [ 6033.229012] [] ? i915_driver_lastclose+0x2a/0x57 [i915] [ 6033.229012] [] ? drm_lastclose+0x45/0x23e [drm] [ 6033.229012] [] ? drm_release+0x462/0x4d7 [drm] Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 7ad7f87b87f4480b989af37488511ed08559a98b Merge: fea6f33 07cfe0e Author: Dave Airlie Date: Mon Jan 10 09:23:49 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 hwmon device binding drm/nouveau: create grctx on the fly on all chipsets drm/nvc0: fix init without firmware present drm/nvc0/pgraph: fix 0x406028/0x405870 init drm/nvc0/pgraph: more unit names drm/nvc0/pfifo: support for chipsets with only one PSUBFIFO (0xc1) drm/nvc0: reserve only subc 0 for kernel use drm/nv50: sync up gr data error names with rnn, use for nvc0 also drm/nvc0: parse a couple more PGRAPH_INTR drm/nvc0: nuke left-over debug messages drm/nvc0: kill off a couple more magics drm/nouveau: Validate channel indices passed from userspace. drm/nouveau: Only select ACPI_VIDEO if its dependencies are met commit acc6f11272ce4f77c40b1a6292eb198fd6aaf8c3 Merge: 7e12edd 0c21e3a Author: Steve French Date: Sun Jan 9 23:18:16 2011 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: fs/cifs/dir.c commit d2e7ad19229f982fc1eb731827d82ceac90abfb3 Merge: d03a5d8 0c21e3a Author: James Morris Date: Mon Jan 10 09:46:24 2011 +1100 Merge branch 'master' into next Conflicts: security/smack/smack_lsm.c Verified and added fix by Stephen Rothwell Ok'd by Casey Schaufler Signed-off-by: James Morris commit 6099469805c24af14250e182bb9ca082b8a6b716 Author: Roland Stigge Date: Sun Jan 9 09:31:39 2011 -0500 hwmon: Support for Dallas Semiconductor DS620 Driver for Dallas Semiconductor DS620 temperature sensor and thermostat Signed-off-by: Roland Stigge Signed-off-by: Guenter Roeck commit 4385428a477559b26736cc3c80d8b68f31126c71 Merge: 047a377 2d75af2 Author: Ingo Molnar Date: Sun Jan 9 10:42:21 2011 +0100 Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent commit 047a3772feaae8e43d81d790f3d3f80dae8ae676 Author: Cyrill Gorcunov Date: Fri Jan 7 21:42:06 2011 +0300 perf, x86: P4 PMU - Fix unflagged overflows handling Don found that P4 PMU reads CCCR register instead of counter itself (in attempt to catch unflagged event) this makes P4 NMI handler to consume all NMIs it observes. So the other NMI users such as kgdb simply have no chance to get NMI on their hands. Side note: at moment there is no way to run nmi-watchdog together with perf tool. This is because both 'perf top' and nmi-watchdog use same event. So while nmi-watchdog reserves one event/counter for own needs there is no room for perf tool left (there is a way to disable nmi-watchdog on boot of course). Ming has tested this patch with the following results | 1. watchdog disabled | | kgdb tests on boot OK | perf works OK | | 2. watchdog enabled, without patch perf-x86-p4-nmi-4 | | kgdb tests on boot hang | | 3. watchdog enabled, without patch perf-x86-p4-nmi-4 and do not run kgdb | tests on boot | | "perf top" partialy works | cpu-cycles no | instructions yes | cache-references no | cache-misses no | branch-instructions no | branch-misses yes | bus-cycles no | | 4. watchdog enabled, with patch perf-x86-p4-nmi-4 applied | | kgdb tests on boot OK | perf does not work, NMI "Dazed and confused" messages show up | Which means we still have problems with p4 box due to 'unknown' nmi happens but at least it should fix kgdb test cases. Reported-by: Jason Wessel Reported-by: Don Zickus Signed-off-by: Cyrill Gorcunov Acked-by: Don Zickus Acked-by: Lin Ming Cc: Stephane Eranian Cc: Peter Zijlstra LKML-Reference: <4D275E7E.3040903@gmail.com> Signed-off-by: Ingo Molnar commit 91d88ce22bca3dcf269661b54d4ea75576dc4e29 Author: Randy Dunlap Date: Sat Jan 8 19:59:14 2011 -0800 x86: Fix sparse non-ANSI function warnings in smpboot.c Fix sparse warning for non-ANSI function declaration: arch/x86/kernel/smpboot.c:100:30: warning: non-ANSI function declaration of function 'cpu_hotplug_driver_lock' arch/x86/kernel/smpboot.c:105:32: warning: non-ANSI function declaration of function 'cpu_hotplug_driver_unlock' Signed-off-by: Randy Dunlap LKML-Reference: <20110108195914.95d366ea.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit a45b0616e7ee9db4c1b2b9a4a79a974325fa9bf3 Merge: 3c0eee3 8165984 Author: Pekka Enberg Date: Sun Jan 9 11:05:53 2011 +0200 Merge branch 'slab/next' into for-linus commit e9b86841b372de01ae865080118e29159d8b7c39 Author: Linus Walleij Date: Wed Jan 5 00:44:32 2011 +0100 mmc: fix division by zero in MMC core The card is not always clocked and the clock frequency zero is perfectly legal, thus this code in mmc_set_data_timeout() may cause a division by zero. It will be triggered more often if you're using software clock gating but can be triggered under other conditions too. Reported-by: Pierre Tardy Signed-off-by: Linus Walleij Reviewed-by: Chris Ball Cc: Signed-off-by: Chris Ball commit 2bd6a935555b06622fa7f47a9c411b8a7812e4dc Author: Arnd Hannemann Date: Wed Dec 29 14:21:14 2010 +0100 mmc: tmio_mmc: fix CMD irq handling With current code card insert/eject interrupts will acknowledge outstanding commands. Normally this seems to be no problem, however if the hardware gets stuck and no interrupts for CMD_TIMEOUT or CMD_RESPEND are generated, then inserting and ejecting cards will falsely acknowledge outstanding commands from the core. This patch changes the behavior so that CMDs are only acked, if CMD_TIMEOUT or CMD_RESPEND is received. Signed-off-by: Arnd Hannemann Signed-off-by: Chris Ball commit 6ff56e0d8e02df023440ea65774cf1d15e669ece Author: Arnd Hannemann Date: Wed Jan 5 17:36:14 2011 -0500 mmc: tmio_mmc: handle missing HW interrupts When doing excessive hotplug, e.g., repeated insert/eject operations, the hardware may get confused to a point where no CMDTIMEOUT/CMDRESPEND interrupts are generated any more. As a result requests get stuck, e.g.: [ 360.351562] INFO: task kworker/u:0:5 blocked for more than 120 seconds. [ 360.351562] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 360.359375] kworker/u:0 D c020c2b4 0 5 2 0x00000000 [ 360.367187] Backtrace: [ 360.367187] [] (schedule+0x0/0x340) from [] (schedule_timeout+0x20/0x190) [ 360.375000] r8:c702fd70 r7:00000002 r6:c702e000 r5:c702fdc4 r4:7fffffff [ 360.375000] r3:c701e040 [ 360.382812] [] (schedule_timeout+0x0/0x190) from [] (wait_for_common+0xc4/0x150) [ 360.390625] r6:c702e000 r5:c702fdc4 r4:7fffffff [ 360.390625] [] (wait_for_common+0x0/0x150) from [] (wait_for_completion+0x18/0x1c) [ 360.398437] [] (wait_for_completion+0x0/0x1c) from [] (mmc_wait_for_req+0x214/0x234) [ 360.406250] [] (mmc_wait_for_req+0x0/0x234) from [] (mmc_sd_switch+0xfc/0x114) [ 360.414062] r7:c702fe4c r6:c702fe20 r5:c7179800 r4:00fffff0 [ 360.421875] [] (mmc_sd_switch+0x0/0x114) from [] (mmc_sd_setup_card+0x260/0x384) [ 360.429687] [] (mmc_sd_setup_card+0x0/0x384) from [] (mmc_sd_init_card+0x13c/0x1e0) [ 360.437500] [] (mmc_sd_init_card+0x0/0x1e0) from [] (mmc_attach_sd+0x124/0x1a8) [ 360.445312] r8:c02db404 r7:ffffff92 r6:c702ff34 r5:c6007da8 r4:c6007c00 [ 360.453125] [] (mmc_attach_sd+0x0/0x1a8) from [] (mmc_rescan+0x248/0x2f0) [ 360.460937] r5:c6007da8 r4:c6007c00 [ 360.468750] [] (mmc_rescan+0x0/0x2f0) from [] (process_one_work+0x1ec/0x318) [ 360.476562] r7:c6007da8 r6:00000000 r5:c710ec00 r4:c701bde0 [ 360.484375] [] (process_one_work+0x0/0x318) from [] (worker_thread+0x1b0/0x2cc) [ 360.492187] [] (worker_thread+0x0/0x2cc) from [] (kthread+0x8c/0x94) [ 360.500000] [] (kthread+0x0/0x94) from [] (do_exit+0x0/0x590) [ 360.507812] r7:00000013 r6:c0037fc4 r5:c004b2ac r4:c7021f00 This patch addresses this problem by introducing timeouts for outstanding interrupts. If a hardware interrupt is missing, a soft reset will be performed to bring the hardware back to a working state. Tested with the SDHI hardware block in sh7372 / AP4EVB. Signed-off-by: Arnd Hannemann Signed-off-by: Chris Ball commit 23b66071e8ce7f359a0e410a8a3514bd3179e92e Author: Arnd Hannemann Date: Tue Dec 28 23:22:32 2010 +0100 mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc The SDHI Controller on SH-Mobile SoCs supports SDIO IRQ signalling. This patch advertises this fact to the tmio_mmc driver. Signed-off-by: Arnd Hannemann Acked-by: Samuel Ortiz Signed-off-by: Chris Ball commit 845ecd20239c28e97e766ff54078a58be19f3a91 Author: Arnd Hannemann Date: Tue Dec 28 23:22:31 2010 +0100 mmc: tmio_mmc: implement SDIO IRQ support This patch implements SDIO IRQ support for mfds which announce the TMIO_MMC_SDIO_IRQ flag for tmio_mmc. If MMC_CAP_SDIO_IRQ is also set SDIO IRQ signalling is activated. Tested with a b43-based wireless SDIO card and sh_mobile_sdhi. Signed-off-by: Arnd Hannemann Signed-off-by: Chris Ball commit 39a65a0dbbf73403daa9f4cc0ab30957ba61e60f Author: Guennadi Liakhovetski Date: Tue Nov 23 17:24:19 2010 +0100 mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers The SDHI controller on SH-Mobile SoCs requires even buffer addresses, when used with DMA. Signed-off-by: Guennadi Liakhovetski Acked-by: Samuel Ortiz Signed-off-by: Chris Ball commit eba46030e1727f2af377300b6a55df846fa830f1 Author: Arnd Hannemann Date: Sun Dec 19 21:16:07 2010 +0000 mmc: tmio_mmc: silence compiler warnings with "mmc: tmio: implement a bounce buffer for unaligned DMA" gcc generates the following warnings: drivers/mmc/host/tmio_mmc.c:654:6: warning: 'ret' may be used uninitialized in this function drivers/mmc/host/tmio_mmc.c:730:6: warning: 'ret' may be used uninitialized in this function This patch fixes these by setting ret to -EINVAL in the affected code paths. Signed-off-by: Arnd Hannemann Signed-off-by: Chris Ball commit 93173054f2979de41b1912b19f0b57edfb35fcdc Author: Guennadi Liakhovetski Date: Wed Dec 22 12:02:15 2010 +0100 mmc: tmio_mmc: implement a bounce buffer for unaligned DMA For example, with SDIO WLAN cards, some transfers happen with buffers at odd addresses, whereas the SH-Mobile DMA engine requires even addresses for SDHI. This patch extends the tmio driver with a bounce buffer, that is used for single entry scatter-gather lists both for sending and receiving. If we ever encounter unaligned transfers with multi-element sg lists, this patch will have to be extended. For now it just falls back to PIO in this and other unsupported cases. Signed-off-by: Guennadi Liakhovetski Acked-by: Samuel Ortiz Signed-off-by: Chris Ball commit e0bc6ff8b8d5c066d978d23e690d5599db4cb2b3 Author: Guennadi Liakhovetski Date: Tue Nov 23 17:24:11 2010 +0100 mmc: tmio_mmc: merge the private header into the driver drivers/mmc/host/tmio_mmc.h is only used by drivers/mmc/host/tmio_mmc.c, this needlessly complicates source-code handling. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit ef17fee1e559b3faeb6f89963e78ad47731d18a1 Author: Guennadi Liakhovetski Date: Thu Nov 11 12:19:47 2010 +0100 mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure The easiest way to fall back to PIO, when a DMA descriptor allocation fails is to disable DMA on the controller but continue with the current request in PIO mode. This way tmio_mmc_start_dma() can become void, since it cannot be failing any more. The current version is also broken: it is testing a wrong pointer and thus failing to recognise, that a descriptor allocation wasn't successful. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit 729b0c79c2c0f631bffe1be5abaf291febf7792f Author: Guennadi Liakhovetski Date: Thu Nov 11 12:15:06 2010 +0100 mmc: tmio_mmc: allow multi-element scatter-gather lists The driver is capable of handling multi-element sg lists in both PIO and DMA modes. In DMA mode this also allows to use the DMA sg capability more efficiently and almost doubles the throughput. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Chris Ball commit 1a2727e98786136fb968b18d96f8ecdd9ba38aa8 Author: Viresh Kumar Date: Tue Jan 4 12:55:14 2011 -0500 mmc: Register debugfs dir before calling card probe function. This way, the probe function may register debugfs files if it wants to. This fixes a bug with mmc_test where mmc_test_register_file_test() is called before the card's debugfs dir exists, and so it fails. Signed-off-by: Viresh Kumar Tested-by: Chris Ball Signed-off-by: Chris Ball commit b37427b0a4e01ab5aaec1c9af7cef616ac4ce6d6 Author: Chris Ball Date: Tue Jan 4 12:39:20 2011 -0500 mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK. Signed-off-by: Chris Ball Tested-by: Chris Ball Acked-by: Olof Johansson commit c584179828b268152f5ff82dab529a2c095b09ac Author: Chris Ball Date: Tue Jan 4 12:20:22 2011 -0500 mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan. Signed-off-by: Chris Ball commit 807e8e40673d9628fa7dcdd14423424b4ee5f43b Author: Andy Ross Date: Mon Jan 3 10:36:56 2011 -0800 mmc: Fix sd/sdio/mmc initialization frequency retries Rewrite and clean up mmc_rescan() to properly retry frequencies lower than 400kHz. Failures can happen both in sd_send_* calls and mmc_attach_*. Break out "mmc_rescan_try_freq" from the frequency selection loop. Symmetrize claim/release logic in mmc_attach_* API, and move the sd_send_* calls there to make mmc_rescan easier to read. Signed-off-by: Andy Ross Reviewed-and-Tested-by: Hein Tibosch Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 08c82dfad2458f8f9b83126224a85e7ea9e2b046 Author: Takashi Iwai Date: Wed Dec 22 09:59:44 2010 +0100 mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap With the bus-width test patch, mmc_set_bus_width*() isn't called properly when the driver doesn't set MMC_CAP_BUS_WIDTH and no DDR mode. This patch fixes the regression by moving the call up before the cap test. Signed-off-by: Takashi Iwai Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit f95f3850f7a9e1d49ebc5b6e72e7cc3ec3685b0b Author: Will Newton Date: Sun Jan 2 01:11:59 2011 -0500 mmc: dw_mmc: Add Synopsys DesignWare mmc host driver. This adds the mmc host driver for the Synopsys DesignWare mmc host controller, found in a number of embedded SoC designs. Signed-off-by: Will Newton Reviewed-by: Matt Fleming Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 03d2bfc878e4dff9e596accc7b7eccf947804a3c Author: Olof Johansson Date: Sat Jan 1 23:52:56 2011 -0500 mmc: add sdhci-tegra driver for Tegra SoCs SDHCI driver for Tegra. This driver plugs in as a new variant of sdhci-pltfm, using the platform data structure passed in to specify the GPIOs to use for card detect, write protect and card power enablement. Original driver (of which only the header file is left): Signed-off-by: Yvonne Yip The rest, which has been rewritten by now: Signed-off-by: Olof Johansson Reviewed-by: Wolfram Sang Acked-by: Mike Rapoport Signed-off-by: Chris Ball commit 30652aa36b58d57fcc1a0acce51e391bbb6edf5e Author: Olof Johansson Date: Sat Jan 1 18:37:32 2011 -0600 mmc: sdhci: add quirk for max len ADMA descriptors Some controllers misparse segment length 0 as being 0, not 65536. Add a quirk to deal with it. Signed-off-by: Olof Johansson Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit c288b85554097a3d1271f935c48b442280b2db9e Author: Linus Walleij Date: Wed Dec 22 09:50:12 2010 +0100 mmc: check for > 1 clk_requests when disabling gating Since we make sure the clock is enabled in the mmc_host_clk_exit() function we should expect a reference counter of 1, not 0. Signed-off-by: Linus Walleij Tested-by: Chris Ball Signed-off-by: Chris Ball commit 253e0a7c3dc4bbbc69fc6bfd7c01bc4c9397a5e5 Author: Jeongbae Seo Date: Fri Oct 8 17:46:21 2010 +0900 mmc: sdhci-s3c: Support controllers with no internal clock divider This patch supports controllers with no internal clock divider in SDHCI, such as the s5pc210 board. The external clock divider can be used to make a proper clock because SDHCI doesn't support internal clock divider by itself. If external clock divider type is selected, some functions related to clock control will be overrided by other functions. The current clock control index is added to let you know which clock bus is used for SDHCI when overriding functions. Checking functions are added into sdhci_s3c_consider_clock, because the clock divider step is different from that of host controller. Signed-off-by: Jeongbae Seo Cc: Jaehoon Chung Cc: Ben Dooks Signed-off-by: Kukjin Kim Acked-by: Kyungmin Park Signed-off-by: Chris Ball commit b3824f2c6f16ef19060a53ef9345a124de175098 Author: Jeongbae Seo Date: Fri Oct 8 17:46:20 2010 +0900 mmc: sdhci-s3c: Support additional host capabilities This patch adds support for additional host capabilities like SD/MMC high speed, SDHCI bus width, etc. Signed-off-by: Jeongbae Seo Signed-off-by: Kukjin Kim Signed-off-by: Chris Ball commit d75c1084db5e4a30603729852046d0a87d4f7688 Author: Takashi Iwai Date: Thu Dec 16 17:54:14 2010 +0100 mmc: sdhci: Enable bus-width test for JMicron controllers Signed-off-by: Takashi Iwai Signed-off-by: Chris Ball commit 22113efd00491310da802f3b1a9a66cfcf415fac Author: Aries Lee Date: Wed Dec 15 08:14:24 2010 +0100 mmc: Test bus-width for old MMC devices Some old MMC devices fail with the 4/8 bits the driver tries to use exclusively. This patch adds a test for the given bus setup and falls back to the lower bit mode (until 1-bit mode) when the test fails. [Major rework and refactoring by tiwai] [Quirk addition and many fixes by prakity] Signed-off-by: Aries Lee Signed-off-by: Takashi Iwai Signed-off-by: Philip Rakity Tested-by: Philip Rakity Signed-off-by: Chris Ball commit a081748735c5feb96b1365e78a5ff0fb6ca7e3a4 Author: Grant Likely Date: Sat Jan 8 21:42:42 2011 -0700 of/flattree: forward declare struct device_node in of_fdt.h This patch forward declares struct device_node to fix a compile error when of_fdt.h is included, but of.h is not. Alternately, including linux/of.h could have been added to of_fdt.h, but that pulls in a lot of unnecessary declarations when only working with the flattened form. Signed-off-by: Grant Likely commit e6f29a8dc1602e170daf955233891a9130573a55 Author: Michal Miroslaw Date: Thu Dec 2 23:38:12 2010 +0100 mmc: fix detection of memory part of SD-combo card with broken SDIO In case of failure, mmc_attach_sdio() will power off the SD bus. Power it up and reinitialize before trying SD memory detection. Reported-by: Sahitya Tummala Signed-off-by: Michał Mirosław Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 080bc9774b6f1e3866747b18631bad26f47c22ce Author: Ohad Ben-Cohen Date: Sun Nov 28 07:21:29 2010 +0200 mmc: sdio: don't reinitialize nonremovable powered-resumed cards Upon system resume, SDIO core must reinitialize cards that were powered off during suspend. If the card had its power kept during suspend (and thus it is 'powered-resumed'), SDIO core performs only a limited reinitializing, mainly needed to make sure that the card wasn't removed/replaced. If a __nonremovable__ card is powered-resumed, we can safely skip the reinitializing phase. Note: 9b966aa (mmc: sdio: fully reconfigure oldcard on resume) removed the bus width reconfiguration since mmc_sdio_init_card already does it. It is brought back now in case mmc_sdio_init_card is skipped. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Chris Ball commit e594573d790bd7e269f05955d316b88f7be0c14a Author: Ohad Ben-Cohen Date: Sun Nov 28 07:21:30 2010 +0200 mmc: sdio: don't power up cards on system suspend Initial SDIO runtime PM implementation took a conservative approach of powering up cards (and fully reinitializing them) on system suspend, just before the suspend handlers of the relevant drivers were executed. To avoid redundant power and reinitialization cycles, this patch removes this behavior: if a card is already powered off when system suspend kicks in, it is left at that state. If a card is active when a system sleep starts, everything is straightforward and works exactly like before. But if the card was already suspended before the sleep began, then when the MMC core powers it back up on resume, its run-time PM status has to be updated to reflect the actual post-system sleep status. The technique to do that is borrowed from the I2C runtime PM implementation (for more info see Documentation/power/runtime_pm.txt). Signed-off-by: Ohad Ben-Cohen Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 30201e7f3ac639fe98fcd25d40346b65dde9ecba Author: Ohad Ben-Cohen Date: Sun Nov 28 07:21:28 2010 +0200 mmc: skip detection of nonremovable cards on rescan mmc_rescan() checks whether registered cards are still present before skipping them, by calling the bus-specific ->detect() handler. With buses that support runtime PM, the card may be powered off at this point, so they need to be powered on and fully reinitialized before ->detect() executes. This whole process is redundant with nonremovable cards; in those cases, we can safely skip calling ->detect() and implicitly assume its success. Signed-off-by: Ohad Ben-Cohen Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 8f230f454fe04ba326ffaead3a6b88dcf44eaf4b Author: Takashi Iwai Date: Wed Dec 8 10:04:30 2010 +0100 mmc: Add support for JMicron 388 SD/MMC controller JMicron 388 SD/MMC combo controller supports the 1.8V low-voltage for SD, but MMC doesn't work with the low-voltage, resulting in an error at probing. This patch adds the support for multiple voltage mask per device type, so that SD works with 1.8V while MMC forces 3.3V. Here new ocr_avail_* fields for each device are introduced, so that the actual OCR mask is switched dynamically. Also, the restriction of low-voltage in core/sd.c is removed when the bit is allowed explicitly via ocr_avail_sd mask. This patch was rewritten from scratch based on Aries' original code. Signed-off-by: Aries Lee Signed-off-by: Takashi Iwai Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 150ee73d1b35936aafc5fd3b39a7291b1f66de07 Author: Joe Perches Date: Sun Nov 14 19:04:30 2010 -0800 mmc: davinci_mmc: Remove unnecessary semicolon Signed-off-by: Joe Perches Signed-off-by: Chris Ball commit e8120ad129c160ff5b2e2b197d025a2cd661c2f2 Author: Philip Rakity Date: Tue Nov 30 00:55:23 2010 -0500 mmc: sdhci: print SD Command and CAPABILITY_1 when dumping registers More information should be shown when sdhci_dumpregs is called. Knowing the command is useful for debugging, and Capability 1 is useful for SD v3. Signed-off-by: Philip Rakity Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 04566831a703ae3ef4b49a2deae261c9ed26e020 Author: Linus Walleij Date: Mon Nov 8 21:36:50 2010 -0500 mmc: Aggressive clock gating framework This patch modifies the MMC core code to optionally call the set_ios() operation on the driver with the clock frequency set to 0 (gate) after a grace period of at least 8 MCLK cycles, then restore it (ungate) before any new request. This gives the driver the option to shut down the MCI clock to the MMC/SD card when the clock frequency is 0, i.e. the core has stated that the MCI clock does not need to be generated. It is inspired by existing clock gating code found in the OMAP and Atmel drivers and brings this up to the host abstraction. Gating is performed before and after any MMC request. This patchset implements this for the MMCI/PL180 MMC/SD host controller, but it should be simple to switch OMAP/Atmel over to using this instead. mmc_set_{gated,ungated}() add variable protection to the state holders for the clock gating code. This is particularly important when ordinary .set_ios() calls would race with the .set_ios() call resulting from a delayed gate operation. Signed-off-by: Linus Walleij Reviewed-by: Chris Ball Tested-by: Chris Ball Signed-off-by: Chris Ball commit 26daa1ed40c6b31b4220581431982814c47c608a Author: Jennifer Li Date: Wed Nov 17 23:01:59 2010 -0500 mmc: sdhci: Disable ADMA on some O2Micro SD/MMC parts. This patch disables the broken ADMA on selected O2Micro devices. Signed-off-by: Jennifer Li Reviewed-by: Chris Ball Signed-off-by: Chris Ball commit 17d8020d9a4ee7d5965996ea75636dc3d058963f Author: Axel Lin Date: Mon Nov 22 16:47:51 2010 +0800 mmc: mxcmmc: remove a unnecessary release_resource() call Remove release_resource() after release_mem_region(). Signed-off-by: Axel Lin Acked-by: Sascha Hauer Signed-off-by: Chris Ball commit d078d24242ff6c36338991627f9c63b2d48a6eee Author: Alberto Panizzo Date: Tue Nov 9 11:35:37 2010 +0100 mmc: mxcmmc: update the regulator support code to the latest API This also fixes the build problem introduced by my previous patch due to unhandled API changes introduced by commit: 99fc513101 (mmc: Move regulator handling closer to core) Signed-off-by: Alberto Panizzo Signed-off-by: Chris Ball commit 74b66954ebfcef9bc26d9c377d32fbd46b4ddc32 Author: Alberto Panizzo Date: Tue Nov 2 01:05:37 2010 +0100 mmc: mxcmmc: Allow binding a regulator to manage the MMC card voltage This implementation is based on the pxamci.c driver and it will be used to support the mx31_3ds machine. Signed-off-by: Alberto Panizzo Acked-by: Sascha Hauer Signed-off-by: Chris Ball commit 930e2fe7593b10033c0cd68fb818c3dec365391a Author: Mike Rapoport Date: Thu Oct 28 21:23:53 2010 +0200 ARM: dove: Switch SDHCI devices over to "sdhci-dove" driver Signed-off-by: Mike Rapoport CC: Saeed Bishara Acked-by: Wolfram Sang Signed-off-by: Chris Ball commit 985b1aa05bc47794780ac92eebdaf006a5187afb Author: Mike Rapoport Date: Sun Nov 7 16:57:12 2010 -0500 mmc: Add support for the Marvell Dove SDHCI controller Implement an sdhci-pltfm driver for the controller found in the Marvell Dove SoC. Signed-off-by: Mike Rapoport CC: Saeed Bishara Acked-by: Wolfram Sang Signed-off-by: Chris Ball commit 430400b86304ea729ba10f2966a8af67da60a37f Author: Urs Fleisch Date: Fri Jan 7 07:15:39 2011 +0000 hwmon: driver for Sensirion SHT21 humidity and temperature sensor Signed-off-by: Urs Fleisch Acked-by: Jonathan Cameron Signed-off-by: Guenter Roeck commit c6c2c1636e30bcd26c6b0d208324055a03c5ab9c Author: Guenter Roeck Date: Thu Jan 6 07:52:03 2011 -0800 hwmon: Add humidity attribute to sysfs ABI The humidity attribute is already supported by the sht15 driver, and another driver supporting it is about to be added. Make it official. Signed-off-by: Guenter Roeck Acked-by: Jonathan Cameron Acked-by: Jean Delvare commit 581693b51e44bb2c0cca16ab0c8d3cb535fd2ac8 Author: Guenter Roeck Date: Mon Jun 28 13:22:27 2010 -0700 hwmon: sysfs ABI updates Add attributes supported by various PMBus devices to hwmon sysfs ABI. Signed-off-by: Guenter Roeck commit ae9e0ce73e9fc55a620e0b3bd4a154330a7e64cc Author: Jan Beulich Date: Mon Dec 6 11:48:35 2010 -0500 hwmon: (via-cputemp) sync hotplug handling with coretemp/pkgtemp Signed-off-by: Jan Beulich Signed-off-by: Guenter Roeck commit 0f1deb4b820cfacf22492abd7b17e891dafc51ae Author: Davide Rizzo Date: Thu Nov 18 07:23:00 2010 -0800 hwmon: (lm95241) Rewrite to avoid using macros Signed-off-by: Davide Rizzo [guenter.roeck@ericsson.com: Formatting changes] Signed-off-by: Guenter Roeck commit 2bfe814826b7266a489895f731a777f8cbe37963 Author: Guenter Roeck Date: Wed Nov 10 10:42:21 2010 -0800 hwmon: (applesmc) Fix checkpatch errors and fix value range checks This patch fixes all checkpatch errors and most of the checkpatch warnings. It also fixes the range check in applesmc_store_fan_speed(). Signed-off-by: Guenter Roeck Acked-by: Henrik Rydberg commit 41e71f97174ba08fcca7f31bf448de92abc8862e Author: Henrik Rydberg Date: Tue Nov 9 15:15:11 2010 +0000 hwmon: (applesmc) Update copyright information With the preceding patches, git blame assigns about half of the file to the present author. Add a line to the copyright to reflect this. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 0b8ad5a57b75322e4b671ef420b5fe90e5154912 Author: Henrik Rydberg Date: Tue Nov 9 15:15:10 2010 +0000 hwmon: (applesmc) Silence driver Make the driver report a single line on success. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 0b0b5dff8967a4468f05174d0d74e1ed6e369776 Author: Henrik Rydberg Date: Tue Nov 9 15:15:09 2010 +0000 hwmon: (applesmc) Simplify feature sysfs handling Given the dynamic node construction method, the setup of the accelerometer, light sensor and keyboard backlight sysfs nodes can be simplified. This patch does not contain any logic changes. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 3eba2bf7c5fb7863412554cd73646cb80ac293ff Author: Henrik Rydberg Date: Tue Nov 9 15:15:08 2010 +0000 hwmon: (applesmc) Dynamic creation of fan files With the dynamic temperature group in place, the setup of fans can be simplified. This patch sets up the fans dynamically, removing a hundred lines of code. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 40ef06f1120bcc0a2ad483b5cd42f58c4df78a5b Author: Henrik Rydberg Date: Wed Nov 10 10:58:05 2010 +0000 hwmon: (applesmc) Extract all features generically With temperature keys being determined automatically, the dmi match data is only used to assign features that can easily be detected from the smc. This patch removes the dmi match data altogether, and reduces the match table to the main machine models. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit dcdea2614ab9b7864a3ae620419d04e0cc4a65cc Author: Henrik Rydberg Date: Tue Nov 9 15:15:06 2010 +0000 hwmon: (applesmc) Handle new temperature format The recent Macbooks have temperature registers of a new type. This patch adds the logic to handle them. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 9792dadfce22ae1518c88577ac743a3077a85084 Author: Henrik Rydberg Date: Wed Nov 10 10:58:04 2010 +0000 hwmon: (applesmc) Dynamic creation of temperature files The current driver creates temperature files based on a list of temperature keys given per device. Apart from slow adaption to new machine models, the number of sensors also depends on the number of processors. This patch looks up the temperature keys dynamically, thereby supporting all models. Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 5874583d5662de5550b0ed1c54a9dea70bcdcba4 Author: Henrik Rydberg Date: Wed Nov 10 10:58:03 2010 +0000 hwmon: (applesmc) Introduce a register lookup table One main problem with the current driver is the inability to quickly search for supported keys, resulting in detailed feature maps per machine model which are cumbersome to maintain. This patch adds a register lookup table, which enables binary search for supported keys. The lookup also reduces the io frequency, so the original mutex is replaced by locks around the actual io. Signed-off-by: Henrik Rydberg [guenter.roeck@ericsson.com: Added value range check to key_at_index_store()] Signed-off-by: Guenter Roeck commit 1ee7c71bd1aa9758f14e1be92310215a5bd0abe7 Author: Joe Perches Date: Tue Nov 9 15:15:03 2010 +0000 hwmon: (applesmc) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 2344cd0c2e9ea8f3037be11fb997ddbeda0237ca Author: Henrik Rydberg Date: Tue Nov 9 15:15:02 2010 +0000 hwmon: (applesmc) Relax the severity of device init failure The device init is used to reset the accelerometer. Failure to reset is not severe enough to stop loading the module or to resume from hibernation. This patch relaxes failure to a warning and drops output in case of success. Cc: stable@kernel.org Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 132af03233b493101a53010383b5abb5b9ff1e51 Author: Edgar Hucek Date: Tue Nov 9 15:15:01 2010 +0000 hwmon: (applesmc) Add MacBookAir3,1(3,2) support This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the applesmc driver. [rydberg@euromail.se: minor cleanup] Cc: stable@kernel.org Signed-off-by: Edgar Hucek Signed-off-by: Henrik Rydberg Signed-off-by: Guenter Roeck commit 18de030f1dbaef0c13cf393899a298d978aa200f Author: Joe Perches Date: Wed Oct 20 06:51:55 2010 +0000 hwmon: (w83627hf) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit abdc6fd189405a83ebd20aa9facfbdf3c179d48a Author: Joe Perches Date: Wed Oct 20 06:51:54 2010 +0000 hwmon: (w83627ehf) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 9d72be0da16da10e27f6a8c01f877db6c513413d Author: Joe Perches Date: Wed Oct 20 06:51:53 2010 +0000 hwmon: (vt8231) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 5ed9ba6b87545d21b48e50a028bfb79f9812f89f Author: Joe Perches Date: Wed Oct 20 06:51:52 2010 +0000 hwmon: (vt1211) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 774f7827e13cfae720306ca44b83b93ab2a6b9be Author: Joe Perches Date: Wed Oct 20 06:51:51 2010 +0000 hwmon: (via686a) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit edb8d53c684da4062ac8c461727ddc1839336aa5 Author: Joe Perches Date: Wed Oct 20 06:51:50 2010 +0000 hwmon: (via-cputemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 512504e9f5489dbe85c80fd2c1b44ab5a8e0d5fa Author: Joe Perches Date: Wed Oct 20 06:51:49 2010 +0000 hwmon: (smsc47m1) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit bf1a85eff87eeb0651b1c5b348d51206ec7c0ef5 Author: Joe Perches Date: Wed Oct 20 06:51:48 2010 +0000 hwmon: (smsc47b397) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 4b2515dbb94341db01db3208f9f40658c5e2a251 Author: Joe Perches Date: Wed Oct 20 06:51:47 2010 +0000 hwmon: (sis5595) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 14a613cc23869d0ca69154bbc5816004fe201b17 Author: Joe Perches Date: Wed Oct 20 06:51:46 2010 +0000 hwmon: (pkgtemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 2caec1343e0cfe59bacf3d4f67d69ab6283cc75b Author: Joe Perches Date: Wed Oct 20 06:51:45 2010 +0000 hwmon: (pcf8591) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 5713017ec5e1a437ae4d0d196bce46d572eb7e1a Author: Joe Perches Date: Wed Oct 20 06:51:41 2010 +0000 hwmon: (lm70) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 63366d37ad5dbb4f208b517c88ea4bd41738dbf7 Author: Joe Perches Date: Wed Oct 20 06:51:40 2010 +0000 hwmon: (lis3lv02d) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 55d705cce829c37999f26a8d4f1dd701013e7920 Author: Joe Perches Date: Wed Oct 20 06:51:38 2010 +0000 hwmon: (ibmaem) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit c95df1ae69b85d5f306d86164e245aae614b852a Author: Joe Perches Date: Wed Oct 20 06:51:37 2010 +0000 hwmon: (core) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 1f923c7a6726b224b6b1b059da5a7f8e3dff1196 Author: Joe Perches Date: Wed Oct 20 06:51:36 2010 +0000 hwmon: (hwmon-vid) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 53ab0e6888925ae3ebe931c060120b0f11c1923c Author: Joe Perches Date: Wed Oct 20 06:51:35 2010 +0000 hwmon: (hp_accel) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 22d3b41281b4c1a55086fa4dff7abb4f0c36403e Author: Joe Perches Date: Wed Oct 20 06:51:34 2010 +0000 hwmon: (f71882fg) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit e54c5ad61f4e2c4fdfbdb8dff31fc604073d3550 Author: Joe Perches Date: Wed Oct 20 06:51:33 2010 +0000 hwmon: (f71805f) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 9c6e13b411cf0f656b7d7a78ec35bf0069f631bb Author: Joe Perches Date: Wed Oct 20 06:51:32 2010 +0000 hwmon: (dme1737) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit f8bb8925682f355dc20f721bda7021ef13e5869f Author: Joe Perches Date: Wed Oct 20 06:51:31 2010 +0000 hwmon: (coretemp) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit ac561494d48b92a41424cc87e2a02b545424643c Author: Joe Perches Date: Wed Oct 20 06:51:30 2010 +0000 hwmon: (asus_atk0110) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 4d630e2ba59a231c8e5031cc55e16737aa59af97 Author: Joe Perches Date: Wed Oct 20 06:51:29 2010 +0000 hwmon: (asb1000) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 2e991201e4ebffb1fb32873d72e2ee4b499269c3 Author: Joe Perches Date: Wed Oct 20 06:51:27 2010 +0000 hwmon: (adt7470) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit fe826749aec090c6f9ab48502bb9a7777572b85b Author: Joe Perches Date: Wed Oct 20 06:51:26 2010 +0000 hwmon: (abituguru3) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 28ebfa13f97265e415fbe19795500a6d922a6c86 Author: Joe Perches Date: Wed Oct 20 06:51:25 2010 +0000 hwmon: (abituguru) Use pr_fmt and pr_ Added #define pr_fmt KBUILD_MODNAME ": " fmt Converted printks to pr_ Coalesced any long formats Removed prefixes from formats Added a few static strings to standardize logging messages. Signed-off-by: Joe Perches Signed-off-by: Guenter Roeck commit 048fc018c81d2acd86db2c3d1e226ea28f646729 Author: Jamie Iles Date: Sat Jan 8 01:37:42 2011 -0800 Input: remove aaed2000 keyboard driver The only platform using this driver (mach-aaec2000) is no longer in the kernel so remove the driver. Signed-off-by: Jamie Iles Signed-off-by: Dmitry Torokhov commit f8313ef1f448006207f12c107123522c8bc00f15 Author: Jiri Kosina Date: Sat Jan 8 01:37:26 2011 -0800 Input: i8042 - introduce 'notimeout' blacklist for Dell Vostro V13 i8042 controller present in Dell Vostro V13 errorneously signals spurious timeouts. Introduce i8042.notimeout parameter for ignoring i8042-signalled timeouts and apply this quirk automatically for Dell Vostro V13, based on DMI match. In addition to that, this machine also needs to be added to nomux blacklist. Signed-off-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit 2d75af2f2a7a6103a6d539a492fe81deacabde44 Author: Jason Baron Date: Fri Jan 7 13:36:58 2011 -0500 dynamic debug: Fix build issue with older gcc On older gcc (3.3) dynamic debug fails to compile: include/net/inet_connection_sock.h: In function `inet_csk_reset_xmit_timer': include/net/inet_connection_sock.h:236: error: duplicate label declaration `do_printk' include/net/inet_connection_sock.h:219: error: this is a previous declaration include/net/inet_connection_sock.h:236: error: duplicate label declaration `out' include/net/inet_connection_sock.h:219: error: this is a previous declaration include/net/inet_connection_sock.h:236: error: duplicate label `do_printk' include/net/inet_connection_sock.h:236: error: duplicate label `out' Fix, by reverting the usage of JUMP_LABEL() in dynamic debug for now. Cc: Reported-by: Tetsuo Handa Tested-by: Tetsuo Handa Signed-off-by: Jason Baron Signed-off-by: Steven Rostedt commit 870915e047a2da695be118d32dd5a900f0c3e933 Author: Mathieu Desnoyers Date: Thu Oct 28 11:31:17 2010 -0400 tracing: Fix TRACE_EVENT power tracepoint creation DEFINE_TRACE should also exist when CONFIG_EVENT_TRACING=n. Otherwise, setting only TRACEPOINTS=y is broken. Acked-by: Arjan van de Ven Signed-off-by: Mathieu Desnoyers LKML-Reference: <20101028153117.GA4051@Krystal> Signed-off-by: Steven Rostedt commit 1dbd1951f39e13da579ffe879cce19586d0462de Author: Li Zefan Date: Thu Dec 9 15:47:56 2010 +0800 tracing: Fix preempt count leak While running my ftrace stress test, this showed up: BUG: sleeping function called from invalid context at mm/mmap.c:233 ... note: cat[3293] exited with preempt_count 1 The bug was introduced by commit 91e86e560d0b3ce4c5fc64fd2bbb99f856a30a4e ("tracing: Fix recursive user stack trace") Cc: Signed-off-by: Li Zefan LKML-Reference: <4D0089AC.1020802@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 2ad2c320a107aceeba984f97ab2a60064101f5d5 Author: Nick Bowler Date: Fri Jan 7 21:32:02 2011 -0500 pata_platform: Remove CONFIG_HAVE_PATA_PLATFORM's dependencies. CONFIG_HAVE_PATA_PLATFORM, by virtue of where its defined, has a dependency on CONFG_ATA and CONFIG_ATA_SFF. This causes Kconfig warnings when it is selected by various architectures, such as warning: (ARCH_VEXPRESS && || ARCH_RPC && || MACH_VPAC270 && ARCH_PXA || MACH_REALVIEW_PB11MP && ARCH_REALVIEW || MACH_REALVIEW_PBA8 && ARCH_REALVIEW || MACH_REALVIEW_PBX && ARCH_REALVIEW || MACH_BAST_IDE && ARCH_S3C2410 || MACH_ANUBIS && ARCH_S3C2410) selects HAVE_PATA_PLATFORM which has unmet direct dependencies (ATA && ATA_SFF) Since this option is only used to control visibility of the CONFIG_PATA_PLATFORM option and isn't itself visible in the menu, it is straightforward to simply remove these dependencies rather than adjust all the architectures. Signed-off-by: Nick Bowler Signed-off-by: Jeff Garzik commit fc2698d5ec7e96ba2c94a942329cfa4c5d6085f7 Author: Sergei Shtylyov Date: Wed Jan 5 21:59:49 2011 +0300 pata_hpt37x: actually limit HPT370 to UltraDMA/66 The driver clearly tries to limit HPT370[A] to UltraDMA/66 if the PCI clock is less than 50 MHz but due to cut&paste type mistake this code has no effect... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit b197f13b53681c606e59d7d9a8a1d2d54fd363fe Author: Sergei Shtylyov Date: Tue Dec 28 23:11:36 2010 +0300 pata_hpt3x2n: coding style cleanup Fix 8 errors and 3 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 49bfbd38bfc997e9081beabd758b2bd655d26a9c Author: Sergei Shtylyov Date: Tue Dec 28 23:09:27 2010 +0300 pata_hpt37x: coding style cleanup Fix 12 errors and 15 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *for*/*switch*/*while* and open parenthesis; - space between an unary operator and its operand; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also do the following: - add new line after variable definitions; - fix the style of some multi-line comments. Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 28cd4b6b4850d7588f1033c3808314b6bc2150d5 Author: Sergei Shtylyov Date: Tue Dec 28 23:06:38 2010 +0300 pata_hpt366: coding style cleanup Fix 2 errors and 11 warnings given by checkpatch.pl: - *switch* and *case* not on the same indentation level; - no space between *switch* and open parenthesis; - drive blacklist arrays not being *const*; - spaces before tabs; - lines over 80 characters. In addition to these changes, also add new line after variable definition in hpt36x_init_chipset()... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit dfc7e3e37d4a22ed5fd3f6e8c9842cb1246fee4f Author: Sergei Shtylyov Date: Tue Dec 28 22:54:54 2010 +0300 pata_hpt3x2n: calculate average f_CNT Allow hpt3x2n_pci_clock() to calculate the average f_CNT register value iff HighPoint BIOS hasn't saved one, just like the 'pata_hpt37x' driver (reading the full 16-bit register, unlike what that driver does), so that this driver would work correctly on e.g. non-x86 machine with 66 MHz PCI. I'm not sure why Alan has only done this in one driver and not the other... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 0ca646db68d1bd7184dfc41362d0dd9d56c0e57e Author: Sergei Shtylyov Date: Tue Dec 28 21:46:40 2010 +0300 pata_hpt3x2n: clarify about HPT371N support Commit 28e21c8c0d44cd63bad4c62f94ef0c5a1cb8402c (pata_hpt3x2n: Add HPT371N support and other bits) forgot to update the driver's Kconfig entry, heading comment, and module description (that also wrongly claims support of HPT302) which may confuse users... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit 8e834c2e6d51e053c6bd23fec1d95529f618f760 Author: Sergei Shtylyov Date: Sat Dec 25 22:44:01 2010 +0300 pata_hpt{37x|3x2n}: SATA mode filtering The Marvell bridge chips used on HighPoint SATA cards do not seem to support the UltraDMA modes 1, 2, and 3 as well as any MWDMA modes; these cards are based on HPT372/372A/372N/374 chips (judging from the vendor drivers), so the Linux drivers need to have a mode_filter() method for these chips... Signed-off-by: Sergei Shtylyov Signed-off-by: Jeff Garzik commit d6351db2073315ddebac72cc1935e912f60f86e0 Author: Joel Becker Date: Fri Jan 7 18:10:32 2011 -0800 MAINTAINERS: Update Joel Becker's email address My old address no longer works, so MAINTAINERS should have a working one. Signed-off-by: Joel Becker commit aecf58661961a553c254cf14536f70349127affb Author: Tao Ma Date: Thu Dec 23 15:30:44 2010 +0800 ocfs2: Remove unused truncate function from alloc.c Tristan Ye has done some refactoring against our truncate process, so some functions like ocfs2_prepare_truncate and ocfs2_free_truncate_context are no use and we'd better remove them. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit cc548166b2aadba7a566fb0a42884a9d2ff684b0 Author: Dan Carpenter Date: Mon Jan 3 09:00:20 2011 +0300 ocfs2/cluster: dereferencing before checking in nst_seq_show() In the original code, we dereferenced "nst" before checking that it was non-NULL. I moved the check forward and pulled the code in an indent level. Signed-off-by: Dan Carpenter Signed-off-by: Joel Becker commit e70d84501b630e390b4242fb4ac629b694c11484 Author: Randy Dunlap Date: Mon Dec 27 11:55:08 2010 -0800 ocfs2: fix build for OCFS2_FS_STATS not enabled When CONFIG_OCFS2_FS_STATS is not enabled: fs/ocfs2/cluster/tcp.c:1254: error: implicit declaration of function 'o2net_update_recv_stats' Signed-off-by: Randy Dunlap Cc: Mark Fasheh Cc: Joel Becker Cc: ocfs2-devel@oss.oracle.com Signed-off-by: Joel Becker commit bd1c8b22b7b81c6f6c4f5c19cb2387da3d02fb0f Author: Lai Jiangshan Date: Tue Jan 4 16:06:09 2011 +0800 tracepoint: Add __rcu annotation Add __rcu annotation to : (struct tracepoint)->funcs Acked-by: Mathieu Desnoyers Signed-off-by: Lai Jiangshan LKML-Reference: <4D22D4F1.50505@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 881fe4bdcdc899674524e30a76c76d298b447008 Author: Mathieu Desnoyers Date: Thu Jan 6 12:53:19 2011 -0500 tracing: remove duplicate null-pointer check in skb tracepoint The check for NULL skb in the kfree_skb trace event is a duplicate from the check already done in its only caller, kfree_skb(). Remove this duplicate check. Signed-off-by: Mathieu Desnoyers LKML-Reference: <20110106175319.GA30610@Krystal> Acked-by: Neil Horman Acked-by: David S. Miller CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Zhaolei Signed-off-by: Steven Rostedt commit ec6e7c3ae39cb1dc279b5274aaaadd09ff8e224b Author: Mathieu Desnoyers Date: Thu Jan 6 13:45:32 2011 -0500 tracing/trivial: Add missing comma in TRACE_EVENT comment Add missing comma within the TRACE_EVENT() example in tracepoint.h. Signed-off-by: Mathieu Desnoyers LKML-Reference: <20110106184532.GA2526@Krystal> CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner Signed-off-by: Steven Rostedt commit 0c21e3aaf6ae85bee804a325aa29c325209180fd Merge: 021db8e b2837fc Author: Linus Torvalds Date: Fri Jan 7 17:16:27 2011 -0800 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus: hfsplus: %L-to-%ll, macro correction, and remove unneeded braces hfsplus: spaces/indentation clean-up hfsplus: C99 comments clean-up hfsplus: over 80 character lines clean-up hfsplus: fix an artifact in ioctl flag checking hfsplus: flush disk caches in sync and fsync hfsplus: optimize fsync hfsplus: split up inode flags hfsplus: write up fsync for directories hfsplus: simplify fsync hfsplus: avoid useless work in hfsplus_sync_fs hfsplus: make sure sync writes out all metadata hfsplus: use raw bio access for partition tables hfsplus: use raw bio access for the volume headers hfsplus: always use hfsplus_sync_fs to write the volume header hfsplus: silence a few debug printks hfsplus: fix option parsing during remount Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c} commit 021db8e2bde53024a163fb4417a185de46fe77aa Merge: 72eb6a7 07fe035 Author: Linus Torvalds Date: Fri Jan 7 17:08:46 2011 -0800 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits) spi/omap: Fix DMA API usage in OMAP MCSPI driver spi/imx: correct the test on platform_get_irq() return value spi/topcliff: Typo fix threhold to threshold spi/dw_spi Typo change diable to disable. spi/fsl_espi: change the read behaviour of the SPIRF spi/mpc52xx-psc-spi: move probe/remove to proper sections spi/dw_spi: add DMA support spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs spi/dw_spi: Fix too short timeout in spi polling loop spi/pl022: convert running variable spi/pl022: convert busy flag to a bool spi/pl022: pass the returned sglen to the DMA engine spi/pl022: map the buffers on the DMA engine spi/topcliff_pch: Fix data transfer issue spi/imx: remove autodetection spi/pxa2xx: pass of_node to spi device and set a parent device spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add CE4100 support ... commit 72eb6a791459c87a0340318840bb3bd9252b627b Merge: 23d69b0 55ee4ef Author: Linus Torvalds Date: Fri Jan 7 17:02:58 2011 -0800 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits) gameport: use this_cpu_read instead of lookup x86: udelay: Use this_cpu_read to avoid address calculation x86: Use this_cpu_inc_return for nmi counter x86: Replace uses of current_cpu_data with this_cpu ops x86: Use this_cpu_ops to optimize code vmstat: User per cpu atomics to avoid interrupt disable / enable irq_work: Use per cpu atomics instead of regular atomics cpuops: Use cmpxchg for xchg to avoid lock semantics x86: this_cpu_cmpxchg and this_cpu_xchg operations percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support percpu,x86: relocate this_cpu_add_return() and friends connector: Use this_cpu operations xen: Use this_cpu_inc_return taskstats: Use this_cpu_ops random: Use this_cpu_inc_return fs: Use this_cpu_inc_return in buffer.c highmem: Use this_cpu_xx_return() operations vmstat: Use this_cpu_inc_return for vm statistics x86: Support for this_cpu_add, sub, dec, inc_return percpu: Generic support for this_cpu_add, sub, dec, inc_return ... Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c} as per Tejun. commit 23d69b09b78c4876e134f104a3814c30747c53f1 Merge: e744070 569ff2d Author: Linus Torvalds Date: Fri Jan 7 16:58:04 2011 -0800 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits) usb: don't use flush_scheduled_work() speedtch: don't abuse struct delayed_work media/video: don't use flush_scheduled_work() media/video: explicitly flush request_module work ioc4: use static work_struct for ioc4_load_modules() init: don't call flush_scheduled_work() from do_initcalls() s390: don't use flush_scheduled_work() rtc: don't use flush_scheduled_work() mmc: update workqueue usages mfd: update workqueue usages dvb: don't use flush_scheduled_work() leds-wm8350: don't use flush_scheduled_work() mISDN: don't use flush_scheduled_work() macintosh/ams: don't use flush_scheduled_work() vmwgfx: don't use flush_scheduled_work() tpm: don't use flush_scheduled_work() sonypi: don't use flush_scheduled_work() hvsi: don't use flush_scheduled_work() xen: don't use flush_scheduled_work() gdrom: don't use flush_scheduled_work() ... Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c as per Tejun. commit 4ead36407b41eae942c8c9f70ef963cd369c90e2 Author: Stefan Achatz Date: Fri Dec 10 19:43:34 2010 +0100 HID: roccat: Update sysfs attribute doc Updated sysfs attribute documentation to reflect recent changes in driver design. The device specific attributes moved from the driver to the respective roccat char device. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 4d043101897768dfde30a6f2674fc7cec403d6b0 Author: Jiri Kosina Date: Thu Dec 9 14:29:34 2010 +0100 HID: roccat: don't use #pragma pack Replace #pragma pack ocurences with __atribute__((__packed__)); Signed-off-by: Jiri Kosina commit 47dbdbffe15b9582a41727766d43f1d4208e977e Author: Stefan Achatz Date: Fri Nov 26 19:57:42 2010 +0000 HID: roccat: Add support for Roccat Kone[+] v2 This patch adds support for Roccat Kone[+] gaming mouse. Kone[+] is an enhanced version of the old Kone with more memory for macros, a better sensor and more functionality. This driver is conceptual similar to the existing Kone and Pyra drivers. Userland tools can soon be found at http://sourceforge.net/projects/roccat Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 14a057f80f0c4d45a9e68009f8bcb6b246e87ca0 Author: Stefan Achatz Date: Fri Nov 26 19:57:38 2010 +0000 HID: roccat: reduce number of functions in kone and pyra drivers The profile number is now passed via bin_attribute->private instead of function parameter to reduce number of functions. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit bd3a2b96631dd86b06dca96aef00790084a11e15 Author: Stefan Achatz Date: Fri Nov 26 19:57:36 2010 +0000 HID: roccat: declare meaning of pack pragma usage in driver headers Using pack pragma to prevent padding bytes in binary data structures used for hardware communication. Explanation of these pragmas was requested. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit 5012aada506cb8b570e46579077c0ec5b82ebd5d Author: Stefan Achatz Date: Fri Nov 26 19:57:33 2010 +0000 HID: roccat: use class for char device for sysfs attribute creation Adding sysfs attributes to an already created device raises no userland notification. Now the device drivers associate the devices attributes with a class and use this for roccat event char device creation. Signed-off-by: Stefan Achatz Signed-off-by: Jiri Kosina commit c97415a72521071c235e0879f9a600014afd87b1 Author: Stefan Achatz Date: Fri Nov 26 19:57:29 2010 +0000 sysfs: Introducing binary attributes for struct class Added dev_bin_attrs to struct class similar to existing dev_attrs. Signed-off-by: Stefan Achatz Acked-by: Greg Kroah-Hartman Signed-off-by: Jiri Kosina commit a7153258b70ccbe3922fcee9ca4271d4f4c2bc55 Merge: ae5e49c 0fbf8ed Author: Jiri Kosina Date: Sat Jan 8 01:08:19 2011 +0100 Merge branches 'upstream' and 'upstream-fixes' into for-linus commit e14411da420bad7bdaae65cccd8787674e6c565e Author: Jeff Ohlstein Date: Tue Nov 30 13:06:36 2010 -0800 msm: add SMP support for msm Signed-off-by: Jeff Ohlstein Signed-off-by: David Brown commit 9f1890a5de2a5fcf4fd9ffa3115047eed834349c Author: Jeff Ohlstein Date: Thu Dec 2 12:11:27 2010 -0800 msm: hotplug: support cpu hotplug on msm Signed-off-by: Jeff Ohlstein Signed-off-by: David Brown commit 94790ec25fdd51dc4126cc176f2e104f80f87fcb Author: Jeff Ohlstein Date: Thu Dec 2 12:05:12 2010 -0800 msm: timer: SMP timer support for msm The msm provides timer hardware that is private to each core. Each timer has separate counter and match registers, so we create separate clock_event_devices for each core. For the global clocksource, use cpu 0's counter. Signed-off-by: Jeff Ohlstein Signed-off-by: David Brown commit 7b181446c68768e2f3231a0885095ee41261dcde Author: Stepan Moskovchenko Date: Thu Oct 14 19:19:21 2010 -0700 msm: scm-boot: Support for setting cold/warm boot addresses Add support for setting the cold boot address of core 1 and the warm boot addresses of cores 0 and 1 using a secure domain call. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 2a1eb58a86514037c8b59eb13a14b0e2a9cc0fb3 Author: Stephen Boyd Date: Fri Aug 27 10:01:23 2010 -0700 msm: Secure Channel Manager (SCM) support SCM is the protocol used to communicate between the secure and non-secure code executing on the applications processor. The non-secure side uses a physically contiguous buffer to pass information to the secure side; where the buffer conforms to a format that is agreed upon by both sides. The use of a buffer allows multiple pending requests to be in flight on the secure side. It also benefits use cases where the command or response buffer contains large chunks of data. Reviewed-by: Saravana Kannan Signed-off-by: Stephen Boyd Signed-off-by: David Brown commit bfc672dcf323877228682aff79dff8ecd9f30ff8 Author: Tao Ma Date: Wed Jan 5 14:07:54 2011 +0800 Documentation/trace/events.txt: Remove obsolete sched_signal_send. 'sched_signal_send' doesn't exist in the kernel now. Replace it with 'signal_generate' so that the example in events.txt can be executed successfully. I also change some /debug to /sys/kernel/debug which is debugfs' default mount directory now(similar to commit 52ad51e). Cc: Li Zefan Cc: Randy Dunlap Cc: Jiri Kosina Signed-off-by: Tao Ma Signed-off-by: Jiri Kosina commit e744070fd4ff9d3114277e52d77afa21579adce2 Merge: d004e4d c9b5f50 Author: Linus Torvalds Date: Fri Jan 7 14:55:48 2011 -0800 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: Constify function scope static struct sched_param usage sched: Fix strncmp operation sched: Move sched_autogroup_exit() to free_signal_struct() sched: Fix struct autogroup memory leak sched: Mark autogroup_init() __init sched: Consolidate the name of root_task_group and init_task_group commit d004e4d3322340b6433caaef4a47ab8c933afb70 Merge: 128283a 1c2a48c Author: Linus Torvalds Date: Fri Jan 7 14:55:31 2011 -0800 Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: apic: Cleanup and simplify setup_local_APIC() x86: Further simplify mp_irq info handling x86: Unify 3 similar ways of saving mp_irqs info x86, ioapic: Avoid writing io_apic id if already correct x86, x2apic: Don't map lapic addr for preenabled x2apic systems x86, sfi: Use register_lapic_address() x86, apic: Use register_lapic_address() in init_apic_mapping() x86, apic: Remove early_init_lapic_mapping() x86, apic: Unify identical register_lapic_address() functions commit 128283a47e7cc6754db3d2704004c1ed728d26db Merge: 442d1ba 6d5db46 Author: Linus Torvalds Date: Fri Jan 7 14:54:03 2011 -0800 Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: EDAC, MCE: Fix NB error formatting EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit EDAC, MCE: Enable MCE decoding on F15h EDAC, MCE: Allow F15h bank 6 MCE injection EDAC, MCE: Shorten error report formatting EDAC, MCE: Overhaul error fields extraction macros EDAC, MCE: Add F15h FP MCE decoder EDAC, MCE: Add F15 EX MCE decoder EDAC, MCE: Add an F15h NB MCE decoder EDAC, MCE: No F15h LS MCE decoder EDAC, MCE: Add F15h CU MCE decoder EDAC, MCE: Add F15h IC MCE decoder EDAC, MCE: Add F15h DC MCE decoder EDAC, MCE: Select extended error code mask commit 442d1ba237c81304ccfa33887094e843183645f7 Merge: fb5131e a135cef Author: Linus Torvalds Date: Fri Jan 7 14:53:42 2011 -0800 Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: Disable DRAM ECC injection on K8 EDAC: Fixup scrubrate manipulation amd64_edac: Remove two-stage initialization amd64_edac: Check ECC capabilities initially amd64_edac: Carve out ECC-related hw settings amd64_edac: Remove PCI ECS enabling functions amd64_edac: Remove explicit Kconfig PCI dependency amd64_edac: Allocate driver instances dynamically amd64_edac: Rework printk macros amd64_edac: Rename CPU PCI devices amd64_edac: Concentrate per-family init even more amd64_edac: Cleanup the CPU PCI device reservation amd64_edac: Simplify CPU family detection amd64_edac: Add per-family init function amd64_edac: Use cached extended CPU model amd64_edac: Remove F11h support commit fb5131e1880ea1ba3ba7197cd5cc66c9c288f715 Merge: d074b10 8e10230 Author: Linus Torvalds Date: Fri Jan 7 14:50:50 2011 -0800 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: (65 commits) [S390] prevent unneccesary loops_per_jiffy recalculation [S390] cpuinfo: use get_online_cpus() instead of preempt_disable() [S390] smp: remove cpu hotplug messages [S390] mutex: enable spinning mutex on s390 [S390] mutex: Introduce arch_mutex_cpu_relax() [S390] cio: fix ccwgroup unregistration race condition [S390] perf: add DWARF register lookup for s390 [S390] cleanup ftrace backend functions [S390] ptrace cleanup [S390] smp/idle: call init_idle() before starting a new cpu [S390] smp: delay idle task creation [S390] dasd: Correct retry counter for terminated I/O. [S390] dasd: Add support for raw ECKD access. [S390] dasd: Prevent deadlock during suspend/resume. [S390] dasd: Improve handling of stolen DASD reservation [S390] dasd: do path verification for paths added at runtime [S390] dasd: add High Performance FICON multitrack support [S390] cio: reduce memory consumption of itcw structures [S390] nmi: enable machine checks early [S390] qeth: buffer count imbalance ... commit d074b104cefcb6e8ded55a53e62fed59a246f55d Merge: 31b6ca0 c413521 Author: Linus Torvalds Date: Fri Jan 7 14:50:14 2011 -0800 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: (67 commits) ARM: mach-shmobile: update for SMP changes. ARM: mach-shmobile: update for GIC changes. ARM: mach-shmobile: Fix up clkdev fallout for SH73A0. dma: shdma: don't register the global die notifier multiple times ARM: mach-shmobile: Rely on run-time IRQ handlers ARM: mach-shmobile: Run-time IRQ handler for GIC ARM: mach-shmobile: Run-time IRQ handler for INTCA ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER ARM: mach-shmobile: Use shared GIC entry macros ARM: mach-shmobile: mackerel: Add zboot support ARM: mach-shmobile: mackerel: Add HDMI sound support ARM: mach-shmobile: mackerel: add HDMI video support ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk ARM: mach-shmobile: sh73a0: fix div4 table ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB ARM: mach-shmobile: Mackerel VGA camera support mmc: sh_mmcif: make DMA support by the driver unconditional ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins ARM: mach-shmobile: sh73a0 GPIO pullup improvement ... commit 31b6ca0af758a88e5e769b48cc6dde037ee37b96 Merge: 56b85f3 554738d Author: Linus Torvalds Date: Fri Jan 7 14:45:47 2011 -0800 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: (58 commits) Input: wacom_w8001 - support pen or touch only devices Input: wacom_w8001 - use __set_bit to set keybits Input: bu21013_ts - fix misuse of logical operation in place of bitop Input: i8042 - add Acer Aspire 5100 to the Dritek list Input: wacom - add support for digitizer in Lenovo W700 Input: psmouse - disable the synaptics extension on OLPC machines Input: psmouse - fix up Synaptics comment Input: synaptics - ignore bogus mt packet Input: synaptics - add multi-finger and semi-mt support Input: synaptics - report clickpad property input: mt: Document interface updates Input: fix double equality sign in uevent Input: introduce device properties hid: egalax: Add support for Wetab (726b) Input: include MT library as source for kerneldoc MAINTAINERS: Update input-mt entry hid: egalax: Add support for Samsung NB30 netbook hid: egalax: Document the new devices in Kconfig hid: egalax: Add support for Wetab hid: egalax: Convert to MT slots ... Fixed up trivial conflict in drivers/input/keyboard/Kconfig commit 56b85f32d530d09d6805488ad00775d4e0e3baab Merge: 3e5b08c 568389c Author: Linus Torvalds Date: Fri Jan 7 14:39:20 2011 -0800 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: (36 commits) serial: apbuart: Fixup apbuart_console_init() TTY: Add tty ioctl to figure device node of the system console. tty: add 'active' sysfs attribute to tty0 and console device drivers: serial: apbuart: Handle OF failures gracefully Serial: Avoid unbalanced IRQ wake disable during resume tty: fix typos/errors in tty_driver.h comments pch_uart : fix warnings for 64bit compile 8250: fix uninitialized FIFOs ip2: fix compiler warning on ip2main_pci_tbl specialix: fix compiler warning on specialix_pci_tbl rocket: fix compiler warning on rocket_pci_ids 8250: add a UPIO_DWAPB32 for 32 bit accesses 8250: use container_of() instead of casting serial: omap-serial: Add support for kernel debugger serial: fix pch_uart kconfig & build drivers: char: hvc: add arm JTAG DCC console support RS485 documentation: add 16C950 UART description serial: ifx6x60: fix memory leak serial: ifx6x60: free IRQ on error Serial: EG20T: add PCH_UART driver ... Fixed up conflicts in drivers/serial/apbuart.c with evil merge that makes the code look fairly sane (unlike either side). commit 4a198be7f072190a44033b7de6084b090b9885ee Author: Albert Astals Cid Date: Fri Jan 7 17:29:44 2011 -0500 Support KHLB2 in the compal laptop driver Add the KHLB2 model identifier to the list of supported models Signed-off-by: Albert Astals Cid Signed-off-by: Matthew Garrett commit 59ccf2f3d55c06fd34613f1f78de0279436a7b35 Author: From: Lee, Chun-Yi Date: Fri Jan 7 17:25:14 2011 -0500 acer-wmi: Enabled Acer Launch Manager mode Enabled Acer Launch Manager mode to disable the EC raw behavior for communication devices when WMID3 method available. And, we also add a ec_raw_mode kernel module option for enable The EC raw behavior mode when anyone what reset it back. When Acer Launch Manager mode enabled, EC will stop to touch any communication devices' RF state or power state that causes conflict with rfkill_input or any userland daemon to charge the rfkill rules. Signed-off-by: Lee, Chun-Yi Acked-by: Thomas Renninger Acked-by: Jiri Benc Acked-by: Dmitry Torokhov Signed-off-by: Carlos Corbacho Cc: Corentin Chary Signed-off-by: Matthew Garrett commit 456dc301cc3b547b2a674de3028f53fb1453e532 Author: Feng Tang Date: Fri Dec 31 09:48:20 2010 +0800 [PATCH] intel_pmic_gpio: modify EOI handling following change of kernel irq subsystem 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. Cc: Alek Du Signed-off-by: Feng Tang Signed-off-by: Matthew Garrett commit 213658516fd5e125eb7a97995f6cae8996f8015b Author: Jesper Juhl Date: Fri Dec 24 19:56:28 2010 +0100 ACPI Thinkpad: We must always call va_end() after va_start() but do not do so in thinkpad_acpi.c::acpi_evalf() Hi, In drivers/platform/x86/thinkpad_acpi.c::acpi_evalf() we don't always call va_end() after va_start(). This patch corrects that. Signed-off-by: Jesper Juhl Acked-by: Henrique de Moraes Holschuh Signed-off-by: Matthew Garrett commit 466449cfe797b8a5d82d25d0e0e08426d8dfba19 Author: Lee, Chun-Yi Date: Mon Dec 13 10:02:41 2010 +0800 acer-wmi: Initialize wlan/bluetooth/wwan rfkill software block state Initial wlan/bluetooth/wwan rfkill software block state when acer-wmi driver probe. Acer notebook can save the devices state and this patch can use it to initial the devices' rfkill state. Signed-off-by: Lee, Chun-Yi Acked-by: Thomas Renninger Cc: Carlos Corbacho Signed-off-by: Matthew Garrett commit 6c3df88f19375217f0dbfc6160e8c2a635f56c53 Author: Lee, Chun-Yi Date: Tue Dec 7 10:29:23 2010 +0800 acer-wmi: Detect the WiFi/Bluetooth/3G devices available Check the Acer OEM-specific Type AA to detect the WiFi/Bluetooth/3G devices available or not, and set the devices capability flag. Signed-off-by: Lee, Chun-Yi Reviewed-by: Jean Delvare Reviewed-by: Dmitry Torokhov Acked-by: Thomas Renninger Acked-by: Jiri Benc Cc: Carlos Corbacho Cc: Corentin Chary Signed-off-by: Matthew Garrett commit b3c9092b2fed427d45117d23ceb577ad8dc46a9a Author: Lee, Chun-Yi Date: Tue Dec 7 10:29:22 2010 +0800 acer-wmi: Add 3G rfkill sysfs file Add 3G rfkill sysfs file for provide userland to control 3G device on/off by using WMI method. Signed-off-by: Lee, Chun-Yi Acked-by: Thomas Renninger Acked-by: Jiri Benc Acked-by: Dmitry Torokhov Signed-off-by: Carlos Corbaho Cc: Corentin Chary Signed-off-by: Matthew Garrett commit 3fdca87d10f1d45b1c034da343e68beb082f9b84 Author: Lee, Chun-Yi Date: Tue Dec 7 10:29:20 2010 +0800 acer-wmi: Add acer wmi hotkey events support Add acer wmi hotkey event support. Install a wmi notify handler to transfer wmi event key to key code, then send out keycode through acer wmi input device to userland. Signed-off-by: Lee, Chun-Yi Acked-by: Dmitry Torokhov Acked-by: Thomas Renninger Acked-by: Jiri Benc Signed-off-by: Carlos Corbacho Cc: Corentin Chary Signed-off-by: Matthew Garrett commit e98062ed6dc46ed3270350e1040e19d44150d1d1 Author: Sedat Dilek Date: Wed Dec 8 11:20:26 2010 +0100 platform/x86: Kconfig: Replace select by depends on ACPI_WMI With 'make oldnoconfig' I see these warnings in linux-next (next-20101208): drivers/platform/x86/Kconfig:422:error: recursive dependency detected! drivers/platform/x86/Kconfig:422: symbol EEEPC_WMI depends on ACPI_WMI drivers/platform/x86/Kconfig:438: symbol ACPI_WMI is selected by ACER_WMI drivers/platform/x86/Kconfig:18: symbol ACER_WMI depends on LEDS_CLASS drivers/leds/Kconfig:10: symbol LEDS_CLASS is selected by EEEPC_WMI This patch replaces all "select on ACPI_WMI" by "depends on ACPI_WMI". Quote from David Woodhouse: "A better policy is: "NEVER USE SELECT"." Reported-and-tested-by: Sedat Dilek Signed-off-by: Sedat Dilek Acked-by: Randy Dunlap Signed-off-by: Matthew Garrett commit c1f73658edc8ac6f624968b47a276361ce032ca9 Author: Ike Panhc Date: Mon Dec 13 18:01:12 2010 +0800 ideapad: pass ideapad_priv as argument (part 2) Passing ideapad_priv as argument and try not to using too much global variable. This is part 2 for rfkill. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit 8693ae846cad00e6c2c40e116ec1fc50c145b559 Author: Ike Panhc Date: Mon Dec 13 18:01:01 2010 +0800 ideapad: pass ideapad_priv as argument (part 1) Passing ideapad_priv as argument and try not to using too much global variable. This is part 1 for platform driver and input device. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit a4b5a2794a27da870c2e16db390778a4683f95f8 Author: Ike Panhc Date: Mon Dec 13 18:00:48 2010 +0800 ideapad: add markups, unify comments and return result when init 1. Add markups on init and exit functions 2. Unify the comments in the same style 3. Return result when module initial Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit f63409ae91ff94e2192dafbeb00c278ba299f80e Author: Ike Panhc Date: Mon Dec 13 18:00:38 2010 +0800 ideapad: add hotkey support Hotkey enabled by this patch: Fn+F3: Video mode switch Fn+F5: software rfkill for wifi For some ideapad when push Fn+F3, hardware generates Super-P keys, those key will not be enabled by this patch. Thanks for Dave Hansen report the problem. If CONFIG_INPUT_SPARSEKMAP is not set, when building, you will have error message: ERROR: "sparse_keymap_setup" [drivers/platform/x86/ideapad-laptop.ko] undefined! ERROR: "sparse_keymap_free" [drivers/platform/x86/ideapad-laptop.ko] undefined! ERROR: "sparse_keymap_report_event" [drivers/platform/x86/ideapad-laptop.ko] undefined! To select INPUT_SPARSEKMAP solve this issue. Ref: http://lkml.org/lkml/2010/12/2/340 Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit c9f718d0c6b4cf8033aa0f5ac892d68ddfb865aa Author: Ike Panhc Date: Mon Dec 13 18:00:27 2010 +0800 ideapad: let camera power control entry under platform driver The entry was at /sys/devices/LNXSYSTM:00/../VPC2004:00/camera_power move to /sys/devices/platform/ideapad/camera_power Add document about usage of ideapad node in sysfs. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit 98ee69191d3af68e2292528cbb16dcba3d8e2b81 Author: Ike Panhc Date: Mon Dec 13 18:00:15 2010 +0800 ideapad: add platform driver for ideapad Create /sys/devices/platform/ideapad for nodes of ideapad landing. Signed-off-by: Ike Panhc Signed-off-by: Matthew Garrett commit 9c23225006b695ceba31c035b287f5a7a0b0304e Author: Namhyung Kim Date: Wed Dec 8 00:04:14 2010 +0900 fujitsu-laptop: fix compiler warning on pnp_ids Annotate pnp_ids as '__used' to fix following warning: CC drivers/platform/x86/fujitsu-laptop.o drivers/platform/x86/fujitsu-laptop.c:1243: warning: ‘pnp_ids’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Matthew Garrett commit e1e0dacba5af2b0cd8f9043d0b937296c90bc990 Author: Dan Carpenter Date: Mon Dec 6 16:44:23 2010 -0500 WMI: return error if wmi_create_device() fails The break resets the retval to 0 but we want to return an error code. This was introduced in c64eefd48c4 "WMI: embed struct device directly into wmi_block" Signed-off-by: Dan Carpenter Signed-off-by: Matthew Garrett Acked-by: Dmitry Torokhov commit d358cb55a4cc83c37fbaebc0e4401a573777c6ac Author: Corentin Chary Date: Mon Nov 29 08:14:14 2010 +0100 eeepc-wmi: never load if legacy device is enabled If legacy device (SB.ATKD - ASUS010) used by eeepc-laptop is enabled, don't allow eeepc-wmi to load because: - eeepc-laptop may be loaded, and can conflict with eeepc-wmi (they both try to register eeepc::touchpad led for example). - the WMI interface is inteded to be used when the OS is not detected as Win 7. And when this is the case, the ASUS010 device is disabled. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 62a75d83131c8887237d26a36ffeabd53c3640fd Author: Corentin Chary Date: Mon Nov 29 08:14:13 2010 +0100 eeepc-laptop: add a getter for touchpad led Allow te get the current led state in a more accurate way. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit dfed65d56f9a94466bb4afd44ec8e900a6709cda Author: Corentin Chary Date: Mon Nov 29 08:14:12 2010 +0100 eeepc-wmi: remove unneeded static Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 4c4edfa3d375109c1360ce786b9df984ca65d727 Author: Corentin Chary Date: Mon Nov 29 08:14:11 2010 +0100 eeepc-wmi: claim eeepc-wmi maintainership Since eeepc-wmi has currently no official maintainer, I claim maintainership of this driver, and add it to the acpi4asus project. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 2a3f0064f2a06d5a31cddb0e452681d9f884bd8c Author: Corentin Chary Date: Mon Nov 29 08:14:10 2010 +0100 eeepc-wmi: fix confusion between ctrl_param and retval Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 8c1b2d83e82e11b9447d7fb3715d6c9764f6f28d Author: Corentin Chary Date: Mon Nov 29 08:14:09 2010 +0100 eeepc-wmi: add debugfs entries eeepc-wmi/ - debugfs root directory dev_id - current dev_id ctrl_param - current ctrl_param devs - call DEVS(dev_id, ctrl_param) and print result dsts - call DSTS(dev_id) and print result DEVS and DSTS are the main functions used in eeepc-wmi, this will allow to test new features without patching the drivers. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 4e37b42d5ac0d3f505bcdc09028f3fde82031593 Author: Corentin Chary Date: Mon Nov 29 08:14:08 2010 +0100 eeepc-wmi: use attribute group to manage attributes Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit ba48fdb969d0404d54f6fa0266373afecbbd19d7 Author: Corentin Chary Date: Mon Nov 29 08:14:07 2010 +0100 eeepc-wmi: add rfkill support for wlan, bluetooth and 3g wimax support is missing because I don't have any DSDT with WMI and wimax support. Most of the code comes from eeepc-laptop. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 084fca63128849c0961b3cfdb0cd0345e8f51ad8 Author: Corentin Chary Date: Mon Nov 29 08:14:06 2010 +0100 eeepc-wmi: add touchpad led support Most of the code comes from eeepc-laptop. Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 27c136c8738f6bec10c26aaf0a486f19edef7bf7 Author: Corentin Chary Date: Mon Nov 29 08:14:05 2010 +0100 eeepc-wmi: rework eeepc_wmi_init and eeepc_wmi_exit The old code was using platform_driver.probe to initialize eeepc_wmi context. That's a mistake because if probe fail, eeepc_platform_register() won't tell anyone, and chaos will happen. Wrap add and remove code inside eeepc_wmi_add() / eeepc_wmi_remove(), and try to use the static platform_device only in eeepc_wmi_init() and eeepc_wmi_exit() The code is now very similar to eeepc-laptop, except eeepc_laptop_add and eeepc_laptop_remove are called from acpi_driver, not module init/exit functions, but WMI doesn't provide such functionalities (yet ?). Signed-off-by: Corentin Chary Signed-off-by: Matthew Garrett commit 72135d21b587debcbcc57e0dbcc8bcfa4dacb661 Author: Herton Ronaldo Krzesinski Date: Mon Dec 6 16:46:19 2010 -0500 classmate-laptop: add missing input_sync call Add missing input_sync call in cmpc_keys_handler function. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Matthew Garrett Acked-by: Thadeu Lima de Souza Cascardo commit 698e1641a37f833dd26ee2fde5eed426cd97880b Author: Herton Ronaldo Krzesinski Date: Tue Nov 30 16:30:43 2010 -0200 classmate-laptop: little optimization for cmpc_rfkill_block We don't need to call bios/acpi (cmpc_set_rfkill_wlan) if the blocked state is already set to the same value (little optimization). This can happen for example if we initialize the module with same initial hardware state (rfkill core always call cmpc_rfkill_block on initialization here). Also GWRI method only accepts 0 or 1 for setting rfkill block, as can be seen on AML code from acpidump->DSDT from a classmate sample I have, so should be fine setting state only to 0 or 1 directly. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Matthew Garrett Acked-by: Thadeu Lima de Souza Cascardo commit 58f6425eb92f54943878b0b3f9c1e51f99c2cb72 Author: Colin King Date: Fri Nov 19 15:40:02 2010 +0000 WMI: Cater for multiple events with same GUID WMI data blocks can contain WMI events with the same GUID but with different notifiy_ids, for example volume up/down hotkeys. This patch enables a single event handler to be registered and unregistered against all events with same GUID but different notify_ids. Since an event handler is passed the notify_id of an event it can can differentiate between the different events. The patch also ensures we only register and unregister a device per unique GUID. Signed-off-by: Colin Ian King Signed-off-by: Matthew Garrett commit 3098064d3b4a9bf9d2855b2a89599ad77695e324 Author: Joe Perches Date: Sun Nov 14 19:04:38 2010 -0800 drivers/platform/x86: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Matthew Garrett commit 5369c02d951afc72d68f5f85089160a63d31ca37 Author: Sreedhara DS Date: Fri Oct 22 15:43:55 2010 +0100 intel_scu_ipc: Utility driver for intel scu ipc This driver implements ioctl and interfaces with intel scu ipc driver. It is used to access pmic/msic registers from user space and firmware update utility. Signed-off-by: Sreedhara DS [Extensive clean up and debug] Signed-off-by: Alan Cox Signed-off-by: Matthew Garrett commit ee81b786a07f1d6062d6e14b6152f1f6cc4bc63b Author: maximilian attems Date: Fri Jan 7 16:13:06 2011 +0100 deb-pkg: s/hdr/kernel_headers_/ && s/header/libc_headers_/ hdrpackage and headerpackage are not intuitive names, use proposed alternatives by Michel Marek. While touching them move the mkdir of the kernel_headers dir up and fix it for paranoid umask. CC: Theodore Ts'o Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit 56a6a19dffda6b75cef8d4183c7c6ff650025cbd Author: Santosh Shilimkar Date: Tue Jan 4 20:40:27 2011 +0530 omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg' omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4 selected. This is because common files make references to the functions which are defined only for omap2xxx and omap3xxx. LD .tmp_vmlinux1 arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store': arch/arm/mach-omap2/pm-debug.c:335: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump': arch/arm/mach-omap2/pm-debug.c:121: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/pm-debug.c:123: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/pm-debug.c:124: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/pm-debug.c:125: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset': arch/arm/mach-omap2/prcm.c:106: undefined reference to `omap2_prm_set_mod_reg_bits' arch/arm/mach-omap2/prcm.c:108: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources': arch/arm/mach-omap2/prcm.c:53: undefined reference to `omap2_prm_read_mod_reg' arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps': arch/arm/mach-omap2/clockdomain.c:545: undefined reference to `omap2_prm_clear_mod_reg_bits' arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep': arch/arm/mach-omap2/clockdomain.c:475: undefined reference to `omap2_prm_clear_mod_reg_bits' arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep': arch/arm/mach-omap2/clockdomain.c:511: undefined reference to `omap2_prm_read_mod_bits_shift' arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep': arch/arm/mach-omap2/clockdomain.c:440: undefined reference to `omap2_prm_set_mod_reg_bits' make: *** [.tmp_vmlinux1] Error 1 This patch adds stubs for these functions so that build continues to work. Signed-off-by: Santosh Shilimkar Acked-by: Paul Walmsley Signed-off-by: Kevin Hilman commit faacebc50902d367071e788c6586882a32bf09f2 Author: Santosh Shilimkar Date: Wed Jan 5 16:27:04 2011 +0530 omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared CC arch/arm/mach-omap2/omap_hwmod_common_data.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/omap_hwmod_common_data.c:20: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_late_init': arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL' undeclared (first use in this function) arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each undeclared identifier is reported only once arch/arm/plat-omap/include/plat/voltage.h:145: error: for each function it appears in.) make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 The error is reported when omap2plus_defconfig built with CONFIG_PM disabled Signed-off-by: Santosh Shilimkar Cc: Thara Gopinath Cc: Kevin Hilman Cc: Nishanth Menon Signed-off-by: Kevin Hilman commit dd361b6ff6de54f628e55a39b8667108589c74bf Author: Santosh Shilimkar Date: Wed Jan 5 16:27:03 2011 +0530 omap2plus: voltage: Trivial linking fix 'undefined reference' LD init/built-in.o LD .tmp_vmlinux1 arch/arm/mach-omap2/built-in.o: In function `omap2_set_init_voltage': arch/arm/mach-omap2/pm.c:181: undefined reference to `omap_voltage_domain_lookup' arch/arm/mach-omap2/built-in.o: In function `omap4_twl_init': arch/arm/mach-omap2/omap_twl.c:244: undefined reference to `omap_voltage_domain_lookup' arch/arm/mach-omap2/omap_twl.c:247: undefined reference to `omap_voltage_domain_lookup' arch/arm/mach-omap2/omap_twl.c:250: undefined reference to `omap_voltage_domain_lookup' make: *** [.tmp_vmlinux1] Error 1 The error is reported when omap2plus_defconfig built with CONFIG_PM disabled Signed-off-by: Santosh Shilimkar Cc: Thara Gopinath Cc: Kevin Hilman Cc: Nishanth Menon Signed-off-by: Kevin Hilman commit d7e08f1b8fcb85968c35ddecbf912bdab4cf2508 Author: Santosh Shilimkar Date: Wed Jan 5 16:27:02 2011 +0530 omap2plus: voltage: Trivial warning fix 'no return statement' Fix below build warnings CC arch/arm/mach-omap2/common.o CC arch/arm/mach-omap2/gpio.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/gpio.c:25: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic': arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void CC arch/arm/mach-omap2/dma.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/dma.c:32: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic': arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void CC arch/arm/mach-omap2/wd_timer.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/wd_timer.c:15: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic': arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void CC arch/arm/mach-omap2/prm44xx.o CC arch/arm/mach-omap2/omap_hwmod.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/omap_hwmod.c:145: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic': arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void CC arch/arm/mach-omap2/omap_hwmod_common_data.o In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38, from arch/arm/mach-omap2/omap_hwmod_common_data.c:20: arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic': arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void The error is reported when omap2plus_defconfig built with CONFIG_PM disabled Signed-off-by: Santosh Shilimkar Cc: Thara Gopinath Cc: Kevin Hilman Cc: Nishanth Menon Signed-off-by: Kevin Hilman commit 302991379c2940975cd9c6dc377abe0b522b5010 Author: Santosh Shilimkar Date: Wed Jan 5 16:27:00 2011 +0530 omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask struct clockdomain member clktrctrl_mask is available for only for OMAP2 and OMAP3 architectures. Technially it is also used only for these archs but this breaks the build with custom OMAP4 configuration. CC arch/arm/mach-omap2/clockdomain.o arch/arm/mach-omap2/clockdomain.c: In function '_enable_hwsup': arch/arm/mach-omap2/clockdomain.c:251: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c:254: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c: In function '_disable_hwsup': arch/arm/mach-omap2/clockdomain.c:277: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c:280: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_sleep': arch/arm/mach-omap2/clockdomain.c:744: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_wakeup': arch/arm/mach-omap2/clockdomain.c:789: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_enable': arch/arm/mach-omap2/clockdomain.c:922: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c:926: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_disable': arch/arm/mach-omap2/clockdomain.c:994: error: 'struct clockdomain' has no member named 'clktrctrl_mask' arch/arm/mach-omap2/clockdomain.c:998: error: 'struct clockdomain' has no member named 'clktrctrl_mask' make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1 make: *** [arch/arm/mach-omap2] Error 2 Fix the build break by dropping the #ifdef as suggested by Paul Walmsley Signed-off-by: Santosh Shilimkar Acked-by: Paul Walmsley Signed-off-by: Kevin Hilman commit 1a9b5878671d417a856fdafe971306c99297b7f0 Author: Felipe Balbi Date: Wed Jan 5 08:46:18 2011 +0200 arm: omap: gpio: don't access irq_desc array directly Instead of accessing the irq_desc array directly we can use irq_to_desc(irq). That will allow us to, if wanted, select SPARSE_IRQ and irq_descs will be added to a radix tree, instead of a array. Signed-off-by: Felipe Balbi Signed-off-by: Kevin Hilman commit b97c374d8a44292c601146783aac61f3d5d1f46f Author: Nishanth Menon Date: Tue Jan 4 14:07:14 2011 -0600 omap2+: pm_bus: make functions used as pointers as static omap_pm_runtime_suspend and omap_pm_runtime_resume are used as function pointers and does not really need to be exposed to the world. Fixes sparse warnings: arch/arm/mach-omap2/pm_bus.c:23:5: warning: symbol 'omap_pm_runtime_suspend' was not declared. Should it be static? arch/arm/mach-omap2/pm_bus.c:40:5: warning: symbol 'omap_pm_runtime_resume' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit f7c5cc456211da7d0b0aefd3886e57b313a0e00f Author: Mika Westerberg Date: Wed Dec 29 13:01:31 2010 +0200 OMAP: GPIO: fix _set_gpio_triggering() for OMAP2+ In case on OMAP2+ we call set_24xx_gpio_triggering() instead of updating reg and l values. However, at the end of the function we perform a write: __raw_writel(l, reg); So on OMAP2+ we end up writing 0 to the bank->base which is not correct (typically this points to GPIO_REVISION register). Fix this by returning immediately after call to set_24xx_gpio_triggering(). Signed-off-by: Mika Westerberg Signed-off-by: Kevin Hilman commit dda0aea7ba5a902982cb65a7f7ec1b5c8e7b6923 Author: Nishanth Menon Date: Mon Jan 3 12:58:30 2011 -0600 OMAP2+: TWL: include pm header for init protos twl_init functions are declared in pm.h and used in pm.c pm.h header defining the protos need to be included to ensure that omap_twl.c has consistent function definition. This fixes sparse warning: arch/arm/mach-omap2/omap_twl.c:237:12: warning: symbol 'omap4_twl_init' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:256:12: warning: symbol 'omap3_twl_init' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit c84ff1cc48fa41ea1b86f76f61dd4767f1adb0cd Author: Nishanth Menon Date: Mon Jan 3 12:58:29 2011 -0600 OMAP2+: TWL: make conversion routines static The uv_to_vsel, vsel_to_uv functions don't need to be exposed to the world as they are used as function pointers. make them static. Fixes sparse warnings: arch/arm/mach-omap2/omap_twl.c:63:15: warning: symbol 'twl4030_vsel_to_uv' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:68:4: warning: symbol 'twl4030_uv_to_vsel' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:73:15: warning: symbol 'twl6030_vsel_to_uv' was not declared. Should it be static? arch/arm/mach-omap2/omap_twl.c:105:4: warning: symbol 'twl6030_uv_to_vsel' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit d0eadf6d10923a46609b682bb12657fdfc1afc18 Author: Nishanth Menon Date: Mon Jan 3 13:35:41 2011 -0600 OMAP3+: sr_device: include pm header omap_enable_smartreflex_on_init is meant to be used by boards which would like to have SR enabled by default on the platform, while omap_devinit_smartreflex is used by pm code, the protos are defined in pm.h. This header should be included to ensure that sr_device function definitions match the prototypes. including pm.h fixes the sparse warnings (with CONFIG_OMAP_SMARTREFLEX=y): arch/arm/mach-omap2/sr_device.c:138:13: warning: symbol 'omap_enable_smartreflex_on_init' was not declared. Should it be static? arch/arm/mach-omap2/sr_device.c:143:12: warning: symbol 'omap_devinit_smartreflex' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 Merge: da40d03 2af1084 Author: Linus Torvalds Date: Fri Jan 7 13:16:28 2011 -0800 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: (144 commits) USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) USB: serial: ftdi_sio: add support for TIOCSERGETLSR USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport USB: atmel_usba_udc: fix freeing irq in usba_udc_remove() usb: ehci-omap: fix tll channel enable mask usb: ohci-omap3: fix trivial typo USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096 USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's USB: gadget: update ci13xxx to work with g_ether USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers Revert "USB: musb: pm: don't rely fully on clock support" Revert "USB: musb: blackfin: pm: make it work" USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added ... Manually fix up trivial conflicts in USB Kconfig changes in: arch/arm/mach-omap2/Kconfig arch/sh/Kconfig drivers/usb/Kconfig drivers/usb/host/ehci-hcd.c and annoying chip clock data conflicts in: arch/arm/mach-omap2/clock3xxx_data.c arch/arm/mach-omap2/clock44xx_data.c commit bc0fa81473c077bf4403e3b7b3397326204b65cd Merge: 0a4bbdd b7f7586 d49278e Author: Dan Williams Date: Fri Jan 7 12:47:05 2011 -0800 Merge branches 'amba' and 'dma40' into dmaengine commit da40d036fd716f0efb2917076220814b1e927ae1 Merge: aa58abc c32e061 Author: Linus Torvalds Date: Fri Jan 7 12:47:02 2011 -0800 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: (147 commits) [SCSI] arcmsr: fix write to device check [SCSI] lpfc: lower stack use in lpfc_fc_frame_check [SCSI] eliminate an unnecessary local variable from scsi_remove_target() [SCSI] libiscsi: use bh locking instead of irq with session lock [SCSI] libiscsi: do not take host lock in queuecommand [SCSI] be2iscsi: fix null ptr when accessing task hdr [SCSI] be2iscsi: fix gfp use in alloc_pdu [SCSI] libiscsi: add more informative failure message during iscsi scsi eh [SCSI] gdth: Add missing call to gdth_ioctl_free [SCSI] bfa: remove unused defintions and misc cleanups [SCSI] bfa: remove inactive functions [SCSI] bfa: replace bfa_assert with WARN_ON [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list. [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout. [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure. [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts. [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs. [SCSI] qla2xxx: Remove redundant module parameter permission bits [SCSI] qla2xxx: Add sysfs node for displaying board temperature. [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code. ... commit 3a9f987b3141f086de27832514aad9f50a53f754 Author: Steven Rostedt Date: Fri Jan 7 15:40:10 2011 -0500 tracing: Include module.h in define_trace.h While doing some developing, Peter Zijlstra and I have found that if a CREATE_TRACE_POINTS include is done before module.h is included, it can break the build. We have been lucky so far that this has not broke the build since module.h is included in almost everything. Reported-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit aa58abc20fa85328a9f048e2626c0893691ff284 Author: Dan Carpenter Date: Fri Jan 7 20:47:37 2011 +0100 input/tc3589x: fix compile error There was a semi-colon missing and it broke the compile. Signed-off-by: Dan Carpenter Cc: Dmitry Torokhov Signed-off-by: Linus Walleij Signed-off-by: Linus Torvalds commit 07fe0351702b6f0c9749e80cdbcb758686b0fe9b Author: Russell King - ARM Linux Date: Fri Jan 7 15:49:20 2011 +0000 spi/omap: Fix DMA API usage in OMAP MCSPI driver Running the latest kernel on the 4430SDP board with DMA API debugging enabled results in this: WARNING: at lib/dma-debug.c:803 check_unmap+0x19c/0x6f0() NULL NULL: DMA-API: device driver tries to free DMA memory it has not allocated [device address=0x000000008129901a] [size=260 bytes] Modules linked in: Backtrace: [] (dump_backtrace+0x0/0x10c) from [] (dump_stack+0x18/0x1c) r7:c1839dc0 r6:c0198578 r5:c0304b17 r4:00000323 [] (dump_stack+0x0/0x1c) from [] (warn_slowpath_common+0x58/0x70) [] (warn_slowpath_common+0x0/0x70) from [] (warn_slowpath_fmt+0x38/0x40) r8:c1839e40 r7:00000000 r6:00000104 r5:00000000 r4:8129901a [] (warn_slowpath_fmt+0x0/0x40) from [] (check_unmap+0x19c/0x6f0) r3:c03110de r2:c0304e6b [] (check_unmap+0x0/0x6f0) from [] (debug_dma_unmap_page+0x74/0x80) [] (debug_dma_unmap_page+0x0/0x80) from [] (omap2_mcspi_work+0x514/0xbf0) [] (omap2_mcspi_work+0x0/0xbf0) from [] (process_one_work+0x294/0x400) [] (process_one_work+0x0/0x400) from [] (worker_thread+0x220/0x3f8) [] (worker_thread+0x0/0x3f8) from [] (kthread+0x88/0x90) [] (kthread+0x0/0x90) from [] (do_exit+0x0/0x5fc) r7:00000013 r6:c005e924 r5:c0073848 r4:c1829ee0 ---[ end trace 1b75b31a2719ed20 ]--- I've no idea why this driver uses NULL for dma_unmap_single instead of the &spi->dev that is laying around just waiting to be used in that function - but it's an easy fix. Also replace this comment with a FIXME comment: /* Do DMA mapping "early" for better error reporting and * dcache use. Note that if dma_unmap_single() ever starts * to do real work on ARM, we'd need to clean up mappings * for previous transfers on *ALL* exits of this loop... */ as the comment is not true - we do work in dma_unmap() functions, particularly on ARMv6 and above. I've corrected the existing unmap functions but if any others are required they must be added ASAP. Signed-off-by: Russell King Acked-by: Tony Lindgren Signed-off-by: Grant Likely commit 4bfc2b2eccf48fef84b9adfe4f1bd8d5e6e1bc8d Merge: 01539ba 05f2f27 Author: Tony Luck Date: Fri Jan 7 09:17:33 2011 -0800 Pull misc2.6.38 into release branch commit 05f2f274c8a8747bbfb13ac8ee0c27d5f2ad8510 Author: Tony Luck Date: Fri Jan 7 09:11:55 2011 -0800 [IA64] Avoid array overflow if there are too many cpus in SRAT table acpi_numa_init() has to parse the whole SRAT table, even if the kernel wants to limit the number of cpus it will use (because the ones it is going to use may be described by entries at the end of the SRAT table). Avoid overflowing the node_cpuid array. Reported-by: Yinghai Lu Signed-off-by: Tony Luck commit 735759389b7143f95ae7badc97511e7e4729e873 Author: Richard Genoud Date: Fri Jan 7 15:26:01 2011 +0100 spi/imx: correct the test on platform_get_irq() return value The test "if (spi_imx->irq <= 0)" is not testing the IRQ value, but the return value of platform_get_irq(). As platform_get_irq() can return an error (-ENXIO) or the IRQ value it found, the test should be "if (spi_imx->irq < 0)" [grant.likely: Note: In general, Linux irq number 0 should also mean no irq, but arm still allows devices to be assigned 0, and the imx platform uses 0 for one of the spi devices, so this patch is needed for the device to work] Signed-off-by: Richard Genoud Signed-off-by: Grant Likely commit b4a45f5fe8078bfc10837dbd5b98735058bc4698 Merge: 01539ba b3e19d9 Author: Linus Torvalds Date: Fri Jan 7 08:56:33 2011 -0800 Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin * 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin: (57 commits) fs: scale mntget/mntput fs: rename vfsmount counter helpers fs: implement faster dentry memcmp fs: prefetch inode data in dcache lookup fs: improve scalability of pseudo filesystems fs: dcache per-inode inode alias locking fs: dcache per-bucket dcache hash locking bit_spinlock: add required includes kernel: add bl_list xfs: provide simple rcu-walk ACL implementation btrfs: provide simple rcu-walk ACL implementation ext2,3,4: provide simple rcu-walk ACL implementation fs: provide simple rcu-walk generic_check_acl implementation fs: provide rcu-walk aware permission i_ops fs: rcu-walk aware d_revalidate method fs: cache optimise dentry and inode for rcu-walk fs: dcache reduce branches in lookup path fs: dcache remove d_mounted fs: fs_struct use seqlock fs: rcu-walk for path lookup ... commit 625dbc3b8acbefefefe27e1d7bbc6e53eb4f3f2d Author: Frederic Weisbecker Date: Thu Jan 6 15:22:47 2011 +0100 x86: Save rbp in pt_regs on irq entry From the x86_64 low level interrupt handlers, the frame pointer is saved right after the partial pt_regs frame. rbp is not supposed to be part of the irq partial saved registers, but it only requires to extend the pt_regs frame by 8 bytes to do so, plus a tiny stack offset fixup on irq exit. This changes a bit the semantics or get_irq_entry() that is supposed to provide only the value of caller saved registers and the cpu saved frame. However it's a win for unwinders that can walk through stack frames on top of get_irq_regs() snapshots. A noticeable impact is that it makes perf events cpu-clock and task-clock events based callchains working on x86_64. Let's then save rbp into the irq pt_regs. As a result with: perf record -e cpu-clock perf bench sched messaging perf report --stdio Before: 20.94% perf [kernel.kallsyms] [k] lock_acquire | --- lock_acquire | |--44.01%-- __write_nocancel | |--43.18%-- __read | |--6.08%-- fork | create_worker | |--0.88%-- _dl_fixup | |--0.65%-- do_lookup_x | |--0.53%-- __GI___libc_read --4.67%-- [...] After: 19.23% perf [kernel.kallsyms] [k] __lock_acquire | --- __lock_acquire | |--97.74%-- lock_acquire | | | |--21.82%-- _raw_spin_lock | | | | | |--37.26%-- unix_stream_recvmsg | | | sock_aio_read | | | do_sync_read | | | vfs_read | | | sys_read | | | system_call | | | __read | | | | | |--24.09%-- unix_stream_sendmsg | | | sock_aio_write | | | do_sync_write | | | vfs_write | | | sys_write | | | system_call | | | __write_nocancel v2: Fix cfi annotations. Reported-by: Soeren Sandmann Pedersen Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Jan Beulich commit 074cee9257b96a84c955ee2a2816d426c9f64e52 Author: Sascha Hauer Date: Fri Jan 7 17:07:22 2011 +0100 ARM i.MX27 3ds: Fix mc13783 regulator names Signed-off-by: Sascha Hauer commit 39a6eebda253aa34d659ca9436e3c32ef60473f1 Author: Rakib Mullick Date: Fri Jan 7 16:59:49 2011 +0100 x86, dumpstack: Fix unused variable warning In dump_stack function, bp isn't used anymore, which is introduced by commit 9c0729dc8062bed96189bd14ac6d4920f3958743. This patch removes bp completely. Signed-off-by: Rakib Mullick Cc: Soeren Sandmann Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin LKML-Reference: Signed-off-by: Frederic Weisbecker commit e68077856e599cd33d8cd5db15762df60c29d361 Author: maximilian attems Date: Sat Jan 1 16:44:13 2011 +0100 deb-pkg: Make deb-pkg generate a seperate linux-libc-dev deb userland dev likes latest incarnation of that userland API. make it easy to also build it on make deb-pkg invocation: dpkg-deb: building package `linux-libc-dev' in `../linux-libc-dev_2.6.32-rc6-4_amd64.deb'. Last year patch rebased on top of latest deb-pkg changes. Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit d9b8ca8474fd4fdd43ba6d97a4fee8b49b978067 Author: Sheng Yang Date: Tue Dec 21 14:18:49 2010 +0800 xen: HVM X2APIC support This patch is similiar to Gleb Natapov's patch for KVM, which enable the hypervisor to emulate x2apic feature for the guest. By this way, the emulation of lapic would be simpler with x2apic interface(MSR), and faster. [v2: Re-organized 'xen_hvm_need_lapic' per Ian Campbell suggestion] Acked-by: Jeremy Fitzhardinge Signed-off-by: Sheng Yang Signed-off-by: Konrad Rzeszutek Wilk commit 2904ed8dd5a748c52caf4d8b09d3d9834b5932fa Author: Sheng Yang Date: Tue Dec 21 14:18:48 2010 +0800 apic: Move hypervisor detection of x2apic to hypervisor.h Then we can reuse it for Xen later. Acked-by: Jeremy Fitzhardinge Acked-by: Avi Kivity Acked-by: Ingo Molnar Signed-off-by: Sheng Yang Signed-off-by: Konrad Rzeszutek Wilk commit c9b5f501ef1580faa30c40c644b7691870462201 Author: Peter Zijlstra Date: Fri Jan 7 13:41:40 2011 +0100 sched: Constify function scope static struct sched_param usage Function-scope statics are discouraged because they are easily overlooked and can cause subtle bugs/races due to their global (non-SMP safe) nature. Linus noticed that we did this for sched_param - at minimum make the const. Suggested-by: Linus Torvalds Signed-off-by: Peter Zijlstra LKML-Reference: Message-ID: Signed-off-by: Ingo Molnar commit 524429c31b486c05449666b94613f59f729c0a84 Author: Hillf Danton Date: Thu Jan 6 20:58:12 2011 +0800 sched: Fix strncmp operation One of the operands, buf, is incorrect, since it is stripped and the correct address for subsequent string comparing could change if leading white spaces, if any, are removed from buf. It is fixed by replacing buf with cmp. Signed-off-by: Hillf Danton Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 1c5354de90c900b369e2ebd36c3a065ede29eb93 Author: Mike Galbraith Date: Wed Jan 5 11:16:04 2011 +0100 sched: Move sched_autogroup_exit() to free_signal_struct() Per Oleg's suggestion, undo fork failure free/put_signal_struct change, and move sched_autogroup_exit() to free_signal_struct() instead. Signed-off-by: Mike Galbraith Reviewed-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <1294222564.8369.6.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit e9aa1dd19fe49b5aed3ca94aab87576e534d2a39 Author: Mike Galbraith Date: Wed Jan 5 11:11:25 2011 +0100 sched: Fix struct autogroup memory leak Seems I lost a change somewhere, leaking memory. sched: fix struct autogroup memory leak Add missing change to actually use autogroup_free(). Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1294222285.8369.2.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 0ca0873555c0abe17b28c25b19f82857c0ddd2bc Author: Yong Zhang Date: Fri Jan 7 12:43:45 2011 +0800 sched: Mark autogroup_init() __init autogroup_init() is only called at boot time. Signed-off-by: Yong Zhang Cc: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1294375425-31065-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 07e06b011db2b3300f6c975ebf293fc4c8c59942 Author: Yong Zhang Date: Fri Jan 7 15:17:36 2011 +0800 sched: Consolidate the name of root_task_group and init_task_group root_task_group is the leftover of USER_SCHED, now it's always same to init_task_group. But as Mike suggested, root_task_group is maybe the suitable name to keep for a tree. So in this patch: init_task_group --> root_task_group init_task_group_load --> root_task_group_load INIT_TASK_GROUP_LOAD --> ROOT_TASK_GROUP_LOAD Suggested-by: Mike Galbraith Signed-off-by: Yong Zhang Signed-off-by: Peter Zijlstra LKML-Reference: <20110107071736.GA32635@windriver.com> Signed-off-by: Ingo Molnar commit 39177ec36236fb71257e51d0d198437b84170911 Author: Peter Korsgaard Date: Thu Jan 6 16:42:45 2011 +0100 nconf: handle comment entries within choice/endchoice Equivalent to af6c1598 (kconfig: handle comment entries within choice/endchoice), but for nconfig instead. Implement support for comment entries within choice groups. Comment entries are displayed visually distinct from normal configs, and selecting them is a no-op. Signed-off-by: Peter Korsgaard Signed-off-by: Michal Marek commit 410d3458e56bfe85ea4ac6358d5ae16d2f9acda6 Author: Yong Shen Date: Fri Jan 7 12:25:34 2011 +0800 ARM i.MX53 enable sdhc support on EVK board 1. changes some register address to fit macro definition 2. add platform data and clock for sdhc Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 0d7671ee66964760a718aa6d0277453b02a2c9b3 Author: Yong Shen Date: Fri Jan 7 12:25:33 2011 +0800 ARM i.MX53 enable i2c on EVK board add i2c platform data and clock Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 639047677b2fc931d6874807a7b596a236071015 Author: Yong Shen Date: Fri Jan 7 12:25:32 2011 +0800 ARM i.MX53: enable fec driver on EVK board 1. Adjust FEC base address name to fit macro definition 2. Add platform data and reset function for FEC Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 14c6500e7547704255f94c63fc6016ae5cbed1c9 Author: Richard Zhao Date: Thu Jan 6 19:05:39 2011 +0800 arm: mxc: move IOMUX_CONFIG_SION definition to iomux-v3.h Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit f2fd43954abc058586e95d4eb91e7a5477070704 Author: Don Zickus Date: Thu Jan 6 16:18:52 2011 -0500 x86, NMI: Clean-up default_do_nmi() Just re-arrange the code a bit to make it easier to follow what is going on. Basically un-negating the if-statement and swapping the code inside the if-statement with code outside. No functional changes. Originally-by: Huang Ying Signed-off-by: Don Zickus Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-7-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit ab846f13f69fa64f8ed69ce0c3e239e075910d23 Author: Don Zickus Date: Thu Jan 6 16:18:51 2011 -0500 x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU In original NMI handler, NMI reason io port (0x61) is only processed on BSP. This makes it impossible to hot-remove BSP. To solve the issue, a raw spinlock is used to allow the port to be processed on any CPU. Originally-by: Huang Ying Signed-off-by: Don Zickus Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-6-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit c410b8307702c1e1f35be3fd868ad18e4ba0410f Author: Don Zickus Date: Thu Jan 6 16:18:50 2011 -0500 x86, NMI: Remove DIE_NMI_IPI With priorities in place and no one really understanding the difference between DIE_NMI and DIE_NMI_IPI, just remove DIE_NMI_IPI and convert everyone to DIE_NMI. This also simplifies default_do_nmi() a little bit. Instead of calling the die_notifier in both the if and else part, just pull it out and call it before the if-statement. This has the side benefit of avoiding a call to the ioport to see if there is an external NMI sitting around until after the (more frequent) internal NMIs are dealt with. Patch-Inspired-by: Huang Ying Signed-off-by: Don Zickus Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-5-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 166d751479c6d4e5b17dfc1f204a9c4397c9b3f1 Author: Don Zickus Date: Thu Jan 6 16:18:49 2011 -0500 x86, NMI: Add priorities to handlers In order to consolidate the NMI die_chain events, we need to setup the priorities for the die notifiers. I started by defining a bunch of common priorities that can be used by the notifier blocks. Then I modified the notifier blocks to use the newly created priorities. Now that the priorities are straightened out, it should be easier to remove the event DIE_NMI_IPI. Signed-off-by: Don Zickus Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-4-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 673a6092ce5f5bec45619b7a7f89cfcf8bcf3c41 Author: Don Zickus Date: Thu Jan 6 16:18:48 2011 -0500 x86: Convert some devices to use DIE_NMIUNKNOWN They are a handful of places in the code that register a die_notifier as a catch all in case no claims the NMI. Unfortunately, they trigger on events like DIE_NMI and DIE_NMI_IPI, which depending on when they registered may collide with other handlers that have the ability to determine if the NMI is theirs or not. The function unknown_nmi_error() makes one last effort to walk the die_chain when no one else has claimed the NMI before spitting out messages that the NMI is unknown. This is a better spot for these devices to execute any code without colliding with the other handlers. The two drivers modified are only compiled on x86 arches I believe, so they shouldn't be affected by other arches that may not have DIE_NMIUNKNOWN defined. Signed-off-by: Don Zickus Cc: Russ Anderson Cc: Corey Minyard Cc: openipmi-developer@lists.sourceforge.net Cc: dann frazier Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 1c7b74d46fed530cca22a9a54140cdac2815c797 Author: Huang Ying Date: Thu Jan 6 16:18:47 2011 -0500 x86, NMI: Add NMI symbol constants and rename memory parity to PCI SERR Replace the NMI related magic numbers with symbol constants. Memory parity error is only valid for IBM PC-AT, newer machine use bit 7 (0x80) of 0x61 port for PCI SERR. While memory error is usually reported via MCE. So corresponding function name and kernel log string is changed. But on some machines, PCI SERR line is still used to report memory errors. This is used by EDAC, so corresponding EDAC call is reserved. Signed-off-by: Huang Ying Signed-off-by: Don Zickus Signed-off-by: Peter Zijlstra LKML-Reference: <1294348732-15030-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 4158755d3136f4cb05c1a8a260e9c06f93baeb48 Author: Stephane Eranian Date: Mon Jan 3 18:20:01 2011 +0200 perf_events: Add perf_event_time() Adds perf_event_time() to try and centralize access to event timing and in particular ctx->time. Prepares for cgroup support. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d22059c.122ae30a.5e0e.ffff8b8b@mx.google.com> Signed-off-by: Ingo Molnar commit 5632ab12e9e1fcd7e94058567e181d8f35e83798 Author: Stephane Eranian Date: Mon Jan 3 18:20:01 2011 +0200 perf_events: Generalize use of event_filter_match() Replace all occurrences of: event->cpu != -1 && event->cpu == smp_processor_id() by a call to: event_filter_match(event) This makes the code more consistent and will make the cgroup patch smaller. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d220593.2308e30a.48c5.ffff8ae9@mx.google.com> Signed-off-by: Ingo Molnar commit 0b3fcf178deefd7b64154c2c0760a2c63df0b74f Author: Stephane Eranian Date: Mon Jan 3 18:20:01 2011 +0200 perf_events: Move code around to prepare for cgroup In particular this patch move perf_event_exit_task() before cgroup_exit() to allow for cgroup support. The cgroup_exit() function detaches the cgroups attached to a task. Other movements include hoisting some definitions and inlines at the top of perf_event.c Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <4d22058b.cdace30a.4657.ffff95b1@mx.google.com> Signed-off-by: Ingo Molnar commit bc91c9f313309915f6ec767f56f78dcd0305b20f Author: Roland Stigge Date: Fri Dec 17 17:19:17 2010 +0100 mkuboot.sh: Fail if mkimage is missing on building an uImage, I get: $ make uImage CHK include/linux/version.h CHK include/generated/utsrelease.h make[1]: `include/generated/mach-types.h' is up to date. CALL scripts/checksyscalls.sh CHK include/generated/compile.h Kernel: arch/arm/boot/Image is ready SHIPPED arch/arm/boot/compressed/lib1funcs.S AS arch/arm/boot/compressed/lib1funcs.o LD arch/arm/boot/compressed/vmlinux OBJCOPY arch/arm/boot/zImage Kernel: arch/arm/boot/zImage is ready UIMAGE arch/arm/boot/uImage "mkimage" command not found - U-Boot images will not be built Image arch/arm/boot/uImage is ready $ I.e. it says: "uImage is ready" even though the uImage file doesn't exist because mkimage is missing. I propose the attached patch. Signed-off-by: Roland Stigge Signed-off-by: Michal Marek commit 07cfe0e7a820ecad078c04e9c2a102521709145d Author: Lucas Stach Date: Thu Jan 6 20:29:53 2011 +0100 drm/nouveau: fix hwmon device binding Bind the hwmon structs to nouveau device kobj. This makes sure the hwmon files are created in the device subdir in line with all other hwmon drivers. Signed-off-by: Lucas Stach Signed-off-by: Ben Skeggs commit 1c2a48cf65580a276552151eb8f78d78c55b828e Merge: 0aa002f cb600d2 Author: Ingo Molnar Date: Fri Jan 7 14:14:15 2011 +0100 Merge branch 'linus' into x86/apic-cleanups Conflicts: arch/x86/include/asm/io_apic.h Merge reason: Resolve the conflict, update to a more recent -rc base Signed-off-by: Ingo Molnar commit d906f0eb2f0e6d1a24c479f69a9c39e7e45c5ae8 Author: David Rientjes Date: Thu Dec 30 10:54:16 2010 -0800 x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation "x86, numa: Fake node-to-cpumask for NUMA emulation" broke the build when CONFIG_DEBUG_PER_CPU_MAPS is set and CONFIG_NUMA_EMU is not. This is because it is possible to map a cpu to multiple nodes when NUMA emulation is used; the patch required a physical node address table to find those nodes that was only available when CONFIG_NUMA_EMU was enabled. This extracts the common debug functionality to its own function for CONFIG_DEBUG_PER_CPU_MAPS and uses it regardless of whether CONFIG_NUMA_EMU is set or not. NUMA emulation will now iterate over the set of possible nodes for each cpu and call the new debug function whereas only the cpu's node will be used without NUMA emulation enabled. Reported-by: Ingo Molnar Signed-off-by: David Rientjes Acked-by: Yinghai Lu LKML-Reference: Signed-off-by: Ingo Molnar commit 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 Author: Al Viro Date: Thu Oct 14 13:34:03 2010 -0400 m68knommu: Need to check __get_user()/__put_user() result Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 8972be4d44fbec0b2e1d7b68874fb61c5bf7b06a Author: Al Viro Date: Tue Oct 12 22:38:04 2010 -0400 m68knommu: signal.c __user annotations Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit a19185c32dbe975ce1ee86f5fa457f69b1d7f53b Author: Al Viro Date: Tue Oct 12 22:26:22 2010 -0400 m68knommu: Equivalent of "m68k: handle new gcc's" ... from back in 2004; again, it's ifdefed out by CONFIG_FPU. Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit e64f1b7520fa12c8e8e08161a2841ec5510774ac Author: Al Viro Date: Tue Oct 12 22:19:54 2010 -0400 m68knommu: f_pcr has been gone since headers' merge sure, it's effectively ifdefed out, but still... Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 089e449a82cd5ba8a858dfea88e754afb9341037 Author: Al Viro Date: Mon Oct 11 23:35:08 2010 -0400 m68knommu: Don't lose state if sigframe setup fails exact parallel to m68k analog Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit d1574df7e01d427c2ed80ada11433a72907ca472 Author: Al Viro Date: Mon Oct 11 23:29:28 2010 -0400 m68knommu: Handle multiple pending signals we shouldn't bugger off to userland when there still are pending signals; among other things it makes e.g. SIGSEGV triggered by failure to build a sigframe to be delivered _now_ and not when we hit the next syscall or interrupt. Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 710e91e455caf5cfec02892d667b41f312ec166c Author: Al Viro Date: Mon Oct 11 17:09:20 2010 -0400 m68knommu: Switch to saner sigsuspend Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit bf814b45d560b22e8657ca44d0ae6941ab9d8d36 Author: Al Viro Date: Mon Oct 11 16:56:23 2010 -0400 m68knommu: Don't bother with SA_ONESHOT Signed-off-by: Al Viro Acked-by: Greg Ungerer Signed-off-by: Geert Uytterhoeven commit 8c18194f6c0a638565f2074d1dcabfbe590f396d Author: Al Viro Date: Thu Oct 14 13:35:05 2010 -0400 m68k: Check __get_user()/__put_user() return value Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit bd6f56a75bb2a65b3a1b8d14a9787fdaadae71c1 Author: Al Viro Date: Mon Oct 11 23:13:51 2010 -0400 m68k: Missing syscall_trace() on sigreturn If we leave sigreturn via ret_from_signal, we end up with syscall trace only on entry, leading to very unhappy strace, among other things. Note that this means different behaviours for signals delivered while we were in pagefault and for ones delivered while we were in interrupt... Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit ea52b58ccbda49aeb23eb424ce05bba3cb0bc976 Author: Al Viro Date: Wed Oct 6 14:09:43 2010 -0400 m68k: Fix stack mangling logics in sigreturn a) we should hold modifying regs->format until we know we *will* be doing stack expansion; otherwise attacker can modify sigframe to have wrong ->sc_formatvec and install SIGSEGV handler. b) we should *not* mix copying saved extra stuff from userland with expanding the stack; once we'd done that manual memmove, we'd better not return to C, so cleanup is very hard to do. The easiest way is to copy it on stack first, making sure we won't overwrite on stack expansion. Fortunately that's easy to do... Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit 90731d7537317ad5d9672187f7a1dff90b29bb12 Author: Al Viro Date: Sun Oct 3 01:36:58 2010 -0400 m68k: If we fail to set sigframe up, just leave regs alone... Same principle as with the previous patch - do not destroy the state if sigframe setup fails. Incidentally, it's actually _less_ work - we don't need to go through adjust_stack dance on failure if we don't touch regs->stkadj until we know we'd written sigframe out. Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit f85741eb5fb2653fd9138b4bef68396615c720f7 Author: Al Viro Date: Sun Oct 3 01:15:49 2010 -0400 m68k: Don't lose state if sigframe setup fails If we'd failed in setup_frame(), we've no place to store the original sigmask. It's not an unrecoverable situation - we raise SIGSEGV, but that SIGSEGV might be successfully handled (e.g. on altstack). In that case we really don't want sa_mask of original signal permanently slapped on the set of blocked signals. Standard solution: have setup_frame()/setup_rt_frame() report failure and don't mess with the signal-related state if that has happened... Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit 9e4930dbf17c1eba72631cd52a0c621da3d1a816 Author: Al Viro Date: Sat Oct 2 22:57:30 2010 -0400 m68k: Simplify the singlestepping handling in signals Instead of checking the return value of do_signal() we can just do the work (raise SIGTRAP and clear SR.T1) directly in handle_signal(), when setting the sigframe up. Simplifies the assembler glue and is closer to the way we do it on other targets. Note that do_delayed_trace does *not* disappear; it's still needed to deal with single-stepping through syscall, since 68040 doesn't raise the trace exception at all if the trap exception is pending. We hit it after returning from sys_...() if TIF_DELAYED_TRACE is set; all that has changed is that we don't reuse it for "single-step into the handler" codepath. As the result, do_signal() doesn't need to return anything anymore. Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit e68847fee706c6fe74c9afc3288c3adfc131b1fa Author: Al Viro Date: Wed Sep 29 23:28:59 2010 -0400 m68k: Switch to saner sigsuspend() and saner do_signal() arguments, while we are at it Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit ca86828ccd3128513f6d4e200b437deac95408db Author: Robert Richter Date: Thu Jan 6 17:51:07 2011 +0100 x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h This patch adds the PCI northbridge device id for AMD CPU families 12h and 14h. Both families have implemented the same PCI northbridge device. There are some future use cases that use this PCI device and we would like to clarify its naming. Signed-off-by: Robert Richter Cc: xen-devel@lists.xensource.com Cc: Keir Fraser Cc: Jan Beulich LKML-Reference: <20110106165107.GL4739@erda.amd.com> Signed-off-by: Ingo Molnar commit 35fc157baf56db846afaeb5c730fa47e351cf0d2 Author: Al Viro Date: Wed Sep 29 23:10:47 2010 -0400 m68k: Resetting sa_handler in local copy of k_sigaction is pointless ... and had been such since the introduction of get_signal_to_deliver() Signed-off-by: Al Viro Signed-off-by: Geert Uytterhoeven commit bfbb23466adcbc77facea3046b44f75530079472 Author: Gerrit Renker Date: Sun Jan 2 18:15:58 2011 +0100 dccp: make upper bound for seq_window consistent on 32/64 bit The 'seq_window' sysctl sets the initial value for the DCCP Sequence Window, which may range from 32..2^46-1 (RFC 4340, 7.5.2). The patch sets the upper bound consistently to 2^32-1 on both 32 and 64 bit systems, which should be sufficient - with a RTT of 1sec and 1-byte packets, a seq_window of 2^32-1 corresponds to a link speed of 34 Gbps. Signed-off-by: Gerrit Renker commit 763dadd47c884853a22f2f19ea27e58431303ff3 Author: Samuel Jero Date: Thu Dec 30 12:15:41 2010 +0100 dccp: fix bug in updating the GSR Currently dccp_check_seqno allows any valid packet to update the Greatest Sequence Number Received, even if that packet's sequence number is less than the current GSR. This patch adds a check to make sure that the new packet's sequence number is greater than GSR. Signed-off-by: Samuel Jero Signed-off-by: Gerrit Renker commit 2cf5be93d1b704f342ad423a49f0e78d73939e66 Author: Samuel Jero Date: Thu Dec 30 12:15:16 2010 +0100 dccp: fix return value for sequence-invalid packets Currently dccp_check_seqno returns 0 (indicating a valid packet) if the acknowledgment number is out of bounds and the sync that RFC 4340 mandates at this point is currently being rate-limited. This function should return -1, indicating an invalid packet. Signed-off-by: Samuel Jero Acked-by: Gerrit Renker commit 6d5db4668796d903dc3bad2852c82073509c37d2 Author: Borislav Petkov Date: Thu Nov 25 15:40:27 2010 +0100 EDAC, MCE: Fix NB error formatting Minor formatting fixup since the information which core was associated with the MCE is not always valid. Signed-off-by: Borislav Petkov commit 50adbbd8a8e572ad2533eace228c841ec84028a3 Author: Randy Dunlap Date: Sat Nov 13 11:44:26 2010 -0500 EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit Building for X86_32 produces shift count warnings, so use BIT_64() to eliminate the warnings. drivers/edac/mce_amd.c:778: warning: left shift count >= width of type drivers/edac/mce_amd.c:778: warning: left shift count >= width of type Signed-off-by: Randy Dunlap Cc: Doug Thompson Cc: bluesmoke-devel@lists.sourceforge.net Signed-off-by: Borislav Petkov commit bad11e031862294265145d87dd4be1ae4af0d57f Author: Borislav Petkov Date: Wed Sep 22 17:44:51 2010 +0200 EDAC, MCE: Enable MCE decoding on F15h Now that everything is inplace, enable MCE decoding on F15h. Make initcall routine a bit more readable. Signed-off-by: Borislav Petkov commit 1b07ca47ff2fbffbe09d8b0a0a25d8747a3cdcae Author: Borislav Petkov Date: Tue Nov 9 19:41:49 2010 +0100 EDAC, MCE: Allow F15h bank 6 MCE injection F15h adds a sixth MCE bank: adjust bank number check in the injection code. Signed-off-by: Borislav Petkov commit fa7ae8cc8c88c0679eab24c5a1b5d3b134a5f542 Author: Borislav Petkov Date: Wed Sep 22 17:42:27 2010 +0200 EDAC, MCE: Shorten error report formatting Shorten up MCi_STATUS flags and add BD's new deferred and poison types. Also, simplify formatting. Signed-off-by: Borislav Petkov commit 6245288232516aadf293f575d1812dafb4696aee Author: Borislav Petkov Date: Wed Sep 22 16:08:37 2010 +0200 EDAC, MCE: Overhaul error fields extraction macros Make macro names shorter thus making code shorter and more clear. Signed-off-by: Borislav Petkov commit b8f85c477bdf1fec98ea7cbe952fdb5f40eb0aa7 Author: Borislav Petkov Date: Wed Sep 22 15:37:58 2010 +0200 EDAC, MCE: Add F15h FP MCE decoder Add decoder for FP MCEs. Signed-off-by: Borislav Petkov commit 8259a7e5724c42c89d927b92cda3e0ab15b9ade9 Author: Borislav Petkov Date: Wed Sep 22 15:28:59 2010 +0200 EDAC, MCE: Add F15 EX MCE decoder Integrate the single FIROB signature into an expanded table along with the new BD MCE types. Signed-off-by: Borislav Petkov commit 05cd667d668eb08845dd49c02130e5223121b715 Author: Borislav Petkov Date: Wed Sep 22 15:06:24 2010 +0200 EDAC, MCE: Add an F15h NB MCE decoder by (almost) reusing the F10h one since the signatures are the same. Signed-off-by: Borislav Petkov commit b18434cad1740466f7a1c304ea4af0f4d3c874f1 Author: Borislav Petkov Date: Wed Sep 22 11:53:32 2010 +0200 EDAC, MCE: No F15h LS MCE decoder F15h BD doesn't generate LS MCEs so warn about it. Signed-off-by: Borislav Petkov commit 70fdb494aa8c82f76745d5a32b8abc505813557c Author: Borislav Petkov Date: Tue Sep 21 20:45:10 2010 +0200 EDAC, MCE: Add F15h CU MCE decoder MCE bank 2 is redefined from a BU to a CU (Combined Unit) bank on F15h. Add a decoder function for CU MCEs. Signed-off-by: Borislav Petkov commit 86039cd401e1780573733870f9c0bd458fc96ea2 Author: Borislav Petkov Date: Mon Nov 8 15:03:35 2010 +0100 EDAC, MCE: Add F15h IC MCE decoder Add support for decoding F15h IC MCEs. Signed-off-by: Borislav Petkov commit 25a4f8b05917f8137bfff8a3f8c6c8c1ac561208 Author: Borislav Petkov Date: Fri Sep 17 19:22:34 2010 +0200 EDAC, MCE: Add F15h DC MCE decoder Add a decoder for F15h DC MCEs to support the new types of DC MCEs introduced by the BD microarchitecture. Signed-off-by: Borislav Petkov commit 2be64bfac71378e1aa8c20031a499bd55e391244 Author: Borislav Petkov Date: Fri Sep 17 19:11:47 2010 +0200 EDAC, MCE: Select extended error code mask F15h enlarges the extended error code of an MCE to a 5-bit field (MCi_STATUS[20:16]). Add a mask variable which default 0xf is overridden on F15h. Signed-off-by: Borislav Petkov commit a135cef79a2927ecff800492a26cd314e9cba996 Author: Borislav Petkov Date: Fri Nov 26 19:24:44 2010 +0100 amd64_edac: Disable DRAM ECC injection on K8 K8 does not allow for an atomic RMW to a cacheline as F10h does so disable the error injection interface for it. Signed-off-by: Borislav Petkov commit 390944439f746824faec51b576f50cb5ef18745b Author: Borislav Petkov Date: Wed Nov 24 19:52:09 2010 +0100 EDAC: Fixup scrubrate manipulation Make the ->{get|set}_sdram_scrub_rate return the actual scrub rate bandwidth it succeeded setting and remove superfluous arg pointer used for that. A negative value returned still means that an error occurred while setting the scrubrate. Document this for future reference. Signed-off-by: Borislav Petkov commit 360b7f3c602ed80ce8c6b2585dcb76883a440c17 Author: Borislav Petkov Date: Fri Oct 15 19:25:38 2010 +0200 amd64_edac: Remove two-stage initialization Now that all prerequisites are in place, drop the two-stage driver instances initialization in favor of the following simple init sequence: 1. Probe PCI device: we only test ECC capabilities here and if none exit early. 2. If the hw supports ECC and it is/can be enabled, we init the per-node instance. Remove "amd64_" prefix from static functions touched, while at it. There actually should be no visible functional change resulting from this patch. Signed-off-by: Borislav Petkov commit 2299ef7114000f8e403797b7f9a972f54bc05fad Author: Borislav Petkov Date: Fri Oct 15 17:44:04 2010 +0200 amd64_edac: Check ECC capabilities initially Rework the code to check the hardware ECC capabilities at PCI probing time. We do all further initialization only if we actually can/have ECC enabled. While at it: 0. Fix function naming. 1. Simplify/clarify debug output. 2. Remove amd64_ prefix from the static functions 3. Reorganize code. Signed-off-by: Borislav Petkov commit ae7bb7c679e7ddba6c52d1a78a30f9bc868d9738 Author: Borislav Petkov Date: Thu Oct 14 16:01:30 2010 +0200 amd64_edac: Carve out ECC-related hw settings This is in preparation for the init path reorganization where we want only to 1) test whether a particular node supports ECC 2) can it be enabled and only then do the necessary allocation/initialization. For that, we need to decouple the ECC settings of the node from the instance's descriptor. The should be no functional change introduced by this patch. Signed-off-by: Borislav Petkov commit f1db274e1ba7004909de4a9cee62f631c030ba3e Author: Borislav Petkov Date: Thu Oct 14 14:37:13 2010 +0200 amd64_edac: Remove PCI ECS enabling functions PCI ECS is being enabled by default since 2.6.26 on AMD so this code is just superfluous now, remove it. Signed-off-by: Borislav Petkov commit 027dbd6f5d419c25750d6a26c5c46f46f2093a11 Author: Borislav Petkov Date: Wed Oct 13 22:12:15 2010 +0200 amd64_edac: Remove explicit Kconfig PCI dependency AMD_NB pulls in the dependency on PCI. Clarify/fix help text while at it. Signed-off-by: Borislav Petkov commit cc4d8860fc37dd315b16a43202400d822ab63221 Author: Borislav Petkov Date: Wed Oct 13 16:11:59 2010 +0200 amd64_edac: Allocate driver instances dynamically Remove static allocation in favor of dynamically allocating space for as many driver instances as northbridges present on the system. There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov commit 24f9a7fe3f19f3fd310f556364d01a22911724b3 Author: Borislav Petkov Date: Thu Oct 7 18:29:15 2010 +0200 amd64_edac: Rework printk macros Add a macro per printk level, shorten up error messages. Add relevant information to KERN_INFO level. No functional change. Signed-off-by: Borislav Petkov commit 8d5b5d9c7b86e44fda29a367db3ccd2815a52f7c Author: Borislav Petkov Date: Fri Oct 1 20:11:07 2010 +0200 amd64_edac: Rename CPU PCI devices Rename variables representing PCI devices to their BKDG names for faster search and shorter, clearer code. Signed-off-by: Borislav Petkov commit b8cfa02f833a614e80f851747c4ce14989a4cfd0 Author: Borislav Petkov Date: Fri Oct 1 19:35:38 2010 +0200 amd64_edac: Concentrate per-family init even more Move the remaining per-family init code into the proper place and simplify the rest of the initialization. Reorganize error handling in amd64_init_one_instance(). Signed-off-by: Borislav Petkov commit bbd0c1f675d7d64fc02393d4985a069be5037b54 Author: Borislav Petkov Date: Fri Oct 1 19:27:58 2010 +0200 amd64_edac: Cleanup the CPU PCI device reservation Shorten code and clarify comments, return proper -E* values on error. Signed-off-by: Borislav Petkov commit 0092b20d4cf3de243b5c82b410ee02644cec2707 Author: Borislav Petkov Date: Fri Oct 1 19:20:05 2010 +0200 amd64_edac: Simplify CPU family detection Concentrate CPU family detection in the per-family init function. Signed-off-by: Borislav Petkov commit 395ae783b384e5243804b07fba3e3f8379ddf1d6 Author: Borislav Petkov Date: Fri Oct 1 18:38:19 2010 +0200 amd64_edac: Add per-family init function Run a per-family init function which does all the settings based on the family this driver instance is running on. Move the scrubrate calculation in it and simplify code. Signed-off-by: Borislav Petkov commit 9f56da0e3c3269abe0b2745a54f1b082c3c14433 Author: Borislav Petkov Date: Fri Oct 1 19:44:53 2010 +0200 amd64_edac: Use cached extended CPU model ... instead of computing it needlessly again. Signed-off-by: Borislav Petkov commit 3ab0e7dc2e1d5598da609ec9a9bcd3b69b8fa654 Author: Borislav Petkov Date: Fri Oct 1 18:19:06 2010 +0200 amd64_edac: Remove F11h support F11h doesn't support DRAM ECC so whack it away. Signed-off-by: Borislav Petkov commit 23036f1a340beec19cc451ba9719526c4ffb3a57 Author: Mathieu Desnoyers Date: Fri Jan 7 08:53:58 2011 +0100 blktrace: add missing probe argument to block_bio_complete blktrace.c block bio complete callback needs to gain a new argument to reflect the newly added "error" tracepoint argument. This is needed to match the new block_bio_complete TRACE_EVENT as of commit de983a7bfcb7c020901ca6e2314cf55a4207ab5a. Signed-off-by: Mathieu Desnoyers CC: Jeff Moyer CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Li Zefan Signed-off-by: Jens Axboe commit 329a67815b596d23daf0caa588ae0800e925320f Author: Shaohua Li Date: Fri Jan 7 08:48:28 2011 +0100 block cfq: don't use atomic_t for cfq_group cfq_group->ref is used with queue_lock hold, the only exception is cfq_set_request, which looks like a bug to me, so ref doesn't need to be an atomic and atomic operation is slower. Signed-off-by: Shaohua Li Reviewed-by: Jeff Moyer Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 30d7b9448f03f2c82d0fd44738674cc156a8ce0a Author: Shaohua Li Date: Fri Jan 7 08:46:59 2011 +0100 block cfq: don't use atomic_t for cfq_queue cfq_queue->ref is used with queue_lock hold, so ref doesn't need to be an atomic and atomic operation is slower. Signed-off-by: Shaohua Li Reviewed-by: Jeff Moyer Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit b7908c1035af7652cd613991b54dbff9c8b6bd3a Author: Jeff Moyer Date: Thu Jan 6 20:41:42 2011 +0100 block: trace event block fix unassigned field The "error" field in block_bio_complete is not assigned, leaving the memory area uninitialized (keeping garbage data). Pass an additional tracepoint argument to this event to initialize this field. Signed-off-by: Jeff Moyer Signed-off-by: Mathieu Desnoyers CC: Steven Rostedt CC: Frederic Weisbecker CC: Ingo Molnar CC: Thomas Gleixner CC: Li Zefan CC: Alan.Brunelle@hp.com Signed-off-by: Jens Axboe commit 6c23a9681c0fe7fb7dd331b39dda11926f43746e Author: Jens Axboe Date: Fri Jan 7 08:43:37 2011 +0100 block: add internal hd part table references We can't use krefs since it's apparently restricted to very basic reference counting. This reverts commit e4a683c8. Signed-off-by: Jens Axboe commit 93f38e914183c9b7af248fab793153772996987c Author: Mark Brown Date: Thu Jan 6 23:01:03 2011 -0800 Input: cy8ctmg110_ts - Convert to dev_pm_ops There is a general move towards the use of dev_pm_ops rather than bus specific suspend APIs as this simplifies both the bus and PM core implementations. Convert the cy8ctmg110_ts driver over. Compile tested only. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit d72e64ec0b134d26a89c736394ee0b638513bed8 Author: Mark Brown Date: Thu Jan 6 23:01:03 2011 -0800 Input: migor_ts - convert to dev_pm_ops There is a general move towards the use of dev_pm_ops rather than bus specific suspend APIs as this simplifies both the bus and PM core implementations. Convert the migor_ts driver over. Compile tested only. Signed-off-by: Mark Brown Acked-by: Magnus Damm Signed-off-by: Dmitry Torokhov commit 92b672e217ddf87e4181454f8200f0f06139cdbc Author: Mark Brown Date: Thu Jan 6 23:01:03 2011 -0800 Input: mcs5000_ts - convert to dev_pm_ops There is a general move towards the use of dev_pm_ops rather than bus specific suspend APIs as this simplifies both the bus and PM core implementations. Convert the mcs5000_ts driver over. Compile tested only. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 85012fff38302e0262f838431e853f8c09e754d5 Author: Mark Brown Date: Thu Jan 6 23:01:02 2011 -0800 Input: eeti_ts - convert to dev_pm_ops There is a general move towards the use of dev_pm_ops rather than bus specific suspend APIs as this simplifies both the bus and PM core implementations. Convert the eeti_ts driver over. Compile tested only by me, but Sven Neumann reports that the new code works. Signed-off-by: Mark Brown Tested-by: Sven Neumann Signed-off-by: Dmitry Torokhov commit d5dc9ac3f6daf7df45c49e5a861c733a5f794c6b Author: Mark Brown Date: Thu Jan 6 23:01:02 2011 -0800 Input: ad7879 - convert I2C to dev_pm_ops There is a general move towards the use of dev_pm_ops rather than bus specific suspend APIs as this simplifies both the bus and PM core implementations. Convert the ad7879-ts I2C support over. Compile tested only. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit b3e19d924b6eaf2ca7d22cba99a517c5171007b6 Author: Nick Piggin Date: Fri Jan 7 17:50:11 2011 +1100 fs: scale mntget/mntput The problem that this patch aims to fix is vfsmount refcounting scalability. We need to take a reference on the vfsmount for every successful path lookup, which often go to the same mount point. The fundamental difficulty is that a "simple" reference count can never be made scalable, because any time a reference is dropped, we must check whether that was the last reference. To do that requires communication with all other CPUs that may have taken a reference count. We can make refcounts more scalable in a couple of ways, involving keeping distributed counters, and checking for the global-zero condition less frequently. - check the global sum once every interval (this will delay zero detection for some interval, so it's probably a showstopper for vfsmounts). - keep a local count and only taking the global sum when local reaches 0 (this is difficult for vfsmounts, because we can't hold preempt off for the life of a reference, so a counter would need to be per-thread or tied strongly to a particular CPU which requires more locking). - keep a local difference of increments and decrements, which allows us to sum the total difference and hence find the refcount when summing all CPUs. Then, keep a single integer "long" refcount for slow and long lasting references, and only take the global sum of local counters when the long refcount is 0. This last scheme is what I implemented here. Attached mounts and process root and working directory references are "long" references, and everything else is a short reference. This allows scalable vfsmount references during path walking over mounted subtrees and unattached (lazy umounted) mounts with processes still running in them. This results in one fewer atomic op in the fastpath: mntget is now just a per-CPU inc, rather than an atomic inc; and mntput just requires a spinlock and non-atomic decrement in the common case. However code is otherwise bigger and heavier, so single threaded performance is basically a wash. Signed-off-by: Nick Piggin commit c6653a838b1b2738561aff0b8c0f62a9b714bdd9 Author: Nick Piggin Date: Fri Jan 7 17:50:10 2011 +1100 fs: rename vfsmount counter helpers Suggested by Andreas, mnt_ prefix is clearer namespace, follows kernel conventions better, and is easier for tab complete. I introduced these names so I'll admit they were not good choices. Signed-off-by: Nick Piggin commit 9d55c369bb5e695e629bc35cba2ef607755b3bee Author: Nick Piggin Date: Fri Jan 7 17:50:09 2011 +1100 fs: implement faster dentry memcmp The standard memcmp function on a Westmere system shows up hot in profiles in the `git diff` workload (both parallel and single threaded), and it is likely due to the costs associated with trapping into microcode, and little opportunity to improve memory access (dentry name is not likely to take up more than a cacheline). So replace it with an open-coded byte comparison. This increases code size by 8 bytes in the critical __d_lookup_rcu function, but the speedup is huge, averaging 10 runs of each: git diff st user sys elapsed CPU before 1.15 2.57 3.82 97.1 after 1.14 2.35 3.61 96.8 git diff mt user sys elapsed CPU before 1.27 3.85 1.46 349 after 1.26 3.54 1.43 333 Elapsed time for single threaded git diff at 95.0% confidence: -0.21 +/- 0.01 -5.45% +/- 0.24% It's -0.66% +/- 0.06% elapsed time on my Opteron, so rep cmp costs on the fam10h seem to be relatively smaller, but there is still a win. Signed-off-by: Nick Piggin commit e1bb57826381199cc79fbf44e9dfeee58fc7b339 Author: Nick Piggin Date: Fri Jan 7 17:50:08 2011 +1100 fs: prefetch inode data in dcache lookup This makes single threaded git diff -1.25% +/- 0.05% elapsed time on my 2s12c24t Westmere system, and -0.86% +/- 0.05% on my 2s8c Barcelona, by prefetching the important first cacheline of the inode in while we do the actual name compare and other operations on the dentry. There was no measurable slowdown in the single file stat case, or the creat case (where negative dentries would be common). Signed-off-by: Nick Piggin commit 4b936885ab04dc6e0bb0ef35e0e23c1a7364d9e5 Author: Nick Piggin Date: Fri Jan 7 17:50:07 2011 +1100 fs: improve scalability of pseudo filesystems Regardless of how much we possibly try to scale dcache, there is likely always going to be some fundamental contention when adding or removing children under the same parent. Pseudo filesystems do not seem need to have connected dentries because by definition they are disconnected. Signed-off-by: Nick Piggin commit 873feea09ebc980cbd3631b767356ce1eee65ec1 Author: Nick Piggin Date: Fri Jan 7 17:50:06 2011 +1100 fs: dcache per-inode inode alias locking dcache_inode_lock can be replaced with per-inode locking. Use existing inode->i_lock for this. This is slightly non-trivial because we sometimes need to find the inode from the dentry, which requires d_inode to be stabilised (either with refcount or d_lock). Signed-off-by: Nick Piggin commit ceb5bdc2d246f6d81cf61ed70f325308a11821d2 Author: Nick Piggin Date: Fri Jan 7 17:50:05 2011 +1100 fs: dcache per-bucket dcache hash locking We can turn the dcache hash locking from a global dcache_hash_lock into per-bucket locking. Signed-off-by: Nick Piggin commit 626d607435617cc0f033522083e2bb195b81813c Author: Nick Piggin Date: Fri Jan 7 17:50:04 2011 +1100 bit_spinlock: add required includes Signed-off-by: Nick Piggin commit 4e35e6070b1ceed89c3bba2af4216c286fb1dafd Author: Nick Piggin Date: Fri Jan 7 17:50:03 2011 +1100 kernel: add bl_list Introduce a type of hlist that can support the use of the lowest bit in the hlist_head. This will be subsequently used to implement per-bucket bit spinlock for inode and dentry hashes, and may be useful in other cases such as network hashes. Reviewed-by: Paul E. McKenney Signed-off-by: Nick Piggin commit 880566e17c4fce0d998d92610d32fcb9506aa6dd Author: Nick Piggin Date: Fri Jan 7 17:50:02 2011 +1100 xfs: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 258a5aa8dfc6294f5f7df892023ee4d3e57c9841 Author: Nick Piggin Date: Fri Jan 7 17:50:01 2011 +1100 btrfs: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 73598611ade7c85f0c3d52ba5130103f6709c6d3 Author: Nick Piggin Date: Fri Jan 7 17:50:00 2011 +1100 ext2,3,4: provide simple rcu-walk ACL implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. Signed-off-by: Nick Piggin commit 1e1743ebe35ec7e3c1fa732408358fbc614cbbe5 Author: Nick Piggin Date: Fri Jan 7 17:49:59 2011 +1100 fs: provide simple rcu-walk generic_check_acl implementation This simple implementation just checks for no ACLs on the inode, and if so, then the rcu-walk may proceed, otherwise fail it. This could easily be extended to put acls under RCU and check them under seqlock, if need be. But this implementation is enough to show the rcu-walk aware permissions code for path lookups is working, and will handle cases where there are no ACLs or ACLs in just the final element. This patch implicity converts tmpfs to rcu-aware permission check. Subsequent patches onvert ext*, xfs, and, btrfs. Each of these uses acl/permission code in a different way, so convert them all to provide templates and proof of concept. Signed-off-by: Nick Piggin commit b74c79e99389cd79b31fcc08f82c24e492e63c7e Author: Nick Piggin Date: Fri Jan 7 17:49:58 2011 +1100 fs: provide rcu-walk aware permission i_ops Signed-off-by: Nick Piggin commit 34286d6662308d82aed891852d04c7c3a2649b16 Author: Nick Piggin Date: Fri Jan 7 17:49:57 2011 +1100 fs: rcu-walk aware d_revalidate method Require filesystems be aware of .d_revalidate being called in rcu-walk mode (nd->flags & LOOKUP_RCU). For now do a simple push down, returning -ECHILD from all implementations. Signed-off-by: Nick Piggin commit 44a7d7a878c9cbb74f236ea755b25b6b2e26a9a9 Author: Nick Piggin Date: Fri Jan 7 17:49:56 2011 +1100 fs: cache optimise dentry and inode for rcu-walk Put dentry and inode fields into top of data structure. This allows RCU path traversal to perform an RCU dentry lookup in a path walk by touching only the first 56 bytes of the dentry. We also fit in 8 bytes of inline name in the first 64 bytes, so for short names, only 64 bytes needs to be touched to perform the lookup. We should get rid of the hash->prev pointer from the first 64 bytes, and fit 16 bytes of name in there, which will take care of 81% rather than 32% of the kernel tree. inode is also rearranged so that RCU lookup will only touch a single cacheline in the inode, plus one in the i_ops structure. This is important for directory component lookups in RCU path walking. In the kernel source, directory names average is around 6 chars, so this works. When we reach the last element of the lookup, we need to lock it and take its refcount which requires another cacheline access. Align dentry and inode operations structs, so members will be at predictable offsets and we can group common operations into head of structure. Signed-off-by: Nick Piggin commit fb045adb99d9b7c562dc7fef834857f78249daa1 Author: Nick Piggin Date: Fri Jan 7 17:49:55 2011 +1100 fs: dcache reduce branches in lookup path Reduce some branches and memory accesses in dcache lookup by adding dentry flags to indicate common d_ops are set, rather than having to check them. This saves a pointer memory access (dentry->d_op) in common path lookup situations, and saves another pointer load and branch in cases where we have d_op but not the particular operation. Patched with: git grep -E '[.>]([[:space:]])*d_op([[:space:]])*=' | xargs sed -e 's/\([^\t ]*\)->d_op = \(.*\);/d_set_d_op(\1, \2);/' -e 's/\([^\t ]*\)\.d_op = \(.*\);/d_set_d_op(\&\1, \2);/' -i Signed-off-by: Nick Piggin commit 5f57cbcc02cf18f6b22ef4066bb10afeb8f930ff Author: Nick Piggin Date: Fri Jan 7 17:49:54 2011 +1100 fs: dcache remove d_mounted Rather than keep a d_mounted count in the dentry, set a dentry flag instead. The flag can be cleared by checking the hash table to see if there are any mounts left, which is not time critical because it is performed at detach time. The mounted state of a dentry is only used to speculatively take a look in the mount hash table if it is set -- before following the mount, vfsmount lock is taken and mount re-checked without races. This saves 4 bytes on 32-bit, nothing on 64-bit but it does provide a hole I might use later (and some configs have larger than 32-bit spinlocks which might make use of the hole). Autofs4 conversion and changelog by Ian Kent : In autofs4, when expring direct (or offset) mounts we need to ensure that we block user path walks into the autofs mount, which is covered by another mount. To do this we clear the mounted status so that follows stop before walking into the mount and are essentially blocked until the expire is completed. The automount daemon still finds the correct dentry for the umount due to the follow mount logic in fs/autofs4/root.c:autofs4_follow_link(), which is set as an inode operation for direct and offset mounts only and is called following the lookup that stopped at the covered mount. At the end of the expire the covering mount probably has gone away so the mounted status need not be restored. But we need to check this and only restore the mounted status if the expire failed. XXX: autofs may not work right if we have other mounts go over the top of it? Signed-off-by: Nick Piggin commit c28cc36469554dc55540f059fbdc7fa22a2c31fc Author: Nick Piggin Date: Fri Jan 7 17:49:53 2011 +1100 fs: fs_struct use seqlock Use a seqlock in the fs_struct to enable us to take an atomic copy of the complete cwd and root paths. Use this in the RCU lookup path to avoid a thread-shared spinlock in RCU lookup operations. Multi-threaded apps may now perform path lookups with scalability matching multi-process apps. Operations such as stat(2) become very scalable for multi-threaded workload. Signed-off-by: Nick Piggin commit 31e6b01f4183ff419a6d1f86177cbf4662347cec Author: Nick Piggin Date: Fri Jan 7 17:49:52 2011 +1100 fs: rcu-walk for path lookup Perform common cases of path lookups without any stores or locking in the ancestor dentry elements. This is called rcu-walk, as opposed to the current algorithm which is a refcount based walk, or ref-walk. This results in far fewer atomic operations on every path element, significantly improving path lookup performance. It also avoids cacheline bouncing on common dentries, significantly improving scalability. The overall design is like this: * LOOKUP_RCU is set in nd->flags, which distinguishes rcu-walk from ref-walk. * Take the RCU lock for the entire path walk, starting with the acquiring of the starting path (eg. root/cwd/fd-path). So now dentry refcounts are not required for dentry persistence. * synchronize_rcu is called when unregistering a filesystem, so we can access d_ops and i_ops during rcu-walk. * Similarly take the vfsmount lock for the entire path walk. So now mnt refcounts are not required for persistence. Also we are free to perform mount lookups, and to assume dentry mount points and mount roots are stable up and down the path. * Have a per-dentry seqlock to protect the dentry name, parent, and inode, so we can load this tuple atomically, and also check whether any of its members have changed. * Dentry lookups (based on parent, candidate string tuple) recheck the parent sequence after the child is found in case anything changed in the parent during the path walk. * inode is also RCU protected so we can load d_inode and use the inode for limited things. * i_mode, i_uid, i_gid can be tested for exec permissions during path walk. * i_op can be loaded. When we reach the destination dentry, we lock it, recheck lookup sequence, and increment its refcount and mountpoint refcount. RCU and vfsmount locks are dropped. This is termed "dropping rcu-walk". If the dentry refcount does not match, we can not drop rcu-walk gracefully at the current point in the lokup, so instead return -ECHILD (for want of a better errno). This signals the path walking code to re-do the entire lookup with a ref-walk. Aside from the final dentry, there are other situations that may be encounted where we cannot continue rcu-walk. In that case, we drop rcu-walk (ie. take a reference on the last good dentry) and continue with a ref-walk. Again, if we can drop rcu-walk gracefully, we return -ECHILD and do the whole lookup using ref-walk. But it is very important that we can continue with ref-walk for most cases, particularly to avoid the overhead of double lookups, and to gain the scalability advantages on common path elements (like cwd and root). The cases where rcu-walk cannot continue are: * NULL dentry (ie. any uncached path element) * parent with d_inode->i_op->permission or ACLs * dentries with d_revalidate * Following links In future patches, permission checks and d_revalidate become rcu-walk aware. It may be possible eventually to make following links rcu-walk aware. Uncached path elements will always require dropping to ref-walk mode, at the very least because i_mutex needs to be grabbed, and objects allocated. Signed-off-by: Nick Piggin commit 3c22cd5709e8143444a6d08682a87f4c57902df3 Author: Nick Piggin Date: Fri Jan 7 17:49:51 2011 +1100 kernel: optimise seqlock Add branch annotations for seqlock read fastpath, and introduce __read_seqcount_begin and __read_seqcount_end functions, that can avoid the smp_rmb() if used carefully. These will be used by store-free path walking algorithm performance is critical and seqlocks are in use. Signed-off-by: Nick Piggin commit ff0c7d15f9787b7e8c601533c015295cc68329f8 Author: Nick Piggin Date: Fri Jan 7 17:49:50 2011 +1100 fs: avoid inode RCU freeing for pseudo fs Pseudo filesystems that don't put inode on RCU list or reachable by rcu-walk dentries do not need to RCU free their inodes. Signed-off-by: Nick Piggin commit fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9 Author: Nick Piggin Date: Fri Jan 7 17:49:49 2011 +1100 fs: icache RCU free inodes RCU free the struct inode. This will allow: - Subsequent store-free path walking patch. The inode must be consulted for permissions when walking, so an RCU inode reference is a must. - sb_inode_list_lock to be moved inside i_lock because sb list walkers who want to take i_lock no longer need to take sb_inode_list_lock to walk the list in the first place. This will simplify and optimize locking. - Could remove some nested trylock loops in dcache code - Could potentially simplify things a bit in VM land. Do not need to take the page lock to follow page->mapping. The downsides of this is the performance cost of using RCU. In a simple creat/unlink microbenchmark, performance drops by about 10% due to inability to reuse cache-hot slab objects. As iterations increase and RCU freeing starts kicking over, this increases to about 20%. In cases where inode lifetimes are longer (ie. many inodes may be allocated during the average life span of a single inode), a lot of this cache reuse is not applicable, so the regression caused by this patch is smaller. The cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU, however this adds some complexity to list walking and store-free path walking, so I prefer to implement this at a later date, if it is shown to be a win in real situations. I haven't found a regression in any non-micro benchmark so I doubt it will be a problem. Signed-off-by: Nick Piggin commit 77812a1ef139d84270d27faacc0630c887411013 Author: Nick Piggin Date: Fri Jan 7 17:49:48 2011 +1100 fs: consolidate dentry kill sequence The tricky locking for disposing of a dentry is duplicated 3 times in the dcache (dput, pruning a dentry from the LRU, and pruning its ancestors). Consolidate them all into a single function dentry_kill. Signed-off-by: Nick Piggin commit ec33679d78f9d653a44ddba10b5fb824c06330a1 Author: Nick Piggin Date: Fri Jan 7 17:49:47 2011 +1100 fs: use RCU in shrink_dentry_list to reduce lock nesting Signed-off-by: Nick Piggin commit be182bff72fae6a3eb25624b39170c40b72f0909 Author: Nick Piggin Date: Fri Jan 7 17:49:46 2011 +1100 fs: reduce dcache_inode_lock width in lru scanning Signed-off-by: Nick Piggin commit 89e6054836a7b1e7500cd70a14b5579e752c9250 Author: Nick Piggin Date: Fri Jan 7 17:49:45 2011 +1100 fs: dcache reduce prune_one_dentry locking prune_one_dentry can avoid quite a bit of locking in the common case where ancestors have an elevated refcount. Alternatively, we could have gone the other way and made fewer trylocks in the case where d_count goes to zero, but is probably less common. Signed-off-by: Nick Piggin commit a734eb458ab2bd11479a27dd54f48e1b26a55845 Author: Nick Piggin Date: Fri Jan 7 17:49:44 2011 +1100 fs: dcache reduce d_parent locking Use RCU to simplify locking in dget_parent. Signed-off-by: Nick Piggin commit dc0474be3e27463d4d4a2793f82366eed906f223 Author: Nick Piggin Date: Fri Jan 7 17:49:43 2011 +1100 fs: dcache rationalise dget variants dget_locked was a shortcut to avoid the lazy lru manipulation when we already held dcache_lock (lru manipulation was relatively cheap at that point). However, how that the lru lock is an innermost one, we never hold it at any caller, so the lock cost can now be avoided. We already have well working lazy dcache LRU, so it should be fine to defer LRU manipulations to scan time. Signed-off-by: Nick Piggin commit 357f8e658bba8a085c4a5d4331e30894be8096b8 Author: Nick Piggin Date: Fri Jan 7 17:49:42 2011 +1100 fs: dcache reduce dcache_inode_lock dcache_inode_lock can be avoided in d_delete() and d_materialise_unique() in cases where it is not required. Signed-off-by: Nick Piggin commit 89ad485f01fd83c47f17a128db3bd7b89c0f244f Author: Nick Piggin Date: Fri Jan 7 17:49:41 2011 +1100 fs: dcache reduce locking in d_alloc Signed-off-by: Nick Piggin commit 61f3dee4af09528997a970280da240577bf60721 Author: Nick Piggin Date: Fri Jan 7 17:49:40 2011 +1100 fs: dcache reduce dput locking It is possible to run dput without taking data structure locks up-front. In many cases where we don't kill the dentry anyway, these locks are not required. Signed-off-by: Nick Piggin commit 58db63d086790eec2ed433f9d8c4962239809cf8 Author: Nick Piggin Date: Fri Jan 7 17:49:39 2011 +1100 fs: dcache avoid starvation in dcache multi-step operations Long lived dcache "multi-step" operations which retry on rename seq can be starved with a lot of rename activity. If they fail after the 1st pass, take the rename_lock for writing to avoid further starvation. Signed-off-by: Nick Piggin commit b5c84bf6f6fa3a7dfdcb556023a62953574b60ee Author: Nick Piggin Date: Fri Jan 7 17:49:38 2011 +1100 fs: dcache remove dcache_lock dcache_lock no longer protects anything. remove it. Signed-off-by: Nick Piggin commit 949854d02455080d20cd3e1db28a3a18daf7599d Author: Nick Piggin Date: Fri Jan 7 17:49:37 2011 +1100 fs: Use rename lock and RCU for multi-step operations The remaining usages for dcache_lock is to allow atomic, multi-step read-side operations over the directory tree by excluding modifications to the tree. Also, to walk in the leaf->root direction in the tree where we don't have a natural d_lock ordering. This could be accomplished by taking every d_lock, but this would mean a huge number of locks and actually gets very tricky. Solve this instead by using the rename seqlock for multi-step read-side operations, retry in case of a rename so we don't walk up the wrong parent. Concurrent dentry insertions are not serialised against. Concurrent deletes are tricky when walking up the directory: our parent might have been deleted when dropping locks so also need to check and retry for that. We can also use the rename lock in cases where livelock is a worry (and it is introduced in subsequent patch). Signed-off-by: Nick Piggin commit 9abca36087288fe28de4749c71ca003d4b9e3ed0 Author: Nick Piggin Date: Fri Jan 7 17:49:36 2011 +1100 fs: increase d_name lock coverage Cover d_name with d_lock in more cases, where there may be concurrent modification to it. Signed-off-by: Nick Piggin commit b23fb0a60379a95e10c671f646b259ea2558421e Author: Nick Piggin Date: Fri Jan 7 17:49:35 2011 +1100 fs: scale inode alias list Add a new lock, dcache_inode_lock, to protect the inode's i_dentry list from concurrent modification. d_alias is also protected by d_lock. Signed-off-by: Nick Piggin commit 2fd6b7f50797f2e993eea59e0a0b8c6399c811dc Author: Nick Piggin Date: Fri Jan 7 17:49:34 2011 +1100 fs: dcache scale subdirs Protect d_subdirs and d_child with d_lock, except in filesystems that aren't using dcache_lock for these anyway (eg. using i_mutex). Note: if we change the locking rule in future so that ->d_child protection is provided only with ->d_parent->d_lock, it may allow us to reduce some locking. But it would be an exception to an otherwise regular locking scheme, so we'd have to see some good results. Probably not worthwhile. Signed-off-by: Nick Piggin commit da5029563a0a026c64821b09e8e7b4fd81d3fe1b Author: Nick Piggin Date: Fri Jan 7 17:49:33 2011 +1100 fs: dcache scale d_unhashed Protect d_unhashed(dentry) condition with d_lock. This means keeping DCACHE_UNHASHED bit in synch with hash manipulations. Signed-off-by: Nick Piggin commit b7ab39f631f505edc2bbdb86620d5493f995c9da Author: Nick Piggin Date: Fri Jan 7 17:49:32 2011 +1100 fs: dcache scale dentry refcount Make d_count non-atomic and protect it with d_lock. This allows us to ensure a 0 refcount dentry remains 0 without dcache_lock. It is also fairly natural when we start protecting many other dentry members with d_lock. Signed-off-by: Nick Piggin commit 2304450783dfde7b0b94ae234edd0dbffa865073 Author: Nick Piggin Date: Fri Jan 7 17:49:31 2011 +1100 fs: dcache scale lru Add a new lock, dcache_lru_lock, to protect the dcache LRU list from concurrent modification. d_lru is also protected by d_lock, which allows LRU lists to be accessed without the lru lock, using RCU in future patches. Signed-off-by: Nick Piggin commit 789680d1ee9311cdf095241dc02bd9784d799cd1 Author: Nick Piggin Date: Fri Jan 7 17:49:30 2011 +1100 fs: dcache scale hash Add a new lock, dcache_hash_lock, to protect the dcache hash table from concurrent modification. d_hash is also protected by d_lock. Signed-off-by: Nick Piggin commit ec2447c278ee973d35f38e53ca16ba7f965ae33d Author: Nick Piggin Date: Fri Jan 7 17:49:29 2011 +1100 hostfs: simplify locking Remove dcache_lock locking from hostfs filesystem, and move it into dcache helpers. All that is required is a coherent path name. Protection from concurrent modification of the namespace after path name generation is not provided in current code, because dcache_lock is dropped before the path is used. Signed-off-by: Nick Piggin commit b1e6a015a580ad145689ad1d6b4aa0e03e6c868b Author: Nick Piggin Date: Fri Jan 7 17:49:28 2011 +1100 fs: change d_hash for rcu-walk Change d_hash so it may be called from lock-free RCU lookups. See similar patch for d_compare for details. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin commit 621e155a3591962420eacdd39f6f0aa29ceb221e Author: Nick Piggin Date: Fri Jan 7 17:49:27 2011 +1100 fs: change d_compare for rcu-walk Change d_compare so it may be called from lock-free RCU lookups. This does put significant restrictions on what may be done from the callback, however there don't seem to have been any problems with in-tree fses. If some strange use case pops up that _really_ cannot cope with the rcu-walk rules, we can just add new rcu-unaware callbacks, which would cause name lookup to drop out of rcu-walk mode. For in-tree filesystems, this is just a mechanical change. Signed-off-by: Nick Piggin commit fb2d5b86aff355a27ebfc132d3c99f4a940cc3fe Author: Nick Piggin Date: Fri Jan 7 17:49:26 2011 +1100 fs: name case update method smpfs and ncpfs want to update a live dentry name in-place. Rather than have them open code the locking, provide a documented dcache API. Signed-off-by: Nick Piggin commit 2bc334dcc7c77be3700dd443d92a78603f76976b Author: Nick Piggin Date: Fri Jan 7 17:49:25 2011 +1100 jfs: dont overwrite dentry name in d_revalidate Use vfat's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin commit 79eb4dde742fe2e9c9e301432b894a7410261ce7 Author: Nick Piggin Date: Fri Jan 7 17:49:24 2011 +1100 cifs: dont overwrite dentry name in d_revalidate Use vfat's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin commit fe15ce446beb3a33583af81ffe6c9d01a75314ed Author: Nick Piggin Date: Fri Jan 7 17:49:23 2011 +1100 fs: change d_delete semantics Change d_delete from a dentry deletion notification to a dentry caching advise, more like ->drop_inode. Require it to be constant and idempotent, and not take d_lock. This is how all existing filesystems use the callback anyway. This makes fine grained dentry locking of dput and dentry lru scanning much simpler. Signed-off-by: Nick Piggin commit 5eef7fa905c814826f518aca2d414ca77508ce30 Author: Nick Piggin Date: Fri Jan 7 17:49:22 2011 +1100 fs: dcache documentation cleanup Remove redundant (and incorrect, since dcache RCU lookup) dentry locking documentation and point to the canonical document. Signed-off-by: Nick Piggin commit fbc8d4c04626e015b18cc61199f505920abb48f0 Author: Nick Piggin Date: Fri Jan 7 17:49:21 2011 +1100 config fs: avoid switching ->d_op on live dentry Switching d_op on a live dentry is racy in general, so avoid it. In this case it is a negative dentry, which is safer, but there are still concurrent ops which may be called on d_op in that case (eg. d_revalidate). So in general a filesystem may not do this. Fix configfs so as not to do this. Signed-off-by: Nick Piggin commit 5adcee1d8d32d7f305f6f5aaefdbf8f35adca177 Author: Nick Piggin Date: Fri Jan 7 17:49:20 2011 +1100 cgroup fs: avoid switching ->d_op on live dentry Switching d_op on a live dentry is racy in general, so avoid it. In this case it is a negative dentry, which is safer, but there are still concurrent ops which may be called on d_op in that case (eg. d_revalidate). So in general a filesystem may not do this. Fix cgroupfs so as not to do this. Signed-off-by: Nick Piggin commit 3e880fb5e4bb6a012035e3edd0586ee2817c2e24 Author: Nick Piggin Date: Fri Jan 7 17:49:19 2011 +1100 fs: use fast counters for vfs caches percpu_counter library generates quite nasty code, so unless you need to dynamically allocate counters or take fast approximate value, a simple per cpu set of counters is much better. The percpu_counter can never be made to work as well, because it has an indirection from pointer to percpu memory, and it can't use direct this_cpu_inc interfaces because it doesn't use static PER_CPU data, so code will always be worse. In the fastpath, it is the difference between this: incl %gs:nr_dentry # nr_dentry and this: movl percpu_counter_batch(%rip), %edx # percpu_counter_batch, movl $1, %esi #, movq $nr_dentry, %rdi #, call __percpu_counter_add # (plus I clobber registers) __percpu_counter_add: pushq %rbp # movq %rsp, %rbp #, subq $32, %rsp #, movq %rbx, -24(%rbp) #, movq %r12, -16(%rbp) #, movq %r13, -8(%rbp) #, movq %rdi, %rbx # fbc, fbc #APP # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1 movq %gs:kernel_stack,%rax #, pfo_ret__ # 0 "" 2 #NO_APP incl -8124(%rax) # .preempt_count movq 32(%rdi), %r12 # .counters, tcp_ptr__ #APP # 78 "lib/percpu_counter.c" 1 add %gs:this_cpu_off, %r12 # this_cpu_off, tcp_ptr__ # 0 "" 2 #NO_APP movslq (%r12),%r13 #* tcp_ptr__, tmp73 movslq %edx,%rax # batch, batch addq %rsi, %r13 # amount, count cmpq %rax, %r13 # batch, count jge .L27 #, negl %edx # tmp76 movslq %edx,%rdx # tmp76, tmp77 cmpq %rdx, %r13 # tmp77, count jg .L28 #, .L27: movq %rbx, %rdi # fbc, call _raw_spin_lock # addq %r13, 8(%rbx) # count, .count movq %rbx, %rdi # fbc, movl $0, (%r12) #,* tcp_ptr__ call _raw_spin_unlock # .L29: #APP # 216 "/home/npiggin/usr/src/linux-2.6/arch/x86/include/asm/thread_info.h" 1 movq %gs:kernel_stack,%rax #, pfo_ret__ # 0 "" 2 #NO_APP decl -8124(%rax) # .preempt_count movq -8136(%rax), %rax #, D.14625 testb $8, %al #, D.14625 jne .L32 #, .L31: movq -24(%rbp), %rbx #, movq -16(%rbp), %r12 #, movq -8(%rbp), %r13 #, leave ret .p2align 4,,10 .p2align 3 .L28: movl %r13d, (%r12) # count,* jmp .L29 # .L32: call preempt_schedule # .p2align 4,,6 jmp .L31 # .size __percpu_counter_add, .-__percpu_counter_add .p2align 4,,15 Signed-off-by: Nick Piggin commit 86c8749ede0c59e590de9267066932a26f1ce796 Author: Nick Piggin Date: Fri Jan 7 17:49:18 2011 +1100 vfs: revert per-cpu nr_unused counters for dentry and inodes The nr_unused counters count the number of objects on an LRU, and as such they are synchronized with LRU object insertion and removal and scanning, and protected under the LRU lock. Making it per-cpu does not actually get any concurrency improvements because of this lock, and summing the counter is much slower, and incrementing/decrementing it costs more code size and is slower too. These counters should stay per-LRU, which currently means global. Signed-off-by: Nick Piggin commit ccd35fb9f4da856b105ea0f1e0cab3702e8ae6ba Author: Nick Piggin Date: Fri Jan 7 17:49:17 2011 +1100 kernel: kmem_ptr_validate considered harmful This is a nasty and error prone API. It is no longer used, remove it. Signed-off-by: Nick Piggin commit 786a5e15b613a9cee4fc9139fc3113a5ab0fde79 Author: Nick Piggin Date: Fri Jan 7 17:49:16 2011 +1100 fs: d_validate fixes d_validate has been broken for a long time. kmem_ptr_validate does not guarantee that a pointer can be dereferenced if it can go away at any time. Even rcu_read_lock doesn't help, because the pointer might be queued in RCU callbacks but not executed yet. So the parent cannot be checked, nor the name hashed. The dentry pointer can not be touched until it can be verified under lock. Hashing simply cannot be used. Instead, verify the parent/child relationship by traversing parent's d_child list. It's slow, but only ncpfs and the destaged smbfs care about it, at this point. Signed-off-by: Nick Piggin commit 554738da71004d96e06fb75f4772dfc3b0f47810 Merge: 7b4b306 a6d38f8 Author: Dmitry Torokhov Date: Thu Jan 6 22:34:59 2011 -0800 Merge branch 'next' into for-linus Conflicts: include/linux/input.h commit 7b330707dddab1ad772898c1c82516342a551173 Author: Rafael J. Wysocki Date: Thu Jan 6 23:37:01 2011 +0100 ACPI / PM: Blacklist Averatec machine known to require acpi_sleep=nonvs Apparently, Averatec AV1020-ED2 does not resume correctly without acpi_sleep=nonvs, so add it to the ACPI sleep blacklist. References: https://bugzilla.kernel.org/show_bug.cgi?id=16396#c86 Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 1f83511bd8f44b8a9e2d82263b2c95f26a625fcc Author: Rafael J. Wysocki Date: Thu Jan 6 23:36:01 2011 +0100 ACPI / PM: Report wakeup events from buttons Since ACPI buttons and lids can be configured to wake up the system from sleep states, report wakeup events from these devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 7fa69baf29de8c77a6b32c054df2abb8f11f8aa4 Author: Rafael J. Wysocki Date: Thu Jan 6 23:35:10 2011 +0100 ACPI / PM: Drop special ACPI wakeup flags Drop special ACPI wakeup flags, wakeup.state.enabled and wakeup.flags.always_enabled, that aren't necessary any more after we've started to use standard device wakeup flags for handling ACPI wakeup devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit f2b56bc808addb908a5bf435d9b942c02af9a7c4 Author: Rafael J. Wysocki Date: Thu Jan 6 23:34:22 2011 +0100 ACPI / PM: Use device wakeup flags for handling ACPI wakeup devices There are ACPI devices (buttons and the laptop lid) that can wake up the system from sleep states and have no "physical" companion devices. The ACPI subsystem uses two flags, wakeup.state.enabled and wakeup.flags.always_enabled, for handling those devices, but they are not accessible through the standard device wakeup infrastructure. User space can only control them via the /proc/acpi/wakeup interface that is not really convenient (e.g. the way in which devices are enabled to wake up the system is not portable between different systems, because it requires one to know the devices' "names" used in the system's ACPI tables). To address this problem, use standard device wakeup flags instead of the special ACPI flags for handling those devices. In particular, use device_set_wakeup_capable() to mark the ACPI wakeup devices during initialization and use device_set_wakeup_enable() to allow or disallow them to wake up the system from sleep states. Rework the /proc/acpi/wakeup interface to take these changes into account. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit b014f4f1aad3f25d5c7d877a394869645ea0c96b Author: Rafael J. Wysocki Date: Thu Jan 6 23:33:30 2011 +0100 ACPI / PM: Do not enable multiple devices to wake up simultaneously If a device is enabled to wake up the system from sleep states via /proc/acpi/wakeup and there are other devices associated with the same wakeup GPE, all of these devices are automatically enabled to wake up the system. This isn't correct, because the fact the GPE is shared need not imply that wakeup power has to be enabled for all the devices at the same time (i.e. it is possible that one device will have its wakeup power enabled and it will wake up the system from a sleep state if the shared wakeup GPE is enabled, while another device having its wakeup power disabled will not wake up the system even though the GPE is enabled). Rework acpi_system_write_wakeup_device() so that it only enables wakeup for one device at a time. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 9cd031441a4fd09273b7c2beb337d0b2683d104c Author: Rafael J. Wysocki Date: Thu Jan 6 23:32:23 2011 +0100 ACPI / ACPICA: Fix global lock acquisition There are two problems with the ACPICA's current implementation of the global lock acquisition. First, acpi_ev_global_lock_handler(), which in fact is an interface to the outside of the kernel, doesn't validate its input, so it only works correctly if the other side (i.e. the ACPI firmware) is fully specification-compliant (as far as the global lock is concerned). Unfortunately, that's known not to be the case on some systems (i.e. we get spurious global lock signaling interrupts without the pending flag set on some systems). Second, acpi_ev_global_lock_handler() attempts to acquire the global lock on behalf of a thread waiting for it without checking if there actually is such a thread. Both of these shortcomings need to be addressed to prevent all possible race conditions from happening. Rework acpi_ev_global_lock_handler() so that it doesn't try to acquire the global lock and make it signal the availability of the global lock to the waiting thread instead. Make sure that the availability of the global lock can only be signaled when there is a thread waiting for it and that it can't be signaled more than once in a row (to keep acpi_gbl_global_lock_semaphore in balance). Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 6d5bbf00d251cc73223a71422d69e069dc2e0b8d Author: Len Brown Date: Fri Jan 7 01:46:40 2011 +0100 ACPI: Use ioremap_cache() Although the temporary boot-time ACPI table mappings were set up with CPU caching enabled, the permanent table mappings and AML run-time region memory accesses were set up with ioremap(), which on x86 is a synonym for ioremap_nocache(). Changing this to ioremap_cache() improves performance as seen when accessing the tables via acpidump, or /sys/firmware/acpi/tables. It should also improve AML run-time performance. No change on ia64. Reported-by: Jack Steiner Signed-off-by: Len Brown Signed-off-by: Rafael J. Wysocki commit ca9b600be38c73b7d25acfb8b7e4e9a9e941d881 Author: Rafael J. Wysocki Date: Fri Jan 7 01:45:58 2011 +0100 ACPI / PM: Make suspend_nvs_save() use acpi_os_map_memory() It turns out that the NVS memory region that suspend_nvs_save() attempts to map has been already mapped by acpi_os_map_memory(), so suspend_nvs_save() should better use acpi_os_map_memory() for mapping memory to avoid conflicts. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit d146df18c13d16e321efa8ef9b57c95c3bec1722 Author: Rafael J. Wysocki Date: Fri Jan 7 01:44:28 2011 +0100 ACPI / PM: Update file information and the list of includes in nvs.c The file information and the list of include in drivers/acpi/nvs.c are outdated, so update them. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 976513dbfc1547c7b1822566923058655f0c32fd Author: Rafael J. Wysocki Date: Fri Jan 7 01:43:44 2011 +0100 PM / ACPI: Move NVS saving and restoring code to drivers/acpi The saving of the ACPI NVS area during hibernation and suspend and restoring it during the subsequent resume is entirely specific to ACPI, so move it to drivers/acpi and drop the CONFIG_SUSPEND_NVS configuration option which is redundant. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 187f3da3d98a1740d71e1f5d4fb3c68df09ecca8 Author: Daniel Vetter Date: Sun Nov 28 19:06:09 2010 +0100 radeon: consolidate asic-specific function decls for pre-r600 Move them to radeon_asic.h together with the other asic specific stuff. Signed-off-by: Daniel Vetter Signed-off-by: Dave Airlie commit fea6f330cdd18f79d50bcdfbedb96d929a173e0d Author: Dan Carpenter Date: Fri Jan 7 08:12:27 2011 +0300 vga_switcheroo: comparing too few characters in strncmp() This is a copy-and-paste bug. We should be comparing 4 characters here instead of 3. Signed-off-by: Dan Carpenter Signed-off-by: Dave Airlie commit 26fcaf60fe3861409eb4c455c5c0d0f00f599b08 Author: Jiri Slaby Date: Fri Jan 7 01:42:31 2011 +0100 PM: Fix oops in suspend/hibernate code related to failing ioremap() When ioremap() fails (which might happen for some reason), we nicely oops in suspend_nvs_save() due to NULL dereference by memcpy() in there. Fail gracefully instead. Signed-off-by: Jiri Slaby Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 2b2fd604bda01bfea9f1657ca468c134448e03a5 Author: Alex Deucher Date: Thu Jan 6 21:19:35 2011 -0500 drm/radeon/kms: add NI pci ids Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0d1014a2f2d1ad660caafae6f62796a93307867f Author: Alex Deucher Date: Thu Jan 6 21:19:34 2011 -0500 drm/radeon/kms: don't enable pcie gen2 on NI yet Still needs to be implemented. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a43b7665de7b1adbda5ce19d57cb65add0982c8f Author: Alex Deucher Date: Thu Jan 6 21:19:33 2011 -0500 drm/radeon/kms: add radeon_asic struct for NI asics Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit ed18a3603f5b466e0300fc5e0c349dbcce376861 Author: Alex Deucher Date: Thu Jan 6 21:19:32 2011 -0500 drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init The vbios only partially initializes the memory controller on NI, so now we need to load the MC ucode in the driver and set the default clocks once the ucode is loaded. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0af62b0168043896a042b005ff88caa77dd94d04 Author: Alex Deucher Date: Thu Jan 6 21:19:31 2011 -0500 drm/radeon/kms: add ucode loader for NI 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 fee298fd6f3d8bde5fc2912192d026c78ba81982 Author: Alex Deucher Date: Thu Jan 6 21:19:30 2011 -0500 drm/radeon/kms: add support for DCE5 display LUTs The hardware supports advanced user defined color management but at the moment, there is no infrastructure in place to take advantage of it so for now we just support the legacy LUTs. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 58c2e9f02ad09b4375eb11c1f65565a83310deca Author: Alex Deucher Date: Thu Jan 6 21:19:29 2011 -0500 drm/radeon/kms: add ni_reg.h This adds some new NI (northern islands) specific display register defines. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit ff5b8562d965687261968d02762f9ae73e80a948 Author: Alex Deucher Date: Thu Jan 6 21:19:28 2011 -0500 drm/radeon/kms: add bo blit support for NI Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7d52785d2ac1a07bc012b76cb465c9a01d830a32 Author: Alex Deucher Date: Thu Jan 6 21:19:27 2011 -0500 drm/radeon/kms: always use writeback/events for fences on NI Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9ace9f7b168fef492f731ba60da5c76bc0776e6d Author: Alex Deucher Date: Thu Jan 6 21:19:26 2011 -0500 drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5 NI chips no longer load the MC ucode in the asic_init sequence so the asic comes up in a basic mode with low engine/memory clocks and a voltage. Once the MC ucode is loaded by the driver the card can be programmed to it's proper default clocks and voltage. As such the default clocks in the firmware info table as the post clocks, not the default running clocks. Track the default post clocks and default running clocks separately to handle this. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 03f40090555bd3de9fc80aa4e805ac7fa9c39dfe Author: Alex Deucher Date: Thu Jan 6 21:19:25 2011 -0500 drm/radeon/kms: add backend map workaround for barts Same as Cypress. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit adb68fa2f79fbfb49a920c1b69d607a3ab4f985b Author: Alex Deucher Date: Thu Jan 6 21:19:24 2011 -0500 drm/radeon/kms: fill gpu init for NI asics Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c901bcddd09560b78f0a5f8081b86745cc553edf Author: Alex Deucher Date: Thu Jan 6 21:19:23 2011 -0500 drm/radeon/kms: add disabled vbios accessor for NI asics Some systems disable the vbios on secondary cards or cards that have been posted. This code re-enabled the vbios so the driver can load it. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4fddba1fd9df94caaa03956bf36e1a887a1c92a5 Author: Alex Deucher Date: Thu Jan 6 21:19:22 2011 -0500 drm/radeon/kms: handle NI thermal controller Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 36868bda88b92ce8a9aa8b3ee2e0d1e0de09cc19 Author: Alex Deucher Date: Thu Jan 6 21:19:21 2011 -0500 drm/radeon/kms: parse DCE5 encoder caps when setting up encoders Needed to tell which DIG encoders are HBR2 capable for DP 1.2. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d07f4e83506712f31ad661415ea28d536a70a939 Author: Alex Deucher Date: Thu Jan 6 21:19:20 2011 -0500 drm/radeon/kms: dvo dpms updates for DCE5 The DVOOutputControl table was removed for DCE5. DVOEncoderControl now handles everything. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 69c74525c26a1b71116d9bd3a136bf1314a3e8cd Author: Alex Deucher Date: Thu Jan 6 21:19:19 2011 -0500 drm/radeon/kms: dac dpms updates for DCE5 The DAC1OutputControl table was removed for DCE5. DAC1EncoderControl now handles everything. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit badbb57b93adda990b4e2420ddfdf834504a217e Author: Alex Deucher Date: Thu Jan 6 21:19:18 2011 -0500 drm/radeon/kms: DCE5 atom dig encoder updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a001182af807e2e0e1eb497dc5418d1220406d9b Author: Alex Deucher Date: Thu Jan 6 21:19:17 2011 -0500 drm/radeon/kms: DCE5 atom transmitter control updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit a572eaa3726968555451ba301ff8c61e90e8c278 Author: Alex Deucher Date: Thu Jan 6 21:19:16 2011 -0500 drm/radeon/kms: DCE5 atom spread spectrum updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f82b3ddc5fac044a28ab841bfd4ae48e2e43a21b Author: Alex Deucher Date: Thu Jan 6 21:19:15 2011 -0500 drm/radeon/kms: DCE5 atom SetPixelClock updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 881dd74ea731067f8fc81608e3a8914fdd66bc6d Author: Alex Deucher Date: Thu Jan 6 21:19:14 2011 -0500 drm/radeon/kms: DCE5 supports 16k display surfaces Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 936b27cce8fdb8ca50a593714963862586285094 Author: Alex Deucher Date: Thu Jan 6 21:19:13 2011 -0500 drm/radeon/kms: update display watermark calculations for DCE5 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 1fe183050f71ba183fe2d693bbef5fa605723043 Author: Alex Deucher Date: Thu Jan 6 21:19:12 2011 -0500 drm/radeon/kms: add NI chip families Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 633b91643f50779897bcab5e50d08a4fe4ba9f13 Author: Alex Deucher Date: Thu Jan 6 21:19:11 2011 -0500 drm/radeon/kms: clean up ASIC_IS_DCE41() macro only fusion asics are dce4.1 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 32171d2297daa2fe90d6ef41c5424ca9ac5bd797 Author: Alex Deucher Date: Thu Jan 6 19:13:32 2011 -0500 drm/radeon/kms: fix some typos in evergreen pm4 defines Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c46cb4dabddeda851d0d5faee64484f3783053e3 Author: Alex Deucher Date: Thu Jan 6 19:12:37 2011 -0500 drm/radeon/kms: set the MSB of the HDP slice size Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9e46a48df24f9698b34d28385b320c529851e5f7 Author: Alex Deucher Date: Thu Jan 6 18:49:35 2011 -0500 drm/radeon/kms: add support for gen2 pcie link speeds Supported on rv6xx/r7xx/evergreen. Cards come up in gen1 mode. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3313e3d4333ccbf8bd7c816775cfe9aca623bd8a Author: Alex Deucher Date: Thu Jan 6 18:49:34 2011 -0500 drm/radeon/kms: add pcie get/set lane support for r6xx/r7xx/evergreen Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e457acaed4c56a6831b82365e17e8f42f1ee129c Author: Ben Skeggs Date: Tue Jan 4 12:41:37 2011 +1000 drm/nouveau: create grctx on the fly on all chipsets Signed-off-by: Ben Skeggs commit a9b365bdc328bd66e97087d0dba0b9a3d9eb1ac6 Author: Nishanth Menon Date: Thu Jan 6 19:49:29 2011 -0800 omap2+: wdt: trivial sparse fixes omap2_wd_timer_disable is declared in wdtimer.h and used by hwmod function pointers for usage, the header inclusion is necessary to ensure that the prototype and function remains consistent. omap_wdt_latency is passed as a pointer and does not need global scope Fixes sparse warnings: arch/arm/mach-omap2/devices.c:981:31: warning: symbol 'omap_wdt_latency' was not declared. Should it be static? arch/arm/mach-omap2/wd_timer.c:27:5: warning: symbol 'omap2_wd_timer_disable' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 2393608aede2380afc3fa8815197363f01f328ad Author: Nishanth Menon Date: Thu Jan 6 19:49:29 2011 -0800 omap3: igep3: make igep3_flash_init static igep3_flash_init is not used beyond the scope of the file, make it static instead. Fixes sparse warning: arch/arm/mach-omap2/board-igep0030.c:106:13: warning: symbol 'igep3_flash_init' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 0ce3bb7208b5bf7de2d869a881372b60cc37362c Author: Nishanth Menon Date: Thu Jan 6 19:49:29 2011 -0800 omap3: zoom: use static for pointer passing omap_zoom_wlan_data and zoom2_set_hs_extmute are not used beyond the scope of zoom-peripherals directly, instead pointers are used. make them static instead. Fixes sparse warnings: arch/arm/mach-omap2/board-zoom-peripherals.c:193:29: warning: symbol 'omap_zoom_wlan_data' was not declared. Should it be static? arch/arm/mach-omap2/board-zoom-peripherals.c:245:6: warning: symbol 'zoom2_set_hs_extmute' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Tony Lindgren commit bcb52693a49994f435fad5f8d4277fbb125f3452 Author: Nishanth Menon Date: Thu Jan 6 19:49:28 2011 -0800 omap3|4: mux: make local structures static Mux data is passed by pointers to mux.c from the SoC specific mux file, these variables dont really need to be global scope. This fixes the following sparse warnings: arch/arm/mach-omap2/mux44xx.c:547:29: warning: symbol 'omap4_core_cbl_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux44xx.c:1265:29: warning: symbol 'omap4_core_cbs_ball' was not declared. Should it be static? arch/arm/mach-omap2/mux44xx.c:1549:29: warning: symbol 'omap4_wkup_cbl_cbs_ball' was not declared. Should it be static? Signed-off-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 3083314238afb593b598dca4bab4bb6ae09a6c82 Author: Aaro Koskinen Date: Thu Jan 6 19:49:28 2011 -0800 arm: mach-omap2: mux: fix buffer overrun memcpy() copies 8 bytes too much (omap_mux_entry vs. omap_mux). Correct by replacing memcpy() with struct assignment, which is safer. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit e118a1df32c41186f717bbe6b42142741530e8b9 Author: Catalin Marinas Date: Thu Jan 6 19:57:53 2011 -0800 ARM: Do not enable SWP emulation if CPU_V6 && CPU_V7 This option uses LDREXB/STREXB to emulate SWPB but these instructions are not supported on all the ARMv6 processors. Reported-by: Anand Gadiyar Signed-off-by: Catalin Marinas Cc: Leif Lindholm Signed-off-by: Tony Lindgren commit 55db8387a5e8d07407f0b7c6b2526417a2bc6243 Author: Herbert Xu Date: Fri Jan 7 14:55:06 2011 +1100 hwrng: via_rng - Fix memory scribbling on some CPUs It has been reported that on at least one Nano CPU the xstore instruction will write as many as 16 bytes of data to the output buffer. This causes memory corruption as we use rng->priv which is only 4-8 bytes long. This patch fixes this by using an intermediate buffer on the stack with at least 16 bytes and aligned to a 16-byte boundary. The problem was observed on the following processor: processor : 0 vendor_id : CentaurHauls cpu family : 6 model : 15 model name : VIA Nano processor U2250 (1.6GHz Capable) stepping : 3 cpu MHz : 1600.000 cache size : 1024 KB fdiv_bug : no hlt_bug : no f00f_bug : no coma_bug : no fpu : yes fpu_exception : yes cpuid level : 10 wp : yes flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat clflush acpi mmx fxsr sse sse2 ss tm syscall nx lm constant_tsc up rep_good pni monitor vmx est tm2 ssse3 cx16 xtpr rng rng_en ace ace_en ace2 phe phe_en lahf_lm bogomips : 3192.08 clflush size : 64 cache_alignment : 128 address sizes : 36 bits physical, 48 bits virtual power management: Tested-by: Mario 'BitKoenig' Holbe Signed-off-by: Herbert Xu commit 21493088733e6e09dac6f54595a1b6b8ab1e68fd Author: Herbert Xu Date: Fri Jan 7 14:52:00 2011 +1100 crypto: padlock - Move padlock.h into include/crypto This patch moves padlock.h from drivers/crypto into include/crypto so that it may be used by the via-rng driver. Signed-off-by: Herbert Xu commit 0735ac1f2551d9f9d356126aaf3b1110150918e6 Author: Herbert Xu Date: Fri Jan 7 14:48:57 2011 +1100 hwrng: via_rng - Fix asm constraints The inline asm to invoke xstore did not specify the constraints correctly. In particular, dx/di should have been marked as output registers as well as input as they're modified by xstore. Thanks to Mario Holbe for creating this patch and testing it. Tested-by: Mario 'BitKoenig' Holbe Signed-off-by: Herbert Xu commit dfe63bb0ad9810db13aab0058caba97866e0a681 Author: James Simmons Date: Thu Dec 23 16:40:37 2010 +0000 drm: Update fbdev fb_fix_screeninfo If you change the color depth via fbset or some other framebuffer aware userland application struct fb_fix_screeninfo is not updated to this new information. This patch fixes this issue. Also the function is changed to just pass in struct drm_framebuffer so in the future we could use more fields. I'm hoping some day fix->smem* could be set here :-) Signed-off-by: James Simmons Signed-off-by: Dave Airlie commit 23a2f3ab46596d9fd0b0e592d2101bea90970594 Author: Lin Ming Date: Fri Jan 7 11:11:09 2011 +0800 perf tools: Pass whole attr to event selectors Since commit 69aad6f1(perf tools: Introduce event selectors), only perf_event_attr::type and ::config are passed to event selector, which makes perf tool not work correctly. For example, PEBS does not work because perf_event_attr::precise_ip is not passed to the syscall. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <1294369869.20563.19.camel@minggr.sh.intel.com> Signed-off-by: Lin Ming Signed-off-by: Arnaldo Carvalho de Melo commit 01539ba2a706ab7d35fc0667dff919ade7f87d63 Merge: 9e9bc97 dc69d1a Author: Linus Torvalds Date: Thu Jan 6 19:13:58 2011 -0800 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: (243 commits) omap2: Make OMAP2PLUS select OMAP_DM_TIMER OMAP4: hwmod data: Fix alignment and end of line in structurefields OMAP4: hwmod data: Move the DMA structures OMAP4: hwmod data: Move the smartreflex structures OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc arm: omap: tusb6010: add name for MUSB IRQ arm: omap: craneboard: Add USB EHCI support omap2+: Initialize serial port for dynamic remuxing for n8x0 omap2+: Add struct omap_board_data and use it for platform level serial init omap2+: Allow hwmod state changes to mux pads based on the state changes omap2+: Add support for hwmod specific muxing of devices omap2+: Add omap_mux_get_by_name OMAP2: PM: fix compile error when !CONFIG_SUSPEND MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership OMAP4: Smartreflex framework extensions OMAP4: hwmod: Add inital data for smartreflex modules. OMAP4: PM: Program correct init voltages for scalable VDDs OMAP4: Adding voltage driver support OMAP4: Register voltage PMIC parameters with the voltage layer OMAP3: PM: Program correct init voltages for VDD1 and VDD2 ... Fix up trivial conflict in arch/arm/plat-omap/Kconfig commit c413521eb4e2d7ffd5ce432a144708d479054bd3 Author: Paul Mundt Date: Fri Jan 7 12:03:22 2011 +0900 ARM: mach-shmobile: update for SMP changes. There have likewise been some API updates, so we refactor to use the consolidated smp_prepare_cpus(). Signed-off-by: Paul Mundt commit c0312b33daa721a92633181fd4fe508484c81a2d Author: Paul Mundt Date: Fri Jan 7 12:02:11 2011 +0900 ARM: mach-shmobile: update for GIC changes. This fixes up the SMP support to use the refactored GIC APIs. Signed-off-by: Paul Mundt commit 6ef9f6fd8eb22f4838e9b0006d16936511e3f7f8 Author: Paul Mundt Date: Fri Jan 7 11:49:49 2011 +0900 ARM: mach-shmobile: Fix up clkdev fallout for SH73A0. Use the new linux/clkdev.h to get it building again. Signed-off-by: Paul Mundt commit 9e9bc9736756f25d6c47b4eba0ebf25b20a6f153 Merge: 3c0cb7c e3c9221 Author: Linus Torvalds Date: Thu Jan 6 18:32:12 2011 -0800 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: (255 commits) [media] radio-aimslab.c: Fix gcc 4.5+ bug [media] cx25821: Fix compilation breakage due to BKL dependency [media] v4l2-compat-ioctl32: fix compile warning [media] zoran: fix compiler warning [media] tda18218: fix compile warning [media] ngene: fix compile warning [media] DVB: IR support for TechnoTrend CT-3650 [media] cx23885, cimax2.c: Fix case of two CAM insertion irq [media] ir-nec-decoder: fix repeat key issue [media] staging: se401 depends on USB [media] staging: usbvideo/vicam depends on USB [media] soc_camera: Add the ability to bind regulators to soc_camedra devices [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor [media] v4l: soc-camera: switch to .unlocked_ioctl [media] v4l: ov772x: simplify pointer dereference [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving [media] ov9640: use macro to request OmniVision OV9640 sensor private data [media] ivtv-i2c: Fix two warnings [media] staging/lirc: Update lirc TODO files [media] cx88: Remove the obsolete i2c_adapter.id field ... commit 3bd75e5e0c5b58636aeadd34890114bcb988777e Author: Paul Mundt Date: Fri Jan 7 11:07:30 2011 +0900 sh: mach-sdk7786: Fix up fallout from clkdev consolidation. CC arch/sh/boards/mach-sdk7786/setup.o arch/sh/boards/mach-sdk7786/setup.c:179: error: variable 'sdk7786_pcie_cl' has initializer but incomplete type arch/sh/boards/mach-sdk7786/setup.c:180: error: unknown field 'con_id' specified in initializer arch/sh/boards/mach-sdk7786/setup.c:180: warning: excess elements in struct initializer arch/sh/boards/mach-sdk7786/setup.c:180: warning: (near initialization for 'sdk7786_pcie_cl') arch/sh/boards/mach-sdk7786/setup.c:181: error: unknown field 'clk' specified in initializer arch/sh/boards/mach-sdk7786/setup.c:181: warning: excess elements in struct initializer arch/sh/boards/mach-sdk7786/setup.c:181: warning: (near initialization for 'sdk7786_pcie_cl') arch/sh/boards/mach-sdk7786/setup.c: In function 'sdk7786_clk_init': arch/sh/boards/mach-sdk7786/setup.c:211: error: implicit declaration of function 'clkdev_add' which is a fanciful way of saying that the struct definition moved from asm/clkdev.h to linux/clkdev.h. Signed-off-by: Paul Mundt commit 04a186bd2c4d3fd7efdeb91d2e92f4624be3a764 Merge: e9d728f 661382f Author: Paul Mundt Date: Fri Jan 7 11:03:37 2011 +0900 Merge branch 'common/dma' into rmobile-latest commit 661382fe190475c17d0b3a6b5f0350b4f82f5939 Author: Guennadi Liakhovetski Date: Thu Jan 6 17:04:50 2011 +0000 dma: shdma: don't register the global die notifier multiple times A recent patch has added a die notifier to the shdma driver, however, it registers a static die-notifier object in the probe routine, i.e., for each device instance. This is wrong and leads to a system lockup. This patch moves the die notifier registration to module init and exit routines respectively. Reported-by: Magnus Damm Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e9d728f528f9548c8dd013899b23e662fa7b6bca Merge: 018a3fc 6155f77 Author: Paul Mundt Date: Fri Jan 7 10:51:35 2011 +0900 Merge branch 'rmobile/smp' into rmobile-latest Conflicts: arch/arm/Kconfig arch/arm/mach-shmobile/include/mach/entry-macro-intc.S Signed-off-by: Paul Mundt commit 018a3fc7e3824ffcc80ad0160f9782c7d577c0c1 Author: Magnus Damm Date: Tue Dec 28 08:27:19 2010 +0000 ARM: mach-shmobile: Rely on run-time IRQ handlers Remove now unused IRQ demux code. All R-Mobile and SH-Mobile processors should register IRQ demux handlers during run-time. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit e74a9625f8dcf1a924345b24cec8476c52593df8 Author: Magnus Damm Date: Tue Dec 28 08:27:10 2010 +0000 ARM: mach-shmobile: Run-time IRQ handler for GIC Break-out GIC specific IRQ demux code from the file entry-macro-intc.S and register during run-time. Covers sh73a0. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 863b171952dba1a3ce9d345cfe4e93c9fdd42f49 Author: Magnus Damm Date: Tue Dec 28 08:27:01 2010 +0000 ARM: mach-shmobile: Run-time IRQ handler for INTCA Break-out INTC specific IRQ demux code from the file entry-macro-intc.S and register during run-time. Covers sh7367, sh7377 and sh7372. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 60f1435c3bab8b88712a4f96806e5ac9396aa49c Author: Magnus Damm Date: Tue Dec 28 08:26:52 2010 +0000 ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER Always enable MULTI_IRQ_HANDLER on SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3dff8804fc087d55c593dda0ff78f475088ec57d Author: Magnus Damm Date: Wed Dec 22 12:17:09 2010 +0000 ARM: mach-shmobile: Use shared GIC entry macros Use the GIC demux code in asm/hardware/entry-macro-gic.S on the R-Mobile / SH-Mobile processors. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eb6908a279dfbe2e1c1714c185e0f523a9749607 Author: Simon Horman Date: Thu Dec 9 00:47:15 2010 +0000 ARM: mach-shmobile: mackerel: Add zboot support When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. Cc: Magnus Damm Cc: Kuninori Morimoto Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 5e93c6b4ecd78b1bab49bad1dc2f6ed7ec0115ee Merge: 98d27b8 3c0cb7c Author: Paul Mundt Date: Fri Jan 7 10:29:26 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt commit 3c0cb7c31c206aaedb967e44b98442bbeb17a6c4 Merge: f70f5b9 404a02c Author: Linus Torvalds Date: Thu Jan 6 16:50:35 2011 -0800 Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits) ARM: DMA: add support for DMA debugging ARM: PL011: add DMA burst threshold support for ST variants ARM: PL011: Add support for transmit DMA ARM: PL011: Ensure IRQs are disabled in UART interrupt handler ARM: PL011: Separate hardware FIFO size from TTY FIFO size ARM: PL011: Allow better handling of vendor data ARM: PL011: Ensure error flags are clear at startup ARM: PL011: include revision number in boot-time port printk ARM: vexpress: add sched_clock() for Versatile Express ARM i.MX53: Make MX53 EVK bootable ARM i.MX53: Some bug fix about MX53 MSL code ARM: 6607/1: sa1100: Update platform device registration ARM: 6606/1: sa1100: Fix platform device registration ARM i.MX51: rename IPU irqs ARM i.MX51: Add ipu clock support ARM: imx/mx27_3ds: Add PMIC support ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() mx51: fix usb clock support MX51: Add support for usb host 2 arch/arm/plat-mxc/ehci.c: fix errors/typos ... commit 4c65595ec506ff65c90b1d9fed17333005fa5eb5 Author: Greg Ungerer Date: Fri Jan 7 10:43:09 2011 +1000 m68knommu: fix broken setting of irq_chip and handler Fix compile error, by using correct loop variable: arch/m68knommu/platform/68328/ints.c: In function ‘init_IRQ’: arch/m68knommu/platform/68328/ints.c:182: error: ‘irq’ undeclared (first use in this function) arch/m68knommu/platform/68328/ints.c:182: error: (Each undeclared identifier is reported only once arch/m68knommu/platform/68328/ints.c:182: error: for each function it appears in.) Signed-off-by: Greg Ungerer commit f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234 Merge: b69fc2e 09798eb Author: Linus Torvalds Date: Thu Jan 6 15:30:54 2011 -0800 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: (25 commits) atyfb: Fix bootup hangs on sparc64. sparc: update copyright in piggyback.c sparc: unify strip command in boot/Makefile sparc: rename piggyback_32 to piggyback sparc: fix tftpboot.img for sparc64 on little-endian host sparc: add $BITS to piggyback arguments sparc: remove obsolete ELF support in piggyback_32.c sparc: additional comments to piggyback_32.c sparc: use _start for the start entry (like 64 bit does) sparc: use trapbase in setup_arch sparc: refactor piggy_32.c Added support for ampopts in APBUART driver. Used in AMP systems. APBUART: added raw AMBA vendor/device number to match against. SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing SPARC/LEON: added support for selecting Timer Core and Timer within core LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL SPARC/LEON: added support for IRQAMP IRQ Controller SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded. sparc: fix sparse warnings in arch/sparc/prom for 32 bit build sparc: remove unused prom tree functions ... commit 404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34 Merge: 28cdac6 1051b9f Author: Russell King Date: Thu Jan 6 22:33:32 2011 +0000 Merge branch 'devel-stable' into devel Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h commit 28cdac6690cb113856293bf79b40de33dbd8f974 Merge: 4073723 36bb94b Author: Russell King Date: Thu Jan 6 22:33:19 2011 +0000 Merge branch 'pgt' (early part) into devel commit 4073723acb9cdcdbe4df9c0e0c376c65d1697e43 Merge: 58daf18 4ec3eb1 Author: Russell King Date: Thu Jan 6 22:32:52 2011 +0000 Merge branch 'misc' into devel Conflicts: arch/arm/Kconfig arch/arm/common/Makefile arch/arm/kernel/Makefile arch/arm/kernel/smp.c commit 4ec3eb13634529c0bc7466658d84d0bbe3244aea Merge: 24056f5 15095bb Author: Russell King Date: Thu Jan 6 22:31:35 2011 +0000 Merge branch 'smp' into misc Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/ioremap.c commit 24056f525051a9e186af28904b396320e18bf9a0 Author: Russell King Date: Mon Jan 3 11:29:28 2011 +0000 ARM: DMA: add support for DMA debugging Add ARM support for the DMA debug infrastructure, which allows the DMA API usage to be debugged. Signed-off-by: Russell King commit b69fc2efc9205d58c820eb2eb1caa6bf873b4b0d Merge: 84b7290 c6d92e9 Author: Linus Torvalds Date: Thu Jan 6 13:36:30 2011 -0800 Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm * 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (35 commits) mmc: msm_sdcc: Check for only DATA_END interrupt to end a request mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned mmc: msm_sdcc: Reset SDCC in case of data transfer errors mmc: msm_sdcc: Add prog done interrupt support mmc: msm_sdcc: Fix possible circular locking dependency warning MSM: Add USB support for MSM7x30 MSM: Add USB suport for QSD8x50 msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables ... commit 84b7290cca16c61a167c7e1912cd84a479852165 Merge: 9858a38 1928e87 Author: Linus Torvalds Date: Thu Jan 6 13:35:12 2011 -0800 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: (55 commits) video: udlfb: Kill off special printk wrappers, use pr_fmt(). video: udlfb: Kill off some magic constants for EDID sizing. video: udlfb: deifdefify (yes, that's a word). fbdev: modedb: Add a new mode for 864x480 TAAL panels. drivers/video/i810/i810-i2c.c: fix i2c bus handling video: Fix the HGA framebuffer driver drivers/video/carminefb.c: improve error handling video: imxfb: Fix the maximum value for yres fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support fbdev: sh_mipi_dsi: use platform provided register layout and values ARM: mach-shmobile: specify sh7372 MIPI DSI register layout fbdev: sh_mipi_dsi: support different register layouts ARM: mach-shmobile: improve MIPI DSI clock configuration fbdev: sh-mobile: implement MIPI DSI runtime PM support sisfb: eliminate compiler warnings sisfb: delete unused register I/O macros sisfb: replace setSISIDXREG with SiS_SetRegANDOR sisfb: replace andSISIDXREG with SiS_SetRegAND sisfb: replace orSISIDXREG with SiS_SetRegOR sisfb: replace outSISIDXREG with SiS_SetReg ... commit 9858a38ea3a940762ae3028cce88f686d0e0c28b Merge: abb3594 f862f90 Author: Linus Torvalds Date: Thu Jan 6 13:34:45 2011 -0800 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: include Migo-R TS driver in Migo-R defconfig sh: correct definitions to access stack pointers sh: Tidy up SH-4A unaligned load support. dma: shdma: NMI support. sh: mach-sdk7786: Handle baseboard NMI source selection. sh: mach-rsk: Add polled GPIO buttons support for RSK+7203. sh: Break out cpuinfo_op procfs bits. sh: Enable optional gpiolib for all CPUs with pinmux tables. sh: migrate SH_CLK_MD to mode pin API. sh: machvec IO death. commit d035c36c58dd9183ad6aa7875dea89893faedb55 Author: Trond Myklebust Date: Tue Dec 21 10:45:27 2010 -0500 NFSv4: Ensure continued open and lockowner name uniqueness In order to enable migration support, we will want to move some of the structures that are subject to migration into the struct nfs_server. In particular, if we are to move the state_owner and state_owner_id to being a per-filesystem structure, then we should label the resulting open/lock owners with a per-filesytem label to ensure global uniqueness. This patch does so by adding the super block s_dev to the open/lock owner name. Signed-off-by: Trond Myklebust commit abb359450f20c32ae03039d8736f12b1d561caf5 Merge: cb600d2 4e3dbdb Author: Linus Torvalds Date: Thu Jan 6 12:30:19 2011 -0800 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: (1436 commits) cassini: Use local-mac-address prom property for Cassini MAC address net: remove the duplicate #ifdef __KERNEL__ net: bridge: check the length of skb after nf_bridge_maybe_copy_header() netconsole: clarify stopping message netconsole: don't announce stopping if nothing happened cnic: Fix the type field in SPQ messages netfilter: fix export secctx error handling netfilter: fix the race when initializing nf_ct_expect_hash_rnd ipv4: IP defragmentation must be ECN aware net: r6040: Return proper error for r6040_init_one dcb: use after free in dcb_flushapp() dcb: unlock on error in dcbnl_ieee_get() net: ixp4xx_eth: Return proper error for eth_init_one include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel net: add POLLPRI to sock_def_readable() af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks. net_sched: pfifo_head_drop problem mac80211: remove stray extern mac80211: implement off-channel TX using hw r-o-c offload mac80211: implement hardware offload for remain-on-channel ... commit 6b01f2c4f6188da50d8fe094e369a9c0390424ab Author: Frederic Weisbecker Date: Thu Jan 6 15:51:53 2011 +0100 perf tools: Build with frame pointer It seems that some gcc versions build by default with frame pointers and some others omit them. Just build the tools with frame pointers as the callchains can be an important part of the perf workflow. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <1294325513-14276-3-git-send-email-fweisbec@gmail.com> Signed-off-by: Frederic Weisbecker Signed-off-by: Arnaldo Carvalho de Melo commit f006d25a15216a483cec71e886786874f66f9452 Author: Han Pingtian Date: Thu Jan 6 17:39:22 2011 +0800 perf tools: Fix buffer overflow error when specifying all tracepoints I found when specifying all tracepoints with -e to one of subcommand, such as 'stat', the program will trigger a buffer overflow error, like this: *** buffer overflow detected ***: ./perf terminated ======= Backtrace: ========= /lib64/libc.so.6(__fortify_fail+0x37)[0x382cefb2c7] .... The tracepoints are separated by comma, something like this: $ perf stat -a -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}'` The root reason of this problem is that store_event_type() is called for all events, and will overflow the 'filename' at: strncat(filename, orgname, strlen(orgname)); This patch fixes it by calling store_event_type() only when the event name has been found. LKML-Reference: <20110106093922.GB6713@hpt.nay.redhat.com> Signed-off-by: Han Pingtian Signed-off-by: Arnaldo Carvalho de Melo commit d3978bb325510f0a26ebd92f211b36c5f98b2306 Author: Chuck Lever Date: Fri Dec 24 01:33:04 2010 +0000 NFS: Move cl_delegations to the nfs_server struct Delegations are per-inode, not per-nfs_client. When a server file system is migrated, delegations on the client must be moved from the source to the destination nfs_server. Make it easier to manage a mount point's delegation list across a migration event by moving the list to the nfs_server struct. Clean up: I added documenting comments to public functions I changed in this patch. For consistency I added comments to all the other public functions in fs/nfs/delegation.c. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 4e3dbdb1392a83bd21a6ff8f6bc785495058d37c Author: Richard Mortimer Date: Thu Jan 6 11:50:30 2011 -0800 cassini: Use local-mac-address prom property for Cassini MAC address Fallback on the local-mac-address prom property if the Cassini device does not have an address programmed in the VPD ROM. This uses the same technique as implemented by the sungem driver. The problem was reported by Frans van Berckel using Debian kernel 2.6.34-7 on Sun Fire V440. udev was assigning a new eth device name on each reboot because the cassini driver was using a random MAC address. Fix tested on 2.6.34-7 and 2.6.37 Sun Fire V440. Compile tested against 2.6.36 davem/sparc-2.6.git Reported-by: Frans van Berckel Tested-by: Frans van Berckel Reviewed-by: Julian Calaby Reviewed-by: Sam Ravnborg Signed-off-by: Richard Mortimer Signed-off-by: David S. Miller commit dda4b225623f316335052828c24a16e2da313f8f Author: Chuck Lever Date: Fri Dec 24 01:32:54 2010 +0000 NFS: Introduce nfs_detach_delegations() Clean up: Refactor code that takes clp->cl_lock and calls nfs_detach_delegations_locked() into its own function. While we're changing the call sites, get rid of the second parameter and the logic in nfs_detach_delegations_locked() that uses it, since callers always set that parameter of nfs_detach_delegations_locked() to NULL. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 24d292b894273495f9664bb495e575f8cb7e8cac Author: Chuck Lever Date: Fri Dec 24 01:32:43 2010 +0000 NFS: Move cl_state_owners and related fields to the nfs_server struct NFSv4 migration needs to reassociate state owners from the source to the destination nfs_server data structures. To make that easier, move the cl_state_owners field to the nfs_server struct. cl_openowner_id and cl_lockowner_id accompany this move, as they are used in conjunction with cl_state_owners. The cl_lock field in the parent nfs_client continues to protect all three of these fields. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit fca5238ef3232cd0cf4bf0457e751b3bb20912a9 Author: Chuck Lever Date: Fri Dec 24 01:32:32 2010 +0000 NFS: Allow walking nfs_client.cl_superblocks list outside client.c We're about to move some fields from struct nfs_client to struct nfs_server. There is a many-to-one relationship between nfs_servers and nfs_clients. After these fields are moved to the nfs_server struct, to visit all of the data in these fields that is owned by one nfs_client, code will need to visit each nfs_server on the cl_superblocks list for that nfs_client. To serialize changes to the cl_superblocks list during these little expeditions, protect the list with RCU. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit f7e8917a67980924651a9e244510e63ef05c7755 Author: Fred Isaman Date: Thu Jan 6 11:36:32 2011 +0000 pnfs: layout roc code A layout can request return-on-close. How this interacts with the forgetful model of never sending LAYOUTRETURNS is a bit ambiguous. We forget any layouts marked roc, and wait for them to be completely forgotten before continuing with the close. In addition, to compensate for races with any inflight LAYOUTGETs, and the fact that we do not get any layout stateid back from the server, we set the barrier to the worst case scenario of current_seqid + number of outstanding LAYOUTGETS. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 36840370845629e6cb4324d1dd4aff6778670503 Author: Alexandros Batsakis Date: Thu Jan 6 11:36:31 2011 +0000 pnfs: update nfs4_callback_recallany to handle layouts While here, update the code a bit. Signed-off-by: Alexandros Batsakis Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 43f1b3da8b35d706d6c47880fc211d2519b4a587 Author: Fred Isaman Date: Thu Jan 6 11:36:30 2011 +0000 pnfs: add CB_LAYOUTRECALL handling This is the heart of the wave 2 submission. Add the code to trigger drain and forget of any afected layouts. In addition, we set a "barrier", below which any LAYOUTGET reply is ignored. This is to compensate for the fact that we do not wait for outstanding LAYOUTGETs to complete as per section 12.5.5.2.1 of RFC 5661. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit f2a625616045fe46e1d5fceebdd825f5acdecdb7 Author: Fred Isaman Date: Thu Jan 6 11:36:29 2011 +0000 pnfs: CB_LAYOUTRECALL xdr code This is the xdr decoding for CB_LAYOUTRECALL. Signed-off-by: Alexandros Batsakis Signed-off-by: Dean Hildebrand Signed-off-by: Marc Eshel Signed-off-by: Andy Adamson Signed-off-by: Benny Halevy Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit cc6e5340b0981feac5a00a992bab6154cb4b1fa1 Author: Fred Isaman Date: Thu Jan 6 11:36:28 2011 +0000 pnfs: change lo refcounting to atomic_t This will be required to allow us to grab reference outside of i_lock. While we are at it, make put_layout_hdr take the same argument as all the related functions. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit fc1794c5b04f5322bad05385cd91b52ec85aab72 Author: Fred Isaman Date: Thu Jan 6 11:36:27 2011 +0000 pnfs: check that partial LAYOUTGET return is ignored Either a bad server reply, or our ignoring of multiple array segments in a reply, can cause a reply to not meet our requirements. Ensure that we ignore such replies. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 2130ff663633e8a57921779ebfe62fc39d5585ec Author: Fred Isaman Date: Thu Jan 6 11:36:26 2011 +0000 pnfs: add layout to client list before sending rpc Since this list will be used to search for layouts to recall, this is necessary to avoid a race where the recall comes in, sees there is nothing in the client list, and prepares to return NOMATCHING, while the LAYOUTGET gets processed before the recall updates the stateid. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit cf7d63f1f9895713551df2e6d18b006f8af26e91 Author: Fred Isaman Date: Thu Jan 6 11:36:25 2011 +0000 pnfs: serialize LAYOUTGET(openstateid) We shouldn't send a LAYOUTGET(openstateid) unless all outstanding RPCs using the previous stateid are completed. This requires choosing the stateid to encode earlier, so we can abort if one is not available (we want to use the open stateid, but a LAYOUTGET is already out using it), and adding a count of the number of outstanding rpc calls using layout state (which for now consist solely of LAYOUTGETs). Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit c31663d4a1fac5ce1954d656cbcf80eb883b814a Author: Fred Isaman Date: Thu Jan 6 11:36:24 2011 +0000 pnfs: layoutget rpc code cleanup No functional changes, just some code minor code rearrangement and comments. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 4541d16c024ce40a0781e03c185ecdfe34aec46f Author: Fred Isaman Date: Thu Jan 6 11:36:23 2011 +0000 pnfs: change how lsegs are removed from layout list This is to prepare the way for sensible io draining. Instead of just removing the lseg from the list, we instead clear the VALID flag (preventing new io from grabbing references to the lseg) and remove the reference holding it in the list. Thus the lseg will be removed once any io in progress completes and any references still held are dropped. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit fd6002e9b8a93220d5f53b93d9624caf73cdc8a2 Author: Fred Isaman Date: Thu Jan 6 11:36:22 2011 +0000 pnfs: change layout state seqlock to a spinlock This prepares for future changes, where the layout state needs to change atomically with several other variables. In particular, it will need to know if lo->segs is empty, as we test that instead of manipulating the NFS_LAYOUT_STATEID_SET bit. Moreover, the layoutstateid is not really a read-mostly structure, as it is written almost as often as it is read. The behavior of pnfs_get_layout_stateid is also slightly changed, so that it no longer changes the stateid. Its name is changed to +pnfs_choose_layoutget_stateid. Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit b7edfaa1983362842351e425adeb8e297b4c11fb Author: Fred Isaman Date: Thu Jan 6 11:36:21 2011 +0000 pnfs: add prefix to struct pnfs_layout_hdr fields Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 566052c53b5146e23a99ab95fb5c11f8a295a084 Author: Fred Isaman Date: Thu Jan 6 11:36:20 2011 +0000 pnfs: add prefix to struct pnfs_layout_segment fields While we are renaming all the fields, change lo->state to lo->plh_flags. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit daaa82d1c72e10dc16cad3a810e225f9188dc7aa Author: Fred Isaman Date: Thu Jan 6 11:36:19 2011 +0000 pnfs: remove unnecessary field lgp->status Signed-off-by: Fred Isaman Signed-off-by: Benny Halevy Signed-off-by: Trond Myklebust commit 52fabd73199cd00932f92c9f548bdf66a5bbc23d Author: Fred Isaman Date: Thu Jan 6 11:36:18 2011 +0000 pnfs: fix incorrect comment in destroy_lseg Comment references get_layout_hdr_locked, which never existed in submitted code. Signed-off-by: Fred Isaman Signed-off-by: Trond Myklebust commit 4a19de0f4b693139bb10b7cc3cfe1f618576ba67 Author: Andy Adamson Date: Thu Jan 6 02:04:35 2011 +0000 NFS rename client back channel transport field Differentiate from server backchannel Signed-off-by: Andy Adamson Acked-by: Bruce Fields Signed-off-by: Trond Myklebust commit 42acd021824578fa0eeb6eb58d457c23ec5dc9c0 Author: Andy Adamson Date: Thu Jan 6 02:04:34 2011 +0000 NFS add session back channel draining Currently session draining only drains the fore channel. The back channel processing must also be drained. Use the back channel highest_slot_used to indicate that a callback is being processed by the callback thread. Move the session complete to be per channel. When the session is draininig, wait for any current back channel processing to complete and stop all new back channel processing by returning NFS4ERR_DELAY to the back channel client. Drain the back channel, then the fore channel. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit ece0de633c4d9106c39ea9f0db1638c42ead2541 Author: Andy Adamson Date: Thu Jan 6 02:04:33 2011 +0000 NFS RPC_AUTH_GSS unsupported on v4.1 back channel Signed-off-by: Andy Adamson Acked-by: Bruce Fields Signed-off-by: Trond Myklebust commit c36fca52f5e4594ffd0ff175b328966b0d393184 Author: Andy Adamson Date: Thu Jan 6 02:04:32 2011 +0000 NFS refactor nfs_find_client and reference client across callback processing Fixes a bug where the nfs_client could be freed during callback processing. Refactor nfs_find_client to use minorversion specific means to locate the correct nfs_client structure. In the NFS layer, V4.0 clients are found using the callback_ident field in the CB_COMPOUND header. V4.1 clients are found using the sessionID in the CB_SEQUENCE operation which is also compared against the sessionID associated with the back channel thread after a successful CREATE_SESSION. Each of these methods finds the one an only nfs_client associated with the incoming callback request - so nfs_find_client_next is not needed. In the RPC layer, the pg_authenticate call needs to find the nfs_client. For the v4.0 callback service, the callback identifier has not been decoded so a search by address, version, and minorversion is used. The sessionid for the sessions based callback service has (usually) not been set for the pg_authenticate on a CB_NULL call which can be sent prior to the return of a CREATE_SESSION call, so the sessionid associated with the back channel thread is not used to find the client in pg_authenticate for CB_NULL calls. Pass the referenced nfs_client to each CB_COMPOUND operation being proceesed via the new cb_process_state structure. The reference is held across cb_compound processing. Use the new cb_process_state struct to move the NFS4ERR_RETRY_UNCACHED_REP processing from process_op into nfs4_callback_sequence where it belongs. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 2c2618c6f29c41a0a966f14f05c8bf45fcabb750 Author: Andy Adamson Date: Thu Jan 6 02:04:31 2011 +0000 NFS associate sessionid with callback connection The sessions based callback service is started prior to the CREATE_SESSION call so that it can handle CB_NULL requests which can be sent before the CREATE_SESSION call returns and the session ID is known. Set the callback sessionid after a sucessful CREATE_SESSION. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit f4eecd5da3422e82e88e36c33cbd2595eebcacb1 Author: Andy Adamson Date: Thu Jan 6 02:04:30 2011 +0000 NFS implement v4.0 callback_ident Use the small id to pointer translator service to provide a unique callback identifier per SETCLIENTID call used to identify the v4.0 callback service associated with the clientid. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit ea00528126a701845d7c445e725b271940381e3d Author: Andy Adamson Date: Thu Jan 6 02:04:29 2011 +0000 NFS do not clear minor version at nfs_client free Resetting the client minor version operations causes nfs4_destroy_callback to fail to shutdown the NFSv4.1 callback service. There is no reason to reset the client minorversion operations when the nfs_client struct is being freed. Remove the minorverion reset and rename the function. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 01c9a0bc60507af7f28cb9138a81836de4528199 Author: Andy Adamson Date: Thu Jan 6 02:04:28 2011 +0000 NFS use svc_create_xprt for NFSv4.1 callback service The new back channel transport means we call the normal creation routine as well as svc_xprt_put. Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 16b2d1e1d12de000404d7c845d0db1226511f84d Author: Andy Adamson Date: Thu Jan 6 02:04:27 2011 +0000 SUNRPC register and unregister the back channel transport Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 1f11a034cdc4b45ee56d51b87a9e37cb776fb15b Author: Andy Adamson Date: Thu Jan 6 02:04:26 2011 +0000 SUNRPC new transport for the NFSv4.1 shared back channel Move the current sock create and destroy routines into the new transport ops. Back channel socket will be destroyed by the svc_closs_all call in svc_destroy. Added check: only TCP supported on shared back channel. Signed-off-by: Andy Adamson Acked-by: Bruce Fields Signed-off-by: Trond Myklebust commit 71e161a6a9fa021a280e564254fcda894e6fbd14 Author: Andy Adamson Date: Thu Jan 6 02:04:25 2011 +0000 SUNRPC fix bc_send print Signed-off-by: Andy Adamson Signed-off-by: Trond Myklebust commit 4b5b3ba16be1b195d2e1161746637acd4b9fed4f Author: Andy Adamson Date: Thu Jan 6 02:04:24 2011 +0000 SUNRPC move svc_drop to caller of svc_process_common The NFSv4.1 shared back channel does not need to call svc_drop because the callback service never outlives the single connection it services, and it reuses it's buffers and keeps the trasport. Signed-off-by: Andy Adamson Acked-by: Bruce Fields Signed-off-by: Trond Myklebust commit 2ad0d9d413abc3380fc1d89a9da7f8db59d9746b Author: Changli Gao Date: Thu Jan 6 11:41:42 2011 -0800 net: remove the duplicate #ifdef __KERNEL__ Since we are already in #ifdef __KERNEL__, we don't need to check it again. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 09798eb9479da3413bdf96e7d22a84d8b21e05e1 Author: David S. Miller Date: Wed Jan 5 13:08:06 2011 -0800 atyfb: Fix bootup hangs on sparc64. After commit 25edd6946a1d74e5e77813c2324a0908c68bcf9e ("sparc64: Get rid of indirect p1275 PROM call buffer.") we can't pass virtual addresses >4GB to PROM calls. Largely this is never necessary in drivers because we have a copy of the entire PROM device tree in the kernel and a set of of_*() interfaces to access it. Unfortunately there were some lingering prom calls in the atyfb driver, in particular prom_finddevice() was being called with an on-stack address which could be anywhere. This code is actually probing for information we already have, the PROM choosen console output device is stored in of_console_device so all of this nasty code consolidates into a one-line comparison. Next we have some prom_getintdefault() calls which are trivially transformed into the equivalent of_getintprop_default(). Special thanks to Fabio, who figured out exactly where the bootup was hanging. That made this bug trivial to fix. Reported-by: Fabio M. Di NItto Reported-by: Sam Ravnborg Reported-by: Frans van Berckel Signed-off-by: David S. Miller Signed-off-by: Fabio M. Di NItto commit f88de8de5a8c8a8a73960d4432ceef2d38b7f86f Author: Changli Gao Date: Sat Dec 25 03:41:30 2010 +0000 net: bridge: check the length of skb after nf_bridge_maybe_copy_header() Since nf_bridge_maybe_copy_header() may change the length of skb, we should check the length of skb after it to handle the ppoe skbs. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 38cfb907a55f3223445151b517b6e4678b8c9d66 Author: Ferenc Wagner Date: Thu Jan 6 05:11:20 2011 +0000 netconsole: clarify stopping message Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller commit 141dfba342b672588799432d74a3b6be88b5d713 Author: Ferenc Wagner Date: Thu Jan 6 05:11:19 2011 +0000 netconsole: don't announce stopping if nothing happened Signed-off-by: Ferenc Wagner Signed-off-by: David S. Miller commit 68d7c1aa2fee6acb11fcb826a207e4b81d8a1f57 Author: Michael Chan Date: Wed Jan 5 15:14:13 2011 +0000 cnic: Fix the type field in SPQ messages The new firmware interface requires each Slow Path Queue (SPQ) message's type field to include the function number. The existing code does not do this consistently. We fix this by OR'ing in the function number into the type field centrally in cnic_submit_kwqe_16(). Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit cba85b532e4aabdb97f44c18987d45141fd93faa Author: Pablo Neira Ayuso Date: Thu Jan 6 11:25:00 2011 -0800 netfilter: fix export secctx error handling In 1ae4de0cdf855305765592647025bde55e85e451, the secctx was exported via the /proc/net/netfilter/nf_conntrack and ctnetlink interfaces instead of the secmark. That patch introduced the use of security_secid_to_secctx() which may return a non-zero value on error. In one of my setups, I have NF_CONNTRACK_SECMARK enabled but no security modules. Thus, security_secid_to_secctx() returns a negative value that results in the breakage of the /proc and `conntrack -L' outputs. To fix this, we skip the inclusion of secctx if the aforementioned function fails. This patch also fixes the dynamic netlink message size calculation if security_secid_to_secctx() returns an error, since its logic is also wrong. This problem exists in Linux kernel >= 2.6.37. Signed-off-by: Pablo Neira Ayuso Signed-off-by: David S. Miller commit f682cefa5ad204d3bfaa54a58046c66d2d035ac1 Author: Changli Gao Date: Wed Jan 5 04:23:23 2011 +0000 netfilter: fix the race when initializing nf_ct_expect_hash_rnd Since nf_ct_expect_dst_hash() may be called without nf_conntrack_lock locked, nf_ct_expect_hash_rnd should be initialized in the atomic way. In this patch, we use nf_conntrack_hash_rnd instead of nf_ct_expect_hash_rnd. Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 6623e3b24a5ebb07e81648c478d286a1329ab891 Author: Eric Dumazet Date: Wed Jan 5 07:52:55 2011 +0000 ipv4: IP defragmentation must be ECN aware RFC3168 (The Addition of Explicit Congestion Notification to IP) states : 5.3. Fragmentation ECN-capable packets MAY have the DF (Don't Fragment) bit set. Reassembly of a fragmented packet MUST NOT lose indications of congestion. In other words, if any fragment of an IP packet to be reassembled has the CE codepoint set, then one of two actions MUST be taken: * Set the CE codepoint on the reassembled packet. However, this MUST NOT occur if any of the other fragments contributing to this reassembly carries the Not-ECT codepoint. * The packet is dropped, instead of being reassembled, for any other reason. This patch implements this requirement for IPv4, choosing the first action : If one fragment had NO-ECT codepoint reassembled frame has NO-ECT ElIf one fragment had CE codepoint reassembled frame has CE Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9c86c0f4ba49b39f909d7f18731b91e563e07065 Author: Axel Lin Date: Tue Jan 4 22:40:04 2011 +0000 net: r6040: Return proper error for r6040_init_one Return -ENOMEM instead of 0 for the case of mdiobus_alloc and kmalloc failure. Signed-off-by: Axel Lin Acked-by: Florian Fainelli Signed-off-by: David S. Miller commit 2a8fe003741aa90b6b9453e90af4bbb7bc42918c Author: Dan Carpenter Date: Tue Jan 4 21:03:44 2011 +0000 dcb: use after free in dcb_flushapp() The original code has a use after free bug because it's not using the _safe() version of the list_for_each_entry() macro. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 70bfa2d2e1bfd90ef26758b5e2749f043a940037 Author: Dan Carpenter Date: Tue Jan 4 21:03:12 2011 +0000 dcb: unlock on error in dcbnl_ieee_get() There is a "goto nla_put_failure" hidden inside the NLA_PUT() macro, but we're holding the dcb_lock so we need to unlock first. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit cb600d2f83c854ec3d6660063e4466431999489b Merge: 47935a7 d50d8fe Author: Linus Torvalds Date: Thu Jan 6 11:12:17 2011 -0800 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: x86, mm: Initialize initial_page_table before paravirt jumps commit 0c6610017459ed9642548694fe88971d3f4206aa Author: Axel Lin Date: Tue Jan 4 19:24:06 2011 +0000 net: ixp4xx_eth: Return proper error for eth_init_one Return PTR_ERR(port->phydev) instead of 1 if phy_connect failed. Signed-off-by: Axel Lin Acked-by: Krzysztof Halasa Signed-off-by: David S. Miller commit 47935a731b7b850a4c6c0e55ed0741e3dd25d889 Merge: 77a0dd5 3fb82d5 fd35fbc 9e76a97 c8217b8 3cf9b85 f6cd247 Author: Linus Torvalds Date: Thu Jan 6 11:11:50 2011 -0800 Merge branches 'x86-alternatives-for-linus', 'x86-fpu-for-linus', 'x86-hwmon-for-linus', 'x86-paravirt-for-linus', 'core-locking-for-linus' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-alternatives-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86-64, asm: Use fxsaveq/fxrestorq in more places * 'x86-hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, hwmon: Add core threshold notification to therm_throt.c * 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, paravirt: Use native_halt on a halt, not native_safe_halt * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking, lockdep: Convert sprintf_symbol to %pS * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: Better struct irqaction layout commit 238c855805c853eaec95b0bc3065effb64f955a0 Author: Henry Ptasinski Date: Tue Jan 4 16:07:14 2011 +0000 include/linux/if_ether.h: Add #define ETH_P_LINK_CTL for HPNA and wlan local tunnel Ethertype used by HPNA control protocols (LARQ, rate, link, etc) and by Broadcom wlan drivers for local signalling. Signed-off-by: Henry Ptasinski Signed-off-by: David S. Miller commit 77a0dd54ba3c86b00ab7079bc3be5d82395ecab2 Merge: d7a5a18 cfa6091 Author: Linus Torvalds Date: Thu Jan 6 11:09:57 2011 -0800 Merge branch 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, UV, BAU: Extend for more than 16 cpus per socket x86, UV: Fix the effect of extra bits in the hub nodeid register x86, UV: Add common uv_early_read_mmr() function for reading MMRs commit d7a5a18190d6f523b5d795bfd73f83cf13a3a383 Merge: 4f00b90 a8760ec Author: Linus Torvalds Date: Thu Jan 6 11:08:14 2011 -0800 Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check tsc available/disabled in the delayed init function x86: Improve TSC calibration using a delayed workqueue x86: Make tsc=reliable override boot time stability checks commit 7e12eddb73d4f288b0339ee13832a34d6bc4fd90 Author: Pavel Shilovsky Date: Thu Nov 25 17:20:20 2010 +0300 CIFS: Simplify cifs_open code Make the code more general for use in posix and non-posix open. Reviewed-by: Jeff Layton Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French commit eeb910a6d46103594eb63e6eba1aeb02022368a4 Author: Pavel Shilovsky Date: Thu Nov 25 15:12:39 2010 +0300 CIFS: Simplify non-posix open stuff (try #2) Delete cifs_open_inode_helper and move non-posix open related things to cifs_nt_open function. Reviewed-by: Jeff Layton Signed-off-by: Pavel Shilovsky Signed-off-by: Steve French commit 4b886136df2b923b6fc6b2d83faa9554e84e05ab Author: Pavel Shilovsky Date: Mon Dec 13 22:18:07 2010 +0300 CIFS: Add match_port check during looking for an existing connection (try #4) If we have a share mounted by non-standard port and try to mount another share on the same host with standard port, we connect to the first share again - that's wrong. This patch fixes this bug. Signed-off-by: Pavel Shilovsky Reviewed-by: Jeff Layton Signed-off-by: Steve French commit a9f1b85e5ba80519dea6974e3574fa7a30cc5e29 Author: Pavel Shilovsky Date: Mon Dec 13 19:08:35 2010 +0300 CIFS: Simplify ipv*_connect functions into one (try #4) Make connect logic more ip-protocol independent and move RFC1001 stuff into a separate function. Also replace union addr in TCP_Server_Info structure with sockaddr_storage. Signed-off-by: Pavel Shilovsky Reviewed-and-Tested-by: Jeff Layton Signed-off-by: Steve French commit df8fbc241aa3c451248b1f19fff3a3f604b107f9 Author: Shirish Pargaonkar Date: Sat Dec 11 14:19:22 2010 -0600 cifs: Support NTLM2 session security during NTLMSSP authentication [try #5] Indicate to the server a capability of NTLM2 session security (NTLM2 Key) during ntlmssp protocol exchange in one of the bits of the flags field. If server supports this capability, send NTLM2 key even if signing is not required on the server. If the server requires signing, the session keys exchanged for NTLMv2 and NTLM2 session security in auth packet of the nlmssp exchange are same. Send the same flags in authenticate message (type 3) that client sent in negotiate message (type 1). Remove function setup_ntlmssp_neg_req Make sure ntlmssp negotiate and authenticate messages are zero'ed before they are built. Reported-and-Tested-by: Robbert Kouprie Signed-off-by: Shirish Pargaonkar Acked-by: Jeff Layton Signed-off-by: Steve French commit 262f86adcc0665872812a7458a5d03e19e0efe33 Author: Nick Piggin Date: Thu Nov 11 18:42:16 2010 +1100 cifs: don't overwrite dentry name in d_revalidate Instead, use fatfs's method for dealing with negative dentries to preserve case, rather than overwrite dentry name in d_revalidate, which is a bit ugly and also gets in the way of doing lock-free path walking. Signed-off-by: Nick Piggin Signed-off-by: Steve French commit 4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e Merge: b4c6e2e 94462ad Author: Linus Torvalds Date: Thu Jan 6 11:07:33 2011 -0800 Merge branch 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-security-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: module: Move RO/NX module protection to after ftrace module update x86: Resume trampoline must be executable x86: Add RO/NX protection for loadable kernel modules x86: Add NX protection for kernel data x86: Fix improper large page preservation commit b4c6e2ea5e46b03c764a918f4999a77a3149979f Merge: 6f46b12 991cfff Author: Linus Torvalds Date: Thu Jan 6 11:06:31 2011 -0800 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: x86, earlyprintk: Move mrst early console to platform/ and fix a typo x86, apbt: Setup affinity for apb timers acting as per-cpu timer ce4100: Add errata fixes for UART on CE4100 x86: platform: Move iris to x86/platform where it belongs x86, mrst: Check platform_device_register() return code x86/platform: Add Eurobraille/Iris power off support x86, mrst: Add explanation for using 1960 as the year offset for vrtc x86, mrst: Fix dependencies of "select INTEL_SCU_IPC" x86, mrst: The shutdown for MRST requires the SCU IPC mechanism x86: Ce4100: Add reboot_fixup() for CE4100 ce4100: Add PCI register emulation for CE4100 x86: Add CE4100 platform support x86: mrst: Set vRTC's IRQ to level trigger type x86: mrst: Add audio driver bindings rtc: Add drivers/rtc/rtc-mrst.c x86: mrst: Add vrtc driver which serves as a wall clock device x86: mrst: Add Moorestown specific reboot/shutdown support x86: mrst: Parse SFI timer table for all timer configs x86/mrst: Add SFI platform device parsing code commit 6f46b120a96212b85cbdcb84a64c854dfd791ede Merge: 4e1db5e c7657ac Author: Linus Torvalds Date: Thu Jan 6 11:06:09 2011 -0800 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: Cleanup code a bit x86, microcode, AMD: Replace vmalloc+memset with vzalloc commit 4e1db5e58af8bc6ab4a651df279add41c48d3fc2 Merge: 37d9a8c eb48c9c Author: Linus Torvalds Date: Thu Jan 6 11:05:21 2011 -0800 Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: apic, amd: Make firmware bug messages more meaningful mce, amd: Remove goto in threshold_create_device() mce, amd: Add helper functions to setup APIC mce, amd: Shorten local variables mci_misc_{hi,lo} mce, amd: Implement mce_threshold_block_init() helper function commit 37d9a8c5ea8fc063841c133fc53cc168ee620762 Merge: 017892c 79250af Author: Linus Torvalds Date: Thu Jan 6 10:56:02 2011 -0800 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 included-by file reference comments x86, cpu: Only CPU features determine NX capabilities x86, cpu: Call verify_cpu during 32bit CPU startup x86, cpu: Clear XD_DISABLED flag on Intel to regain NX x86, cpu: Rename verify_cpu_64.S to verify_cpu.S commit 5f9251cb93237c9578160df9acc6ce9948ad8c52 Merge: 2c6607c 06778b1 Author: David S. Miller Date: Thu Jan 6 10:55:42 2011 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 2c6607c611cb7bf0a6750bcea34a258144e302c5 Author: Eric Dumazet Date: Thu Jan 6 10:54:29 2011 -0800 net: add POLLPRI to sock_def_readable() Leonardo Chiquitto found poll() could block forever on tcp sockets and Urgent data was received, if the event flag only contains POLLPRI. He did a bisection and found commit 4938d7e0233 (poll: avoid extra wakeups in select/poll) was the source of the problem. Problem is TCP sockets use standard sock_def_readable() function for their sk_data_ready() handler, and sock_def_readable() doesnt signal POLLPRI. Only TCP is affected by the problem. Adding POLLPRI to the list of flags might trigger unnecessary schedules, but URGENT handling is such a seldom used feature this seems a good compromise. Thanks a lot to Leonardo for providing the bisection result and a test program as well. Reference : http://www.spinics.net/lists/netdev/msg151793.html Reported-and-bisected-by: Leonardo Chiquitto Signed-off-by: Eric Dumazet Tested-by: Eric Dumazet Signed-off-by: David S. Miller commit 017892c341033b3e961e695bc0bf1a815efcf92e Merge: 42cbd8e cb2ded3 Author: Linus Torvalds Date: Thu Jan 6 10:51:36 2011 -0800 Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation x86, acpi: Add MAX_LOCAL_APIC for 32bit x86: io_apic: Split setup_ioapic_ids_from_mpc() x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings() x86: Allow platforms to force enable apic commit 42cbd8efb0746b55112de45173219f76c54390da Merge: dda5f0a f658bcf Author: Linus Torvalds Date: Thu Jan 6 10:50:28 2011 -0800 Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, cacheinfo: Cleanup L3 cache index disable support x86, amd-nb: Cleanup AMD northbridge caching code x86, amd-nb: Complete the rename of AMD NB and related code commit 568389c257fa7d74ce36c2f78bad31965fded4cf Author: Thomas Gleixner Date: Fri Dec 17 11:16:17 2010 +0100 serial: apbuart: Fixup apbuart_console_init() commit 35c64e5d (drivers: serial: apbuart: Handle OF failures gracefully) missed that the modified grlib_apbuart_configure() function is called from apbuart_console_init() as well. Fix the fallout. Reported-by: Stephen Rothwell Signed-off-by: Thomas Gleixner Signed-off-by: Greg Kroah-Hartman commit dda5f0a372873bca5f0b1d1866d7784dffd8b675 Merge: 65b2074 88606e8 Author: Linus Torvalds Date: Thu Jan 6 10:42:43 2011 -0800 Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: MAINTAINERS: Update timer related entries timers: Use this_cpu_read timerqueue: Make timerqueue_getnext() static inline hrtimer: fix timerqueue conversion flub hrtimers: Convert hrtimers to use timerlist infrastructure timers: Fixup allmodconfig build issue timers: Rename timerlist infrastructure to timerqueue timers: Introduce timerlist infrastructure. hrtimer: Remove stale comment on curr_timer timer: Warn when del_timer_sync() is called in hardirq context timer: Del_timer_sync() can be used in softirq context timer: Make try_to_del_timer_sync() the same on SMP and UP posix-timers: Annotate lock_timer() timer: Permit statically-declared work with deferrable timers time: Use ARRAY_SIZE macro in timecompare.c timer: Initialize the field slack of timer_list timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS time: Compensate for rounding on odd-frequency clocksources Fix up trivial conflict in MAINTAINERS commit 65b2074f84be2287e020839e93b4cdaaf60eb37c Merge: 28d9bfc 6bf4123 Author: Linus Torvalds Date: Thu Jan 6 10:23:33 2011 -0800 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: (30 commits) sched: Change wait_for_completion_*_timeout() to return a signed long sched, autogroup: Fix reference leak sched, autogroup: Fix potential access to freed memory sched: Remove redundant CONFIG_CGROUP_SCHED ifdef sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight sched: Move periodic share updates to entity_tick() printk: Use this_cpu_{read|write} api on printk_pending sched: Make pushable_tasks CONFIG_SMP dependant sched: Add 'autogroup' scheduling feature: automated per session task groups sched: Fix unregister_fair_sched_group() sched: Remove unused argument dest_cpu to migrate_task() mutexes, sched: Introduce arch_mutex_cpu_relax() sched: Add some clock info to sched_debug cpu: Remove incorrect BUG_ON cpu: Remove unused variable sched: Fix UP build breakage sched: Make task dump print all 15 chars of proc comm sched: Update tg->shares after cpu.shares write sched: Allow update_cfs_load() to update global load sched: Implement demand based update_cfs_load() ... commit 28d9bfc37c861aa9c8386dff1ac7e9a10e5c5162 Merge: f3b0cfa 4b95f13 Author: Linus Torvalds Date: Thu Jan 6 10:17:26 2011 -0800 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: (146 commits) tools, perf: Documentation for the power events API perf: Add calls to suspend trace point perf script: Make some lists static perf script: Use the default lost event handler perf session: Warn about errors when processing pipe events too perf tools: Fix perf_event.h header usage perf test: Clarify some error reports in the open syscall test x86, NMI: Add touch_nmi_watchdog to io_check_error delay x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time x86: Only call smp_processor_id in non-preempt cases perf timechart: Adjust perf timechart to the new power events perf: Clean up power events by introducing new, more generic ones perf: Do not export power_frequency, but power_start event perf test: Add test for counting open syscalls perf evsel: Auto allocate resources needed for some methods perf evsel: Use {cpu,thread}_map to shorten list of parameters perf tools: Refactor all_tids to hold nr and the map perf tools: Refactor cpumap to hold nr and the map perf evsel: Introduce per cpu and per thread open helpers perf evsel: Steal the counter reading routines from stat ... commit f3b0cfa9b017a9d4686c9b14b908a1685f97a077 Merge: 2af49b6 5bdb05f Author: Linus Torvalds Date: Thu Jan 6 10:07:05 2011 -0800 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: futex: Add futex_q static initializer futex: Replace fshared and clockrt with combined flags futex: Cleanup stale fshared flag interfaces commit 2af49b6058d857fa5b476db642d4452bf5833ecd Merge: b08b272 394f452 Author: Linus Torvalds Date: Thu Jan 6 10:06:26 2011 -0800 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: rcu: remove unused __list_for_each_rcu() macro rculist: fix borked __list_for_each_rcu() macro rcu: reduce __call_rcu()-induced contention on rcu_node structures rcu: limit rcu_node leaf-level fanout rcu: fine-tune grace-period begin/end checks rcu: Keep gpnum and completed fields synchronized rcu: Stop chasing QS if another CPU did it for us rcu: increase synchronize_sched_expedited() batching rcu: Make synchronize_srcu_expedited() fast if running readers rcu: fix race condition in synchronize_sched_expedited() rcu: update documentation/comments for Lai's adoption patch rcu,cleanup: simplify the code when cpu is dying rcu,cleanup: move synchronize_sched_expedited() out of sched.c rcu: get rid of obsolete "classic" names in TREE_RCU tracing rcu: Distinguish between boosting and boosted rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing. rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU rcu: priority boosting for TINY_PREEMPT_RCU rcu: move TINY_RCU from softirq to kthread rcu: add priority-inversion testing to rcutorture commit b08b27213384d1bd6eda04a2b6f788b4cdee0f34 Merge: 8484baa 846f404 Author: Linus Torvalds Date: Thu Jan 6 10:01:23 2011 -0800 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 flush delete workqueue when releasing the transaction lock GFS2: fsck.gfs2 reported statfs error after gfs2_grow GFS2: Merge glock state fields into a bitfield GFS2: Fix uninitialised error value in previous patch GFS2: fix recursive locking during rindex truncates GFS2: reread rindex when necessary to grow rindex GFS2: Remove duplicate #defines from glock.h GFS2: Clean up of gdlm_lock function GFS2: Allow gfs2 to update quota usage values through the quotactl interface GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg GFS2: fs/gfs2/glock.c: Use printf extension %pV GFS2: Clean up duplicated setattr code GFS2: Remove unreachable calls to vmtruncate GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM commit 8484baaa5065b460e5eb18ee721d8417251f7897 Author: Randy Dunlap Date: Wed Jan 5 16:28:43 2011 -0800 kernel-doc: code reorganization Move 'main' code vs. subroutines around so that they are not so intermixed, for better readability/understanding (relative to Perl). It was messy to follow the primary flow of code execution with the code being mixed. Now the code begins with data initialization, followed by all subroutines, then ends with the main code execution. This is almost totally source code movement, with a few changes as needed for forward declarations. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit d5ba92b7958e3ff2f0878e45b9b42cb6976853dd Author: Nicolas Kaiser Date: Wed Jan 5 16:27:53 2011 -0800 Documentation: update kernel-docs.txt Fixed typos, and removed duplicated entries. Signed-off-by: Nicolas Kaiser Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a40649781b9c10e192fad9f00a60c6d946da553f Author: Michael Prokop Date: Wed Jan 5 16:27:15 2011 -0800 Documentation/dontdiff: add further autogenerated files to ignore list Mainly resulting from (but not limited to) autogenerated files of lib/raid6 and drivers/gpu/drm/radeon. List generated as result of a diff of a clean 2.6.36 tree against a built one. Signed-off-by: Michael Prokop Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a4264b3f4049ae7aeeb0017f8158119e22fa354f Author: Jesper Juhl Date: Sun Dec 12 23:18:15 2010 +0100 UDF: Close small mem leak in udf_find_entry() Hi, There's a small memory leak in fs/udf/namei.c::udf_find_entry(). We dynamically allocate memory for 'fname' with kmalloc() and in most situations we free it before we leave the function, but there is one situation where we do not (but should). This patch closes the leak by jumping to the 'out_ok' label which does the correct cleanup rather than doing half the cleanup and returning directly. Signed-off-by: Jesper Juhl Signed-off-by: Jan Kara commit 4651c5900e7a3c84d4b70412f8bbc40c1bcb50cf Author: Jan Kara Date: Thu Nov 25 03:56:24 2010 +0100 udf: Fix directory corruption after extent merging If udf_bread() called from udf_add_entry() managed to merge created extent to an already existing one (or if previous extents could be merged), the code truncating the last extent to proper size would just overwrite the freshly allocated extent with an extent that used to be in that place. This obviously results in a directory corruption. Fix the problem by properly reloading the last extent. Signed-off-by: Jan Kara commit 8754a3f718f08dc21b3c5eccd044f612d4bc1ab1 Author: Jan Kara Date: Tue Nov 16 14:33:48 2010 +0100 udf: Protect udf_file_aio_write from possible races Code doing conversion from INICB file to a normal file in udf_file_aio_write() is not protected by any lock from other code modifying the inode. Use i_alloc_sem for that. Reported-by: Alessio Igor Bogani Signed-off-by: Jan Kara commit 9db9f9e31d7661dff35a75ed01ff9fc0d6acdaf8 Author: Alessio Igor Bogani Date: Tue Nov 16 18:40:49 2010 +0100 udf: Remove unnecessary bkl usages The udf_readdir(), udf_lookup(), udf_create(), udf_mknod(), udf_mkdir(), udf_rmdir(), udf_link(), udf_get_parent() and udf_unlink() seems already adequately protected by i_mutex held by VFS invoking calls. The udf_rename() instead should be already protected by lock_rename again by VFS. The udf_ioctl(), udf_fill_super() and udf_evict_inode() don't requires any further protection. This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani Signed-off-by: Jan Kara commit 7db09be629033b79792a1bf18f505f5f15914395 Author: Alessio Igor Bogani Date: Tue Nov 16 18:40:48 2010 +0100 udf: Use of s_alloc_mutex to serialize udf_relocate_blocks() execution This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani Signed-off-by: Jan Kara commit 4d0fb621d35007c19a396f2bb629e5aeaacef2d0 Author: Alessio Igor Bogani Date: Tue Nov 16 18:40:47 2010 +0100 udf: Replace bkl with the UDF_I(inode)->i_data_sem for protect udf_inode_info struct Replace bkl with the UDF_I(inode)->i_data_sem rw semaphore in udf_release_file(), udf_symlink(), udf_symlink_filler(), udf_get_block(), udf_block_map(), and udf_setattr(). The rule now is that any operation on regular file's or symlink's extents (or generally allocation information including goal block) needs to hold i_data_sem. This work was supported by a hardware donation from the CE Linux Forum. Signed-off-by: Alessio Igor Bogani Signed-off-by: Jan Kara commit d1668fe390c1e84580575965684a8fa7e4626dee Author: Jan Kara Date: Wed Oct 20 23:24:12 2010 +0200 udf: Remove BKL from free space counting functions udf_count_free_bitmap() does not need BKL because bitmaps are in a fixed place on disk and so we can count set bits without serialization. udf_count_free_table() is now protected by s_alloc_mutex instead of BKL to get a consistent view of free space extents. Signed-off-by: Jan Kara commit 7abc2e45e48ca04206949682402d5d55bc64a16b Author: Jan Kara Date: Wed Oct 20 22:32:02 2010 +0200 udf: Call udf_add_free_space() for more blocks at once in udf_free_blocks() There's no need to call udf_add_free_space() for one block at a time. It saves us noticeable amount of work and yields different result from the original code only if the filesystem is corrupted and bitmap bit is already cleared. In such case counter of free blocks is probably wrong anyways so the change does not matter. Signed-off-by: Jan Kara commit 0484b1cedc053cf88a046da5f08bc00747e533cb Author: Jan Kara Date: Wed Oct 20 22:22:57 2010 +0200 udf: Remove BKL from udf_put_super() and udf_remount_fs() udf_put_super() does not need BKL because the filesystem is shut down so there's nothing to race with. The credential changes in udf_remount_fs() and LVID changes are now protected by dedicated locks so we can remove BKL from this function as well. Signed-off-by: Jan Kara commit c03cad241af63445b751781a09faf08b3a5b77c1 Author: Jan Kara Date: Wed Oct 20 22:17:28 2010 +0200 udf: Protect default inode credentials by rwlock Superblock carries credentials (uid, gid, etc.) which are used as default values in __udf_read_inode() when media does not provide these. These credentials can change during remount so we protect them by a rwlock so that each inode gets a consistent set of credentials. Signed-off-by: Jan Kara commit 949f4a7c08bc4a050eae7aeeac3e6d019d1feafb Author: Jan Kara Date: Wed Oct 20 18:49:20 2010 +0200 udf: Protect all modifications of LVID with s_alloc_mutex udf_open_lvid() and udf_close_lvid() were modifying LVID without s_alloc_mutex. Since they can be called from remount, the modification could race with other filesystem modifications of LVID so protect them by s_alloc_mutex just to be sure. Signed-off-by: Jan Kara commit d664b6af609ecf5e7dcedf92f0bf188e3a29b3e0 Author: Jan Kara Date: Wed Oct 20 18:28:46 2010 +0200 udf: Move handling of uniqueID into a helper function and protect it by a s_alloc_mutex uniqueID handling has been duplicated in three places. Move it into a common helper. Since we modify an LVID buffer with uniqueID update, we take sbi->s_alloc_mutex to protect agaist other modifications of the structure. Signed-off-by: Jan Kara commit 49521de119d326d04fb3736ab827e12e1de966d0 Author: Jan Kara Date: Wed Oct 20 17:42:44 2010 +0200 udf: Remove BKL from udf_update_inode udf_update_inode() does not need BKL since on-disk inode modifications are protected by the buffer lock and reading of values of in-memory inode is safe without any lock. In some cases we can write inconsistent inode state to disk but in that case inode will be marked dirty and overwritten later. Also make unnecessarily global udf_sync_inode() static. Signed-off-by: Jan Kara commit f2a6cc1f146465e13f31d9163d542d1facf4e203 Author: Jan Kara Date: Wed Oct 20 17:25:59 2010 +0200 udf: Convert UDF_SB(sb)->s_flags to use bitops Use atomic bitops to manipulate with sb flags to make manipulation safe without any locking. Signed-off-by: Jan Kara commit fab3c8581fc49998f8d0d349b70813d9712fb405 Author: Joe Perches Date: Wed Nov 10 15:46:18 2010 -0800 fs/udf: Add printf format/argument verification Add __attribute__((format... to udf_warning. All arguments matched formats, no other changes necessary. Signed-off-by: Joe Perches Signed-off-by: Jan Kara commit ed2ae6f69148dcf9da725364e17184f27ba04dc2 Author: Joe Perches Date: Thu Nov 4 20:08:04 2010 -0700 fs/udf: Use vzalloc Signed-off-by: Joe Perches Signed-off-by: Jan Kara commit 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d Author: Dan Carpenter Date: Thu Jan 6 17:05:36 2011 +0300 mtd: pxa3xx_nand: NULL dereference in pxa3xx_nand_probe "info->cmdset" gets dereferenced in __readid() so it needs to be initialized earlier in the function. This bug was introduced in 18c81b1828f8 "mtd: pxa3xx_nand: remove the flash info in driver structure". Cc: stable@kernel.org [2.6.37+] Reported-and-tested-by: Sven Neumann Signed-off-by: Dan Carpenter Signed-off-by: David Woodhouse commit a121f643993474548fe98144514c50dd4f3dbe76 Author: Anatolij Gustschin Date: Thu Dec 16 23:42:19 2010 +0100 UBI: use mtd->writebufsize to set minimal I/O unit size Previously we used mtd->writesize field to set UBI's minimal I/O unit size. This sometimes caused UBIFS recovery issues when mounting an uncleanly unmounted UBIFS partition on NOR flash since mtd->writesize is 1 byte for NOR flash. The MTD CFI driver however often performs writing multiple bytes in one programming operation using the chip's write buffer. We have to use the size of this write buffer as a minimal I/O unit size for UBI on NOR flash to fix the observed UBIFS recovery issues. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 7fa33ac0a7e24a1b8bd71be5c47a17423c62fbda Author: Anatolij Gustschin Date: Thu Dec 16 23:42:18 2010 +0100 mtd: initialize writebufsize in the MTD object of a partition Propagate the writebufsize to the partition's MTD object so that UBI can set correct value for it's minimal I/O size using the writebufsize field of MTD object of the partition. By previous patches we added proper writebufsize field initialization. Next patch can now change UBI to use this field for setting the minimal I/O size. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 25dcd29786d3fbd5751dc3c5b8109d930ea2d312 Author: Anatolij Gustschin Date: Thu Dec 16 23:42:17 2010 +0100 mtd: onenand: add mtd->writebufsize initialization Initialize mtd->writebufsize to be equal to mtd->writesize. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit cbcab65a17319246dc360f6b5fac5f7b474b9821 Author: Anatolij Gustschin Date: Thu Dec 16 23:42:16 2010 +0100 mtd: nand: add mtd->writebufsize initialization Initialize mtd->writebufsize to be equal to mtd->writesize. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit d261c72ae03066dc4798c085e904f7dc996a10fb Author: Anatolij Gustschin Date: Thu Dec 16 23:42:15 2010 +0100 mtd: cfi: add writebufsize initialization Initialize mtd->writebufsize to the value obtained by CFI query command at probe time. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 0e4ca7e5101e7f4054452b8d71c535eec64a187b Author: Anatolij Gustschin Date: Thu Dec 16 23:42:14 2010 +0100 mtd: add writebufsize field to mtd_info struct This field will be used to indicate the write buffer size of the MTD device. UBI will set it's minimal I/O unit size (min_io_size) to the indicated write buffer size. By this change we intend to fix failed recovery of UBIFS partitions we currently observe on NOR flash when mounting the partition after unclean unmount. Currently the min_io_size is set to mtd->writesize (which is 1 byte for NOR flash). But flash programming is often done from prepared write buffer containing multiple bytes and is performed in one programming operation which could be interrupted by a power cut or a system reset causing corrupted (partially written) areas in a flash sector. Knowing the size of potentially corrupted areas UBIFS scanning and recovery algorithms are able to perform successful recovery. In case of NOR flash minimal I/O size must be equal to the maximal size of the write buffer used by embedded flash programming algorithm. In case of NAND flash mtd->writebufsize should be equivalent to mtd->writesize. The subsequent patches will add mtd->writebufsize initialization where needed. Signed-off-by: Anatolij Gustschin Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 9ac4e613a88d7f6a7a9651d863e9c8f63b582718 Author: Adrian Hunter Date: Fri Feb 19 15:39:53 2010 +0100 mtd: OneNAND: OMAP2/3: prevent regulator sleeping while OneNAND is in use Prevent OneNAND's voltage regulator from going to sleep while OneNAND is in use, by explicitly enabling and disabling the regulator as appropriate. Signed-off-by: Adrian Hunter Signed-off-by: David Woodhouse commit cf24dc85ff29a41abd8e73730e5feb22b2666bd3 Author: Adrian Hunter Date: Fri Feb 19 15:39:52 2010 +0100 mtd: OneNAND: add enable / disable methods to onenand_chip Add enable / disable methods called from get_device() / release_device(). These can be used, for example, to allow the driver to prevent the voltage regulator from being put to sleep while OneNAND is in use. Signed-off-by: Adrian Hunter Signed-off-by: David Woodhouse commit 8fffed8cfdd511056cb17c70f525017fbb643b94 Author: Aleksandr Koltsoff Date: Tue Jan 4 10:42:35 2011 +0200 mtd: m25p80: Fix JEDEC ID for AT26DF321 The last byte of the ID should be zero for this chip. Was added in commit d0e8c47c58575b9131e786edb488fd029eba443e . Reported by Tomi Varjo. Signed-off-by: Aleksandr Koltsoff Signed-off-by: David Woodhouse commit 24ac9a94f9e21ea71d877b0c80867d625b68bec2 Author: Ralf Rösch Date: Thu Dec 30 10:30:11 2010 +0100 mtd: txx9ndfmc: limit transfer bytes to 512 (ECC provides 6 bytes max) See commit: c0cbfd0e81d879a950ba6f0df3f75ea30c5ab16e Using __nand_correct_data() helper function, this driver can read 512 byte (with 6 byte ECC) at a time. This is correct, but not more: With NAND chips providing page sizes > 512 Bytes chip->ecc.bytes are calculated > 6 in txx9ndfmc_nand_scan. According the data sheet there are (only) 6 bytes ECC available. After applying the patch a Hynix 512M*8 with 2KiB page size could be successfully formatted and used with an ubifs file system. Signed-off-by: Ralf Roesch Signed-off-by: Artem Bityutskiy Acked-by: Atsushi Nemoto Signed-off-by: David Woodhouse commit e8953b7395089b917f30d0909f845664d5fafa4e Author: Guillaume LECERF Date: Fri Dec 17 10:59:47 2010 +0100 mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips These chips report CFI v3.3 [1], so patch them on the fly to the more correct v1.3. Discussed and tested by the OpenWRT people [2]. [1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/32Mbit/K8D3216UBC/ds_K8D3x16UxC_rev17.pdf [2] https://dev.openwrt.org/ticket/866 Signed-off-by: Guillaume LECERF Acked-by: Wolfram Sang Signed-off-by: David Woodhouse commit e637276370cb11068ab185c342eac5a78e5415b4 Author: Guillaume LECERF Date: Fri Dec 17 10:59:41 2010 +0100 mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips These chips report CFI v0.0 [1], so extend cfi_fixup_major_minor() to patch all Samsung chips from 0.0 to 1.0. Discussed and tested by the OpenWRT people [2]. [1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/64Mbit/K8D6316UTM/ds_K8D6x16UxM_rev16.pdf [2] https://dev.openwrt.org/ticket/7348 Signed-off-by: Guillaume LECERF Acked-by: Wolfram Sang Signed-off-by: David Woodhouse commit eaca491f75af5afa9265a6bdfcbbfff6837634ab Author: Janusz Krzysztofik Date: Wed Dec 15 15:43:44 2010 +0100 mtd: nand: ams-delta: drop omap_read/write, use ioremap There is a common requirement for not using OMAP specific omap_readw() / omap_writew() function calls in drivers/, but replace them with readw() / writew() on ioremap()ped addresses passed from arch/ instead. The patch implements this idea for the Amstrad Delta NAND driver. To be able to use the modified driver, the board file is updated with the platform device I/O resource declaration, which is passed from there. Created and tested against linux-2.6.37-rc5, on top of recent patch 'MTD: NAND: ams-delta: convert to platform driver'. Signed-off-by: Janusz Krzysztofik Acked-by: Tony Lindgren Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit dcf12463c3416b4a8fc84545233424df0a91e406 Author: Nicolas Ferre Date: Wed Dec 15 12:59:32 2010 +0100 mtd: m25p80: add debugging trace in sst_write Add a DEBUG(MTD_DEBUG_LEVEL2, ..) trace at beginning of sst_write() function as it is done in m25p80_write() function. Signed-off-by: Nicolas Ferre Signed-off-by: David Woodhouse commit 494f45d55bf47d7130e8d9818e9a8965f6504462 Author: Janusz Krzysztofik Date: Wed Dec 15 12:58:15 2010 +0100 mtd: nand: ams-delta: select for built-in by default Now that the Amstrad Delta NAND driver is converted to a platform driver, which prevents it from interfering with other unrelated hardware in multiple OMAP1 cpu and machine configurations, it can be automatically configured for being built into the kernel if the Amstrad Delta board is also selected. Signed-off-by: Janusz Krzysztofik Signed-off-by: David Woodhouse commit e0c1a921f62d22d1aa62c72ddb793f898945ff5a Author: Adrian Hunter Date: Fri Dec 10 12:04:20 2010 +0200 mtd: OneNAND: lighten scary initial bad block messages Initial bad blocks are normal but the messages look like errors. Make the messages less scary, make the main message an informational message not a warning, make the message displaying registers a debug message and include the address there instead of in the informational message. Signed-off-by: Adrian Hunter Acked-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 263a8c8635445c0ede3cb22c98a1a12da4672ebc Author: Adrian Hunter Date: Wed Dec 30 07:40:16 2009 +0100 mtd: OneNAND: OMAP2/3: add support for command line partitioning Add the ability to parse MTD partition information from the kernel command line. Note that a pointless BUG_ON is removed, as are redundant calls to 'del_mtd_partitions()' and 'del_mtd_device()' because they are also done by 'onenand_release()'. Finally note that 'add_mtd_device()' returns 1 on failure so the error condition was incorrect. Signed-off-by: Adrian Hunter Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit b7b1a29d94c17e4341856381bccb4d17495bea60 Author: Brian Norris Date: Sun Dec 12 00:23:33 2010 -0800 mtd: nand: rearrange ONFI revision checking, add ONFI 2.3 In checking for the ONFI revision, the first conditional (for checking "unsupported" ONFI) seems unnecessary. All ONFI revisions should be backwards-compatible; even if this is not the case on some newer ONFI revision, it should simply fail the second version-checking if-else block (i.e., the bit-fields for 1.0, 2.0, etc. would not be set to 1). Thus, we move our "unsupported" condition after having checked each bit field. Also, it's simple enough to add a condition for ONFI revision 2.3. Note that this does *NOT* mean we handle all new features of ONFI versions above 1.0. Signed-off-by: Brian Norris Acked-by: Florian Fainelli Signed-off-by: David Woodhouse commit 0b524fb9314dc852d6a029296545ddbb17709a8b Author: Brian Norris Date: Sun Dec 12 00:23:32 2010 -0800 mtd: nand: choose correct chip name (ONFI bug) We have the order of the conditional wrong for choosing the ONFI chip name vs. the ID table name. Without this fix, we will almost *always* choose a NULL string to print out instead of the correct one. This has already been suggested by Matthieu Castet. Signed-off-by: Brian Norris Acked-by: Florian Fainelli Signed-off-by: David Woodhouse commit 7e95d1f1714cb993bc5b7e3a3d532b715b32d80a Author: Janusz Krzysztofik Date: Tue Dec 14 21:09:40 2010 +0100 mtd: nand: ams-delta: convert to platform driver In its current form, the driver may interfere with different hardware on different boards if built into the kernel, hence is not suitable for inclusion into a defconfig, inteded to be usable with multiple OMAP1 cpu and machine types. Convert it to a platform driver, that should be free from this issue. Created and tested against linux-2.6.37-rc5 on Amstrad Delta. Signed-off-by: Janusz Krzysztofik Acked-by: Tony Lindgren Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 75c52a49630a478ffe9c1473441779676817fce6 Author: Tejun Heo Date: Sat Dec 11 17:51:44 2010 +0100 mtd: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush cxt->work_{erase|write} on removal instead. Signed-off-by: Tejun Heo Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit d983c54ebd875f5f6fd37c154195c1c456a7af70 Author: Kyungmin Park Date: Mon Dec 6 09:05:18 2010 +0900 mtd: OneNAND: Fix multi block erase support at 4KiB pagesize Original 4KiB pagesize chip (SLC) doesn't support Multi block erase at Spec. Signed-off-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit beda1d49941765c0765e0f3cb95b4a86de67745d Author: Artem Bityutskiy Date: Tue Dec 14 17:07:57 2010 +0200 Revert "mtd: nand: add check for out of page read" This reverts commit e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8. The commit limits the maximum amount of bytes which can be read at one go to the OOB size, which is incorrect, because mtd->read_oob() allows reading multiple pages at a time, see comment near "struct mtd_oob_ops" at include/linux/mtd/mtd.h. So this patch breaks ABI and hence, has to be reverted. Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit eeb9cc015f91ff08453040dd5b2fde0dbaac90d3 Author: Ben Skeggs Date: Thu Jan 6 22:10:15 2011 +1000 drm/nvc0: fix init without firmware present Signed-off-by: Ben Skeggs commit ad1857a0e0cb29313efae3bb69c913b2c3c833a1 Author: Namhyung Kim Date: Tue Nov 23 13:30:33 2010 +0900 ext3: Add journal error check into ext3_rename() Check return value of ext3_journal_get_write_access() and ext3_journal_dirty_metadata(). Signed-off-by: Namhyung Kim Signed-off-by: Jan Kara commit 5026e90b86684bc878e4db0a8cd043fed769719c Author: Theodore Ts'o Date: Sat Oct 16 19:37:00 2010 -0400 ext3: Use search_dirblock() in ext3_dx_find_entry() Use the search_dirblock() in ext3_dx_find_entry(). It makes the code easier to read, and it takes advantage of common code. It also saves 100 bytes or so of text space. Signed-off-by: "Theodore Ts'o" Cc: Brad Spengler Signed-off-by: Jan Kara commit f0cad89f5e8ef8b6d0c065115565524137e44f0b Author: Theodore Ts'o Date: Sat Oct 16 19:36:59 2010 -0400 ext3: Avoid uninitialized memory references with a corrupted htree directory If the first htree directory is missing '.' or '..' but is otherwise a valid directory, and we do a lookup for '.' or '..', it's possible to dereference an uninitialized memory pointer in ext3_htree_next_block(). Avoid this. We avoid this by moving the special case from ext3_dx_find_entry() to ext3_find_entry(); this also means we can optimize ext3_find_entry() slightly when NFS looks up "..". Thanks to Brad Spengler for pointing a Clang warning that led me to look more closely at this code. The warning was harmless, but it was useful in pointing out code that was too ugly to live. This warning was also reported by Roman Borisov. Signed-off-by: "Theodore Ts'o" Cc: Jan Kara Cc: Brad Spengler Signed-off-by: Jan Kara commit ad692bf3ea035fa5a9d56462cf3df97d9607cced Author: Darrick J. Wong Date: Tue Nov 16 22:57:44 2010 +0000 ext3: Return error code from generic_check_addressable ext3_fill_super should return the error code that generic_check_accessible returns when an error condition occurs. Signed-off-by: Darrick J. Wong Signed-off-by: Jan Kara commit fbcae8e32d73ad6cad9c5721881350c51174d552 Author: Namhyung Kim Date: Fri Nov 19 16:28:35 2010 +0900 ext3: Add journal error check into ext3_delete_entry() Check return value of ext3_journal_get_write_access() and ext3_journal_dirty_metadata(). Signed-off-by: Namhyung Kim Signed-off-by: Jan Kara commit 2b543edae2d9161ae8dda1d85cbd28ef8a166cc0 Author: Namhyung Kim Date: Tue Nov 16 20:18:12 2010 +0900 ext3: Add error check in ext3_mkdir() Check return value of ext3_journal_get_write_access, ext3_journal_dirty_metadata and ext3_mark_inode_dirty. Consolidate error path under new label 'out_clear_inode' and adjust bh releasing appropriately. Signed-off-by: Namhyung Kim Signed-off-by: Jan Kara commit 99fbb1e2af5da27d3ee75c2e421712fe9d083fb6 Author: Joe Perches Date: Tue Nov 9 10:18:05 2010 -0800 fs/ext3/super.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Jan Kara commit 23a2ad6d0e58d0f2fb1647c2d6fef935bcaf9299 Author: Joe Perches Date: Tue Nov 9 10:16:03 2010 -0800 fs/ext2/super.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Jan Kara commit 31d710a7bd42f0d89e30d53bdaad427c5f191d0d Author: Maciej Żenczykowski Date: Sun Sep 26 12:38:28 2010 +0000 ext3: don't update sb journal_devnum when RO dev An ext3 filesystem on a read-only device, with an external journal which is at a different device number then recorded in the superblock will fail to honor the read-only setting of the device and trigger a superblock update (write). For example: - ext3 on a software raid which is in read-only mode - external journal on a read-write device which has changed device num - attempt to mount with -o journal_dev= - hits BUG_ON(mddev->ro = 1) in md.c Cc: Theodore Ts'o Signed-off-by: Maciej Żenczykowski Signed-off-by: Jan Kara commit e3c92215198cb6aa00ad38db2780faa6b72e0a3f Author: Mauro Carvalho Chehab Date: Thu Jan 6 08:16:04 2011 -0200 [media] radio-aimslab.c: Fix gcc 4.5+ bug gcc 4.5+ doesn't properly evaluate some inlined expressions. A previous patch were proposed by Andrew Morton using noinline. However, the entire inlined function is bogus, so let's just remove it and be happy. Reported-by: Andrew Morton Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 Merge: ab10f1d 13d27f0 Author: Kukjin Kim Date: Thu Jan 6 18:44:09 2011 +0900 Merge branch 'next-s3c24xx' into for-next commit 13d27f05d7b2c41d59c6e4bd6fc4ea10d3302ec3 Author: Abhilash Kesavan Date: Thu Sep 16 09:47:30 2010 +0530 ARM: S3C24XX: Add support UART3 for S3C2443 and S3C2416 Both S3C2443 and S3C2416 support 4 UART channels, this patch adds support for the missing uart channel. Signed-off-by: Abhilash Kesavan Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 1928e87bcf185f56008d0746f887b691c1cb8c4a Merge: ca9c20c 3c0eee3 Author: Paul Mundt Date: Thu Jan 6 18:27:34 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 Conflicts: drivers/video/sh_mobile_lcdcfb.c Signed-off-by: Paul Mundt commit f862f904d357dc0d3612347a8dbabe6fae037fbb Merge: 6f09e41 3c0eee3 Author: Paul Mundt Date: Thu Jan 6 18:24:07 2011 +0900 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-latest Conflicts: arch/sh/kernel/cpu/sh2a/clock-sh7201.c Signed-off-by: Paul Mundt commit ca9c20ce2b383032b71bdae9ec0b468d428ca8d4 Merge: 17ca20c 81f6f3c Author: Paul Mundt Date: Thu Jan 6 18:10:09 2011 +0900 Merge branch 'fbdev/udlfb' commit 81f6f3c1047392a22b9a20bbecf98c7f2d6f922a Author: Paul Mundt Date: Thu Jan 6 18:07:54 2011 +0900 video: udlfb: Kill off special printk wrappers, use pr_fmt(). This kills off all of the dl_xxx() printk wrappers and simply stubs in a pr_fmt() definition to accomplish the same thing. Signed-off-by: Paul Mundt commit b9f03a3cd06c6f8bbecfe08eae2a69cc0a13c690 Author: Paul Mundt Date: Thu Jan 6 18:04:02 2011 +0900 video: udlfb: Kill off some magic constants for EDID sizing. The edid length is fixed, so use the standard definition consistently. Signed-off-by: Paul Mundt commit 1a3e528cfc00a9d08114c5fa9e486a77633a425d Author: Paul Mundt Date: Thu Jan 6 17:29:24 2011 +0900 video: udlfb: deifdefify (yes, that's a word). udlfb selects all of the options it presently ifdef conditionalizes, so none of the statements have any effect outside of aggravating eye strain. Signed-off-by: Paul Mundt commit 6f09e41d704fe0bc9157a5357480751d39361d01 Author: Magnus Damm Date: Thu Jan 6 05:33:15 2011 +0000 sh: include Migo-R TS driver in Migo-R defconfig This patch enables the Migo-R specific touch screen driver in the Migo-R defconfig. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 17ca20cb7d04a259c9194879f77466bde606dda5 Author: Mayuresh Janorkar Date: Thu Jan 6 16:02:42 2011 +0900 fbdev: modedb: Add a new mode for 864x480 TAAL panels. This adds a new entry to the modedb for 864x480 TAAL panels, the default configuration for many OMAP boards. This enables omapfb to make use of the standard mode parsing. Signed-off-by: Mayuresh Janorkar Signed-off-by: Paul Mundt commit 748103e7235892bf9a3ee568d7d4dd7e5a3beece Author: Stefani Seibold Date: Mon Jan 3 09:28:59 2011 +0000 drivers/video/i810/i810-i2c.c: fix i2c bus handling These patch fix a longstanding bug in the i810 frame buffer driver. The handling of the i2c bus is wrong: A 1 bit should not written to the i2c, these will be done by switch the i2c to input. Driving an 1 bit active is against the i2c spec. An active driven of a 1 bit will result in very strange error, depending which side is the more powerful one. In my case it depends on the temperature of the Display-Controller-EEprom: With an cold eprom a got the correct EDID datas, with a warm one some of the 1 bits was 0 :-( The same bug is also in the intelfb driver in the file drivers/video/intelfb/intelfb_i2c.c. The functions intelfb_gpio_setscl() and intelfb_gpio_setsda() do drive the 1 bit active to the i2c bus. But since i have no card which is used by the intelfb driver i cannot fix it. Signed-off-by: Stefani Seibold Cc: Paul Mundt Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Paul Mundt commit 529ed806d4540d23ca2f68b28c3715d1566fc3ac Author: Brent Cook Date: Fri Dec 31 05:56:50 2010 +0000 video: Fix the HGA framebuffer driver Resurrected some old hardware and fixed up the hgafb driver to work again. Only tested with fbcon, since most fbdev-based software appears to only support 12bpp and up. It does not appear that this driver has worked for at least the entire 2.6.x series, perhaps since 2002. Hercules graphics hardware uses packed pixels horizontally, but rows are not linear. In other words, the pixels are not packed vertically. This means that custom imageblit, fillrect and copyarea need to be written specific to the hardware. * Removed the experimental acceleration option, since it is required for the hardware to work. * Fixed imageblit to work with fb_image's wider than 8 pixels. * Updated configuration text (HGA hardware is from 1984) Signed-off-by: Brent Cook Signed-off-by: Paul Mundt commit e045da7d835a28950543f5f10f0cb1905ca9bbaf Author: Julia Lawall Date: Sun Jan 2 14:27:42 2011 +0000 drivers/video/carminefb.c: improve error handling This code had an error handling goto to the wrong place, a misplaced release_mem_region, and a duplicated release_mem_region. The semantic match that finds the double release_mem_region is as follows: (http://coccinelle.lip6.fr/) // @r@ expression e1,e2,e3; position p1,p2,p3; @@ release_mem_region@p1(e1, e2)@p3; ... when != request_mem_region(e1,e2,e3) release_mem_region(e1, e2)@p2; @@ expression e <= r.e1,e3; expression r.e1,e2; position r.p1,r.p2,r.p3,p!=r.p1; @@ *release_mem_region(e1, e2)@p3; ... when != e = e3 *release_mem_region@p(e1, e2)@p2;// Signed-off-by: Julia Lawall Signed-off-by: Paul Mundt commit 7ee04fd5d5ff74f81d8eee128bc9346ab87c56b8 Author: Fabio Estevam Date: Fri Dec 24 12:28:24 2010 +0000 video: imxfb: Fix the maximum value for yres MX27 and MX25 have 10 bits in the YMAX field of LCDC Size Register. Fix the maximum value for yres. Signed-off-by: Fabio Estevam Signed-off-by: Paul Mundt commit 417d48274e755e537bae60461558c1f63a4e14de Author: Magnus Damm Date: Wed Jan 5 10:21:00 2011 +0000 fbdev: sh_mobile_lcdcfb: Enable 32 bpp and 24 bpp support This patch extends the LCDC driver with 24 bpp and 32 bpp support. These modes have been kept disabled earlier due to dependencies between the potential two LCDC channels that are exported as two separate framebuffer devices. The dependency boils down to a byte swap register that is shared between multiple channels. With this patch applied all single channel LCDC hardware can chose freely from 16, 24 and 32 bpp. Dual channel LCDC must stick to the same setup for both channels. Without this patch only 16 bpp is fully supported. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit dffa18449a334cf436c1fabfb2fcf7d4240c994b Author: Dennis Gilmore Date: Thu Jan 6 17:15:31 2011 +1100 crypto: n2 - use __devexit not __exit in n2_unregister_algs fixes fedora sparc build failure, thanks to kylem for helping with debugging Signed-off-by: Dennis Gilmore Acked-by: David S. Miller Signed-off-by: Herbert Xu commit f1930a2983ab28c65a51a5169b7540f898309824 Author: Yauhen Kharuzhy Date: Thu Jan 6 13:04:33 2011 +0900 ARM: SAMSUNG: Don't export __init functions to modules There are few functions marked as __init, but exported to modules in devices declaration files. s3c_nand_set_platdata() and s3c24xx_ts_set_platdata() are used only by boards init code now, so remove EXPORT_SYMBOL() for them. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Kukjin Kim commit 0536d0d087c264f0edbb911fca6fff39bb2eb71b Author: Yauhen Kharuzhy Date: Thu Jan 6 13:04:33 2011 +0900 ARM: S3C2443: Implement GPIO pull-up/down configuration methods S3C2443 has two-bits pull-up/pull-down configuration fields in GPIO registers, but values are differ from other SoCs with two-bits configuration. gpio-cfg-helpers.h already has prototypes for s3c2443-style pull-up/down methods, so implement them. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Kukjin Kim commit 479c4f4aba27318d64698867a18865d29e3287a6 Author: Yauhen Kharuzhy Date: Thu Jan 6 13:04:33 2011 +0900 ARM: S3C2416: Add support of SD/MMC card detect on SMDK2416 Enable card detect by GPIO pin on hsmmc1 device (SD0 on SMDK2416 board) and enable card polling on hsmmc0 (SD1). Signed-off-by: Yauhen Kharuzhy Signed-off-by: Kukjin Kim commit c29cfa6d3e3edbbf4688a9b95a5b193d4f1c2575 Author: Yauhen Kharuzhy Date: Fri Dec 17 14:42:09 2010 +0900 ARM: S3C2416: Add platform helpers for setup SDHCI Samsung S3C2416 has two SDHCI controllers compatible with other Samsung's SoCs (S3C64XX, S5PC100 etc...). Add required platform setup code that the devices can be used with sdhci-s3c driver. Signed-off-by: Yauhen Kharuzhy [kgene.kim@samsung.com: change to __raw_{readl,writel} from {readl,writel}] [kgene.kim@samsung.com: build error fixes] Signed-off-by: Kukjin Kim commit 95d6791b4f8aad51caea657236234f21b50a4559 Author: Yauhen Kharuzhy Date: Thu Jan 6 13:04:33 2011 +0900 ARM: S3C24XX: Add address map and clock definitions for HSMMC0 Define maps for HSMMC devices. S3C2443 has one HSMMC device with base address 0x4A800000. S3C2416 has HSMMC0 at 0x4AC00000 and HSMMC1 at 0x4A800000. So suppose that S3C2443 has only HSMMC1. Define clock for hsmmc0 device and register it. Signed-off-by: Yauhen Kharuzhy Signed-off-by: Kukjin Kim commit f598aa7593427ffe3a61e7767c34bd695a5e7ed0 Author: Alex Deucher Date: Tue Jan 4 00:43:39 2011 -0500 drm/radeon/kms: add quirk for Mac Radeon HD 2600 card Reported-by: 屋国遥 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 32c87fca2fac490e34a9fa900b45f2fbb4faacf9 Author: Tejun Heo Date: Mon Jan 3 14:49:32 2011 +0100 drm/radeon: use system_wq instead of dev_priv->wq With cmwq, there's no reason for radeon to use a dedicated workqueue. Drop dev_priv->wq and use system_wq instead. Because radeon_driver_irq_uninstall_kms() may be called from unsleepable context, the work items can't be flushed from there. Instead, init and flush from radeon_irq_kms_init/fini(). While at it, simplify canceling/flushing of rdev->pm.dynpm_idle_work. Always initialize and sync cancel instead of being unnecessarily smart about it. Signed-off-by: Tejun Heo Acked-by: Alex Deucher Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie commit 98d27b8abf413a310df6676f7d2128ada1cccc08 Author: Kuninori Morimoto Date: Thu Jan 6 02:44:15 2011 +0000 ARM: mach-shmobile: mackerel: Add HDMI sound support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 12c4309b78854ba117ea38a9178018591abd16ab Author: Kuninori Morimoto Date: Thu Jan 6 02:44:09 2011 +0000 ARM: mach-shmobile: mackerel: add HDMI video support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 73674648e9bf3b0a75000b7e97edaac255cd73f7 Author: Kuninori Morimoto Date: Thu Jan 6 02:43:00 2011 +0000 ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk fsib_clk will be used when fdiv_clk failed on fsi_hdmi_set_rate. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit af5dd83b873efd4e1477f2265b6fa15a825aff26 Author: Dave Airlie Date: Thu Jan 6 13:04:32 2011 +1000 vga_switcheroo: fix build with non switcheroo enabled path. Signed-off-by: Dave Airlie commit 9eba4a93ce520a627e876b0d1851d4f78a701c2b Author: Marek Olšák Date: Wed Jan 5 05:46:48 2011 +0100 drm/radeon/kms: manage r300 CMASK RAM access and allow CMASK clear The CMASK RAM is for colorbuffer compression (used in conjunction with MSAA). Only one user (filp) can access it. The CMASK RAM access is managed in the same way as Hyper-Z, but there is a separate ioctl, because an app that uses MSAA does not necessarily have to use zbuffering. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit 2f299d5de02da3ffb1f9e1a05c91dcd1173ebd3c Author: Alex Deucher Date: Tue Jan 4 17:42:20 2011 -0500 drm/radeon/kms: adjust quirk for acer laptop Acer laptop (TravelMate 5730G) has an HDMI connector on the laptop and a DVI connector on the docking station and both share the same encoder, hpd pin, and ddc line. The bios connector table reflects this and is technically correct, however, we drop the DVI connector here since xrandr has no concept of encoders (only crtcs and connectors) and will try and drive both connectors with different crtcs which isn't possible on the hardware side and leaves no crtcs for LVDS or VGA. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=32732 Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit b27dcfb0670ea7352a67137f4ff7947c2a9f6892 Author: Jeff Garzik Date: Wed Nov 17 22:56:48 2010 -0500 [libata] avoid needlessly passing around ptr to SCSI completion func It's stored in struct scsi_cmnd->scsi_done, making several 'done' parameters to functions redundant. Signed-off-by: Jeff Garzik commit 02cdfcf043c5c6ebcbbaba1c35130b5fbcb10867 Author: David Milburn Date: Fri Nov 12 15:38:21 2010 -0600 [libata] new driver acard_ahci, for ATP8620 host controller Add support for Acard ATP8620 host controller. Based upon initial version by Jeff Garzik. Signed-off-by: David Milburn Signed-off-by: Jeff Garzik commit 3610cda53f247e176bcbb7a7cca64bc53b12acdb Author: David S. Miller Date: Wed Jan 5 15:38:53 2011 -0800 af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks. unix_release() can asynchornously set socket->sk to NULL, and it does so without holding the unix_state_lock() on "other" during stream connects. However, the reverse mapping, sk->sk_socket, is only transitioned to NULL under the unix_state_lock(). Therefore make the security hooks follow the reverse mapping instead of the forward mapping. Reported-by: Jeremy Fitzhardinge Reported-by: Linus Torvalds Signed-off-by: David S. Miller commit a3c888fcda911fcb6e3c071aecf49ccb6effe79d Author: Andrew Morton Date: Wed Jan 5 23:49:53 2011 +0100 gen_init_cpio: checkpatch fixes Cc: Jesper Juhl Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 44b8288308ac9da27eab7d7bdbf1375a568805c3 Author: Eric Dumazet Date: Wed Jan 5 10:35:02 2011 +0000 net_sched: pfifo_head_drop problem commit 57dbb2d83d100ea (sched: add head drop fifo queue) introduced pfifo_head_drop, and broke the invariant that sch->bstats.bytes and sch->bstats.packets are COUNTER (increasing counters only) This can break estimators because est_timer() handles unsigned deltas only. A decreasing counter can then give a huge unsigned delta. My mid term suggestion would be to change things so that sch->bstats.bytes and sch->bstats.packets are incremented in dequeue() only, not at enqueue() time. We also could add drop_bytes/drop_packets and provide estimations of drop rates. It would be more sensible anyway for very low speeds, and big bursts. Right now, if we drop packets, they still are accounted in byte/packets abolute counters and rate estimators. Before this mid term change, this patch makes pfifo_head_drop behavior similar to other qdiscs in case of drops : Dont decrement sch->bstats.bytes and sch->bstats.packets Signed-off-by: Eric Dumazet Acked-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit 329620a878cf89184b28500d37fa33cc870a3357 Author: Jeremy Fitzhardinge Date: Sat Mar 21 23:29:34 2009 -0700 xen/xenbus: making backend support modular is too complex Impact: build fix Making the xenbus backend support a separate module is needlessly complex and causes build failures. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Konrad Rzeszutek Wilk commit fce263c141faca8db85acb0524bdfdfae3ec0725 Author: Konrad Rzeszutek Wilk Date: Fri Dec 10 22:33:15 2010 -0500 xen/pci: Make xen-pcifront be dependent on XEN_XENBUS_FRONTEND Signed-off-by: Konrad Rzeszutek Wilk commit 6bac7f9f9e8e549c18ec4b77c499a45a1fae61b9 Author: Ian Campbell Date: Fri Dec 10 14:39:15 2010 +0000 xen/xenbus: fixup checkpatch issues in xenbus_probe* Signed-off-by: Ian Campbell Signed-off-by: Konrad Rzeszutek Wilk commit 7003087ce0fcdaf57a331b4ad627195a7f97245e Author: Jeremy Fitzhardinge Date: Fri Mar 27 16:28:34 2009 -0700 xen/netfront: select XEN_XENBUS_FRONTEND Make sure the Xen frontend xenbus is enabled. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to c40912891c3b in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 0ff4fdf065101504cd84ac36924fcdad6641a4f7 Author: Jeremy Fitzhardinge Date: Mon Mar 29 14:38:54 2010 -0700 xen/xenbus: clean up noise in xenbus_probe_frontend.c Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 616ff7a06a3f in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit b5d33d088f45bb62fdaaf1755da05aa5524a3a8f Author: Jeremy Fitzhardinge Date: Mon Mar 29 14:38:35 2010 -0700 xen/xenbus: clean up noise in xenbus_probe_backend.c Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 98b833aaf81e in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit a39bda27b35266beae945f48e0b6ab58d06a17d5 Author: Jeremy Fitzhardinge Date: Mon Mar 29 14:38:12 2010 -0700 xen/xenbus: clean up noise in xenbus_probe.c Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 01aded30aaef in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit a16448e071ca80e599ea4f780242f40a0a213b07 Author: Jeremy Fitzhardinge Date: Mon Mar 29 14:37:44 2010 -0700 xen/xenbus: cleanup debug noise in xenbus_comms.c Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 6796c12281dc in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 7432e4bd0bcec9f18d9c94de8925b8a59d3edf94 Author: Jeremy Fitzhardinge Date: Thu Oct 29 14:19:42 2009 -0700 xen/xenbus: clean up error handling Don't report errors when booting on non-Xen, because its just confusing. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 8aa08376d6aa in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 1b31a143450ea9b5e6168f3b21a02c4a6a63ad01 Author: Jeremy Fitzhardinge Date: Fri Mar 27 16:29:44 2009 -0700 xen/xenbus: make frontend bus GPL Make sure frontend xenbus has a GPL module license, so it can access all the xenbus symbols exported GPL only. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 525cbc8adcb5 in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit c3676e8462009d84dce89a454956460de3bfdca7 Author: Jeremy Fitzhardinge Date: Wed Mar 4 22:32:16 2009 -0800 xen/xenbus: make sure backend bus is registered earlier Impact: bugfix Need to register it before any drivers want to attach. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to a7a9c3a942c6 in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 806f5463d2598ea23a7a688c47c2774846fe7f2f Author: Jeremy Fitzhardinge Date: Wed Mar 4 22:31:45 2009 -0800 xenbus/frontend: register bus earlier Impact: bugfix Make sure the frontend bus is registered early, before any drivers want to attach. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to 1d5df318f87f in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 74c2ee98385fe2653d6a817f6f74c18eec4c2424 Author: Jeremy Fitzhardinge Date: Mon Feb 9 16:37:23 2009 -0800 xen: remove xen/evtchn.h Impact: cleanup It's a usermode header for users of /dev/xen/evtchn. Signed-off-by: Jeremy Fitzhardinge Signed-off-by: Ian Campbell [corresponds to b60e48cec12f in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit df660251eb534649f90f9dcfe1da1cef4ea48a3e Author: Ian Campbell Date: Mon Feb 9 12:05:51 2009 -0800 xen: add backend driver support Impact: backend device support Add the basic machinery to support backend drivers. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge [corresponds to 79727b851bac in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git] Signed-off-by: Konrad Rzeszutek Wilk commit 2de06cc1f18d638cc7ab1169f61a8599045c2d4f Author: Ian Campbell Date: Mon Feb 9 12:05:51 2009 -0800 xen: separate out frontend xenbus Impact: refactor Make a distinct frontend xenbus, in preparation for adding a backend xenbus. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge [corresponds to 2fd433a4188f in git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git with adjustments to reflect changes in the code which is moved] Signed-off-by: Konrad Rzeszutek Wilk commit 06778b1c383afbdb88ffd837e117bec06a76f450 Author: Johannes Berg Date: Wed Dec 22 10:15:52 2010 +0100 mac80211: remove stray extern Somehow this snuck into my earlier patch, and only now did I see a compiler warning: net/mac80211/led.c:218:13: warning: function '__ieee80211_create_tpt_led_trigger' with external linkage has definition Remove the stray extern. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 90fc4b3a5ba24f09af2a8c4a723651a328949460 Author: Johannes Berg Date: Sat Dec 18 17:20:48 2010 +0100 mac80211: implement off-channel TX using hw r-o-c offload When the driver has remain-on-channel offload, implement off-channel transmission using that primitive. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 21f83589644bb2ed98079bf1e2154c8e70ca6a6c Author: Johannes Berg Date: Sat Dec 18 17:20:47 2010 +0100 mac80211: implement hardware offload for remain-on-channel This allows drivers to support remain-on-channel offload if they implement smarter timing or need to use a device implementation like iwlwifi. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c96e96354a6c9456cdf1f150eca504e2ea35301e Merge: dbbe68b 33af881 Author: John W. Linville Date: Wed Jan 5 16:06:25 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: net/bluetooth/Makefile commit 4b95f135f606c87e4056b6d7fd3c5781c818858b Author: Jean Pihet Date: Wed Jan 5 19:49:02 2011 +0100 tools, perf: Documentation for the power events API Provides documentation for the following: - the new power trace API, - the old (legacy) power trace API, - the DEPRECATED Kconfig option usage. Signed-off-by: Jean Pihet Cc: Arjan van de Ven Cc: trenn@suse.de Cc: Len Brown Cc: Pavel Machek Cc: Rafael J. Wysocki Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: linux-pm@lists.linux-foundation.org LKML-Reference: <1294253342-29056-3-git-send-email-j-pihet@ti.com> Signed-off-by: Ingo Molnar commit 938cfed18bec2c7361f37efc954712a7cc42c353 Author: Jean Pihet Date: Wed Jan 5 19:49:01 2011 +0100 perf: Add calls to suspend trace point Uses the machine_suspend trace point, called from the generic kernel suspend_devices_and_enter function. Signed-off-by: Jean Pihet Acked-by: Rafael J. Wysocki Cc: Arjan van de Ven CC: Thomas Renninger Cc: Len Brown Cc: Pavel Machek Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: linux-pm@lists.linux-foundation.org LKML-Reference: <1294253342-29056-2-git-send-email-j-pihet@ti.com> Signed-off-by: Ingo Molnar commit dcb4cb85f4b7caac9769bce464fef16306a4758c Author: Bart Van Assche Date: Fri Nov 26 13:22:48 2010 -0500 IB/srp: allow lockless work posting Only one CPU at a time will own an RX IU, so using the address of the IU as the work request cookie allows us to avoid taking a lock. We can similarly prepare the TX path for lockless posting by moving the free TX IUs to a list. This also removes the requirement that the queue sizes be a power of 2. Signed-off-by: Bart Van Assche [ broken out, small cleanups, and modified to avoid needing an extra field in the IU by David Dillow] Signed-off-by: David Dillow commit 9709f0e05b827049733f439de82a4a1688b37b86 Author: Bart Van Assche Date: Fri Nov 26 13:13:06 2010 -0500 IB/srp: consolidate state change code Signed-off-by: Bart Van Assche [ broken out and small cleanups by David Dillow ] Signed-off-by: David Dillow commit f8b6e31e4e46bf514c27fce38783ed5615cca01d Author: David Dillow Date: Fri Nov 26 13:02:21 2010 -0500 IB/srp: allow task management without a previous request We can only have one task management comment outstanding, so move the completion and status to the target port. This allows us to handle resets of a LUN without a corresponding request having been sent. Meanwhile, we don't need to play games with host_scribble, just use it as the pointer it is. This fixes a crash when we issue a bus reset using sg_reset. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=13893 Reported-by: Bart Van Assche Reviewed-by: Bart Van Assche Signed-off-by: David Dillow commit 0eefed84fe9e1eb90f4b089ead95904306b23233 Author: Geert Uytterhoeven Date: Sun Oct 31 21:23:55 2010 +0100 m68k/sun3: Kill pte_unmap() warnings Since commit 31c911329e048b715a1dfeaaf617be9430fd7f4e ("mm: check the argument of kunmap on architectures without highmem"), we get lots of warnings like arch/m68k/kernel/sys_m68k.c:508: warning: passing argument 1 of ‘kunmap’ from incompatible pointer type As m68k doesn't support highmem anyway, open code the calls to kmap() and kunmap() (the latter is a no-op) to kill the warnings, like is done on most other architectures without CONFIG_HIGHPTE. Signed-off-by: Geert Uytterhoeven Cc: Sam Creasey commit 33af88138b859f515b365a074e0a014d7cdbf846 Author: John W. Linville Date: Wed Jan 5 14:05:00 2011 -0500 ath9k: correct MODULE_PARM_DESC parameters for force_new_ani Signed-off-by: John W. Linville commit 18cb6e32e7aeea9c92af5793bee2b32536615502 Author: John W. Linville Date: Wed Jan 5 09:39:59 2011 -0500 ath5k: qualify global modparam_nohwcrypt variable Signed-off-by: John W. Linville commit 3e6109c57468ed320beefd2861fe2cc418cccfc2 Author: John W. Linville Date: Wed Jan 5 09:39:17 2011 -0500 ath9k: qualify global modparam_nohwcrypt variable Signed-off-by: John W. Linville commit 6303710d7aa62bfb154cd13ab5ab12cfa8baaf91 Merge: db98a6c d2460f4 Author: John W. Linville Date: Wed Jan 5 14:35:41 2011 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 58daf18cdcab550262a5f4681e1f1e073e21965a Merge: aa312be 0af85dd Author: Russell King Date: Wed Jan 5 18:09:03 2011 +0000 Merge branch 'clksrc' into devel Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile commit aa312be1987d43216e72ffce42bccf6bf81f62ed Merge: 31edf27 8c11a94 38d6243 Author: Russell King Date: Wed Jan 5 18:08:31 2011 +0000 Merge branches 'mmci' and 'pl011-dma' into devel commit 31edf274f9aff1ccd39934a0b2fce38f4405c656 Merge: 3c0eee3 ed60453 ac61d14 28257f7 b230653 50005a8 cf562b4 3d09fbc 8a9618f Author: Russell King Date: Wed Jan 5 18:08:10 2011 +0000 Merge branches 'ftrace', 'gic', 'io', 'kexec', 'mod', 'sa11x0', 'sh' and 'versatile' into devel commit 38d624361b2a82d6317c379aebf81b1b28210bb0 Author: Russell King Date: Wed Dec 22 17:59:16 2010 +0000 ARM: PL011: add DMA burst threshold support for ST variants ST Micro variants has some specific dma burst threshold compensation, which allows them to make better use of a DMA controller. Add support to set this up. Based on a patch from Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Russell King commit 68b65f7305e54b822b2483c60de7d7b017526a92 Author: Russell King Date: Wed Dec 22 17:24:39 2010 +0000 ARM: PL011: Add support for transmit DMA Add DMA engine support for transmit to the PL011 driver. Based on a patch from Linus Walliej, with the following changes: - remove RX DMA support. As PL011 doesn't give us receive timeout interrupts, we only get notified of received data when the RX DMA has completed. This rather sucks for interactive use of the TTY. - remove abuse of completions. Completions are supposed to be for events, not to tell what condition buffers are in. Replace it with a simple 'queued' bool. - fix locking - it is only safe to access the circular buffer with the port lock held. - only map the DMA buffer when required - if we're ever behind an IOMMU this helps keep IOMMU usage down, and also ensures that we're legal when we change the scatterlist entry length. - fix XON/XOFF sending - we must send XON/XOFF characters out as soon as possible - waiting for up to 4095 characters in the DMA buffer to be sent first is not acceptable. - fix XON/XOFF receive handling - we need to stop DMA when instructed to by the TTY layer, and restart it again when instructed to. There is a subtle problem here: we must not completely empty the circular buffer with DMA, otherwise we will not be notified of XON. - change the 'enable_dma' flag into a 'using DMA' flag, and track whether we can use TX DMA by whether the channel pointer is non-NULL. This gives us more control over whether we use DMA in the driver. - we don't need to have the TX DMA buffer continually allocated for each port - instead, allocate it when the port starts up, and free it when it's shut down. Update the 'using DMA' flag if we get the buffer, and adjust the TTY FIFO size appropriately. - if we're going to use PIO to send characters, use the existing IRQ based functionality rather than reimplementing it. This also ensures we call uart_write_wakeup() at the appropriate time, otherwise we'll stall. - use DMA engine helper functions for type safety. - fix init when built as a module - we can't have to initcall functions, so we must settle on one. This means we can eliminate the deferred DMA initialization. - there is no need to terminate transfers on a failed prep_slave_sg() call - nothing has been setup, so nothing needs to be terminated. This avoids a potential deadlock in the DMA engine code (tasklet->callback->failed prepare->terminate->tasklet_disable which then ends up waiting for the tasklet to finish running.) - Dan says that the submission callback should not return an error: | dma_submit_error() is something I should have removed after commit | a0587bcf "ioat1: move descriptor allocation from submit to prep" all | errors should be notified by prep failing to return a descriptor | handle. Negative dma_cookie_t values are only returned by the | dma_async_memcpy* calls which translate a prep failure into -ENOMEM. So remove the error handling at that point. This also solves the potential deadlock mentioned in the previous comment. Acked-by: Linus Walleij Signed-off-by: Russell King commit 963cc981af620c7c07b5f6d1ab998b639e90ecb1 Author: Russell King Date: Wed Dec 22 17:16:09 2010 +0000 ARM: PL011: Ensure IRQs are disabled in UART interrupt handler As the DMA support introduces a separate interrupt-time callback, our interrupt handler will not be the only handler which takes the port lock, so we need to ensure that IRQs are disabled. We must use the _irqsave variant so we don't inadvertently enable interrupts. Acked-by: Linus Walleij Signed-off-by: Russell King commit ffca2b114c6a804d1307781df687e877a373a1c2 Author: Russell King Date: Wed Dec 22 17:13:05 2010 +0000 ARM: PL011: Separate hardware FIFO size from TTY FIFO size With DMA support, we need to tell the TTY subsystem that the DMA buffer is the size of the FIFO, otherwise things like tty_wait_until_sent() will time out too early. Keep (and use) the hardware value separately from the port->fifosize. This was part of a larger patch from Linus Walleij, with a little modification. Acked-by: Linus Walleij Signed-off-by: Russell King commit c19f12b5ef3adf3c139eabbe3d3d0201838b77b1 Author: Russell King Date: Wed Dec 22 17:48:26 2010 +0000 ARM: PL011: Allow better handling of vendor data Rather than copying all vendor data into the port structure, copy just that which is frequently used, and keep a pointer to the remaining vendor data structure. This makes it easier to add vendor quirks in the future. Acked-by: Linus Walleij Signed-off-by: Russell King commit 5063e2c567ee569cccfc01ebf80c898cb4e6833a Author: Russell King Date: Wed Dec 22 17:09:08 2010 +0000 ARM: PL011: Ensure error flags are clear at startup The error flags weren't being cleared upon UART startup, which can cause problems when we add DMA support. It's good practice to ensure that these flags are cleared anyway, so let's do so. This was part of a larger patch from Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Russell King commit e8a7ba86ff993311f8712e5b3bb2e3892e82df5f Author: Russell King Date: Tue Dec 28 09:16:54 2010 +0000 ARM: PL011: include revision number in boot-time port printk Include the revision number of the PL011 primecell in the boot-time port printk to allow proper identification of the peripheral. Acked-by: Linus Walleij Signed-off-by: Russell King commit eccdfe2d245a882feacc4630c9bc29805e9929c8 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:32:52 2011 -0200 perf script: Make some lists static Not accessed outside builtin-script, so make them static. 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 6d8afb56300c53a250c6de0f973ef502e54aabf3 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:27:30 2011 -0200 perf script: Use the default lost event handler That already does what was being done here. The warning is now unconditionally given by __perf_session__process_pipe_events, just like for non pipe processing. 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 1109599458c06256064213dc44ca5f5fa8ee3833 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 16:25:15 2011 -0200 perf session: Warn about errors when processing pipe events too Just like we do at __perf_session__process_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 d030260ad33b482a371f999c7e9db79ef7a2111f Author: Stephane Eranian Date: Tue Jan 4 16:30:01 2011 +0200 perf tools: Fix perf_event.h header usage This patch fixes the usage of the perf_event.h header file between command modules and the supporting code in util. It is necessary to ensure that ALL files use the SAME perf_event.h header from the kernel source tree. There were a couple of #include mixed with #include "../../perf_event.h". This caused issues on some distros because of mismatch in the layout of struct perf_event_attr. That eventually led perf stat to segfault. Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian LKML-Reference: <4d233cf0.2308e30a.7b00.ffffc187@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 454a3bbe9b75eb8cbddffcf383fbb8e97ea78f52 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 10:40:08 2011 -0200 perf test: Clarify some error reports in the open syscall test Rebooted my devel machine, first thing I ran was perf test, that expects debugfs to be mounted, test fails. Be more clear about it. Also add missing newlines and add more informative message when sys_perf_event_open fails. 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 09e099d4bafea3b15be003d548bdf94b4b6e0e17 Author: Jerome Marchand Date: Wed Jan 5 16:57:38 2011 +0100 block: fix accounting bug on cross partition merges /proc/diskstats would display a strange output as follows. $ cat /proc/diskstats |grep sda 8 0 sda 90524 7579 102154 20464 0 0 0 0 0 14096 20089 8 1 sda1 19085 1352 21841 4209 0 0 0 0 4294967064 15689 4293424691 ~~~~~~~~~~ 8 2 sda2 71252 3624 74891 15950 0 0 0 0 232 23995 1562390 8 3 sda3 54 487 2188 92 0 0 0 0 0 88 92 8 4 sda4 4 0 8 0 0 0 0 0 0 0 0 8 5 sda5 81 2027 2130 138 0 0 0 0 0 87 137 Its reason is the wrong way of accounting hd_struct->in_flight. When a bio is merged into a request belongs to different partition by ELEVATOR_FRONT_MERGE. The detailed root cause is as follows. Assuming that there are two partition, sda1 and sda2. 1. A request for sda2 is in request_queue. Hence sda1's hd_struct->in_flight is 0 and sda2's one is 1. | hd_struct->in_flight --------------------------- sda1 | 0 sda2 | 1 --------------------------- 2. A bio belongs to sda1 is issued and is merged into the request mentioned on step1 by ELEVATOR_BACK_MERGE. The first sector of the request is changed from sda2 region to sda1 region. However the two partition's hd_struct->in_flight are not changed. | hd_struct->in_flight --------------------------- sda1 | 0 sda2 | 1 --------------------------- 3. The request is finished and blk_account_io_done() is called. In this case, sda2's hd_struct->in_flight, not a sda1's one, is decremented. | hd_struct->in_flight --------------------------- sda1 | -1 sda2 | 1 --------------------------- The patch fixes the problem by caching the partition lookup inside the request structure, hence making sure that the increment and decrement will always happen on the same partition struct. This also speeds up IO with accounting enabled, since it cuts down on the number of lookups we have to do. Also add a refcount to struct hd_struct to keep the partition in memory as long as users exist. We use kref_test_and_get() to ensure we don't add a reference to a partition which is going away. Signed-off-by: Jerome Marchand Signed-off-by: Yasuaki Ishimatsu Cc: stable@kernel.org Signed-off-by: Jens Axboe commit e4a683c899cd5a49f8d684a054c95bd115a0c005 Author: Jerome Marchand Date: Wed Jan 5 16:57:37 2011 +0100 kref: add kref_test_and_get Add kref_test_and_get() function, which atomically add a reference only if refcount is not zero. This prevent to add a reference to an object that is already being removed. Signed-off-by: Jerome Marchand Cc: stable@kernel.org Signed-off-by: Jens Axboe commit a7862aa90ffd1113bc2898ae6be2e4861b1f76cc Author: Mauro Carvalho Chehab Date: Wed Jan 5 12:31:15 2011 -0300 [media] cx25821: Fix compilation breakage due to BKL dependency drivers/staging/cx25821/cx25821-video.c: In function ‘video_open’: drivers/staging/cx25821/cx25821-video.c:817:8: error: implicit declaration of function ‘lock_kernel’ drivers/staging/cx25821/cx25821-video.c:834:9: error: implicit declaration of function ‘unlock_kernel’ This patch just adds a header with BKL function. It should be enough to avoid compilation breakage, but, as BKL will be removed, we need to properly fix it on a latter patch. Reported-by: Randy Dunlap Reported-by: Anca Emanuel Cc: Palash Bandyopadhyay Signed-off-by: Mauro Carvalho Chehab commit 74d91e3c6a66359bb754fb5d8a5b54fb6ba2f9a6 Author: Huang Ying Date: Tue Jan 4 22:38:09 2011 -0500 x86, NMI: Add touch_nmi_watchdog to io_check_error delay Prevent the long delay in io_check_error making NMI watchdog timeout. Signed-off-by: Huang Ying Signed-off-by: Don Zickus LKML-Reference: <1294198689-15447-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 554ec063982752e9a569ab9189eeffa3d96731b2 Author: Dongdong Deng Date: Tue Jan 4 22:38:08 2011 -0500 x86: Avoid calling arch_trigger_all_cpu_backtrace() at the same time The spin_lock_debug/rcu_cpu_stall detector uses trigger_all_cpu_backtrace() to dump cpu backtrace. Therefore it is possible that trigger_all_cpu_backtrace() could be called at the same time on different CPUs, which triggers and 'unknown reason NMI' warning. The following case illustrates the problem: CPU1 CPU2 ... CPU N trigger_all_cpu_backtrace() set "backtrace_mask" to cpu mask | generate NMI interrupts generate NMI interrupts ... \ | / \ | / The "backtrace_mask" will be cleaned by the first NMI interrupt at nmi_watchdog_tick(), then the following NMI interrupts generated by other cpus's arch_trigger_all_cpu_backtrace() will be taken as unknown reason NMI interrupts. This patch uses a test_and_set to avoid the problem, and stop the arch_trigger_all_cpu_backtrace() from calling to avoid dumping a double cpu backtrace info when there is already a trigger_all_cpu_backtrace() in progress. Signed-off-by: Dongdong Deng Reviewed-by: Bruce Ashfield Cc: fweisbec@gmail.com LKML-Reference: <1294198689-15447-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar Signed-off-by: Don Zickus commit 9ab181fa9ff73a38fccd0a4f1c40a38dfe62b535 Author: Don Zickus Date: Tue Jan 4 22:38:07 2011 -0500 x86: Only call smp_processor_id in non-preempt cases There are some paths that walk the die_chain with preemption on. Make sure we are in an NMI call before we start doing anything. This was triggered by do_general_protection calling notify_die with DIE_GPF. Reported-by: Jan Kiszka Signed-off-by: Don Zickus LKML-Reference: <1294198689-15447-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit aef1b9cef78ae65c6501850851cc3f61f9be477b Merge: 20c457b 3c0eee3 Author: Ingo Molnar Date: Wed Jan 5 14:22:08 2011 +0100 Merge commit 'v2.6.37' into perf/core Merge reason: Add the final .37 tree. Signed-off-by: Ingo Molnar commit 6bf4123760a5aece6e4829ce90b70b6ffd751d65 Author: NeilBrown Date: Wed Jan 5 12:50:16 2011 +1100 sched: Change wait_for_completion_*_timeout() to return a signed long wait_for_completion_*_timeout() can return: 0: if the wait timed out -ve: if the wait was interrupted +ve: if the completion was completed. As they currently return an 'unsigned long', the last two cases are not easily distinguished which can easily result in buggy code, as is the case for the recently added wait_for_completion_interruptible_timeout() call in net/sunrpc/cache.c So change them both to return 'long'. As MAX_SCHEDULE_TIMEOUT is LONG_MAX, a large +ve return value should never overflow. Signed-off-by: NeilBrown Cc: Peter Zijlstra Cc: J. Bruce Fields Cc: Andrew Morton Cc: Linus Torvalds LKML-Reference: <20110105125016.64ccab0e@notabene.brown> Signed-off-by: Ingo Molnar commit 27066fd484a32c80630136aa2b91c980f3198f9d Merge: 101e5f7 3c0eee3 Author: Ingo Molnar Date: Wed Jan 5 14:14:42 2011 +0100 Merge commit 'v2.6.37' into sched/core Merge reason: Merge the final .37 tree. Signed-off-by: Ingo Molnar commit cb2ded37fd2e1039f96c8c892da024a8f033add5 Author: Yinghai Lu Date: Tue Jan 4 16:38:52 2011 -0800 x86: Fix APIC ID sizing bug on larger systems, clean up MAX_APICS confusion Found one x2apic pre-enabled system, x2apic_mode suddenly get corrupted after register some cpus, when compiled CONFIG_NR_CPUS=255 instead of 512. It turns out that generic_processor_info() ==> phyid_set(apicid, phys_cpu_present_map) causes the problem. phys_cpu_present_map is sized by MAX_APICS bits, and pre-enabled system some cpus have an apic id > 255. The variable after phys_cpu_present_map may get corrupted silently: ffffffff828e8420 B phys_cpu_present_map ffffffff828e8440 B apic_verbosity ffffffff828e8444 B local_apic_timer_c2_ok ffffffff828e8448 B disable_apic ffffffff828e844c B x2apic_mode ffffffff828e8450 B x2apic_disabled ffffffff828e8454 B num_processors ... Actually phys_cpu_present_map is referenced via apic id, instead index. We should use MAX_LOCAL_APIC instead MAX_APICS. For 64-bit it will be 32768 in all cases. BSS will increase by 4k bytes on 64-bit: text data bss dec filename 21696943 4193748 12787712 38678403 vmlinux.before 21696943 4193748 12791808 38682499 vmlinux.after No change on 32bit. Finally we can remove MAX_APCIS that was rather confusing. Signed-off-by: Yinghai Lu Cc: H. Peter Anvin Cc: "Eric W. Biederman" LKML-Reference: <4D23BD9C.3070102@kernel.org> Signed-off-by: Ingo Molnar commit 8e1023016cf17152972b98bce6c144834a4916d5 Author: Heiko Carstens Date: Wed Jan 5 12:48:18 2011 +0100 [S390] prevent unneccesary loops_per_jiffy recalculation When the seqfile /proc/cpuinfo gets accesses for each possible cpu loops_per_jiffy gets recalculated. However its value is only needed on first access. In addition loops_per_jiffy should be recalculated when the machine reports a capability change. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 19726cec63aeadad127f9e72ee69240336e37f15 Author: Heiko Carstens Date: Wed Jan 5 12:48:17 2011 +0100 [S390] cpuinfo: use get_online_cpus() instead of preempt_disable() Use get_online_cpus() instead of preempt_disable() to make sure cpus don't go offline while accessing their per cpu data. The preempt_disable() stuff is old code which was used before get_online_cpus() was available. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 974de4d7e70a6d759457722a6f322cc86b480eea Author: Heiko Carstens Date: Wed Jan 5 12:48:16 2011 +0100 [S390] smp: remove cpu hotplug messages Get rid of messages that indicate if a cpu went online or offline. There is nothing special about this anymore and these messages might flood the kernel log buffer which makes debugging harder since more important messages might be overwritten. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fa188ae1657d6edc7963d524ce9a0650fe725242 Author: Gerald Schaefer Date: Wed Jan 5 12:48:15 2011 +0100 [S390] mutex: enable spinning mutex on s390 This enables the spinning mutex feature on s390 by removing HAVE_DEFAULT_NO_SPIN_MUTEXES from arch/s390/Kconfig. Signed-off-by: Gerald Schaefer Signed-off-by: Martin Schwidefsky commit 34b133f8e94e39ff3cf4d1c1f67f2e07cdc3d54e Author: Gerald Schaefer Date: Wed Jan 5 12:48:14 2011 +0100 [S390] mutex: Introduce arch_mutex_cpu_relax() The spinning mutex implementation uses cpu_relax() in busy loops as a compiler barrier. Depending on the architecture, cpu_relax() may do more than needed in this specific mutex spin loops. On System z we also give up the time slice of the virtual cpu in cpu_relax(), which prevents effective spinning on the mutex. This patch replaces cpu_relax() in the spinning mutex code with arch_mutex_cpu_relax(), which can be defined by each architecture that selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so this patch should not affect other architectures than System z for now. Signed-off-by: Gerald Schaefer Signed-off-by: Peter Zijlstra LKML-Reference: <1290437256.7455.4.camel@thinkpad> Signed-off-by: Ingo Molnar commit c03017544e3b2e60aa3c8ae451fac01595f1bf11 Author: Peter Oberparleiter Date: Wed Jan 5 12:48:13 2011 +0100 [S390] cio: fix ccwgroup unregistration race condition A race condition exists in the ccwgroup device unregistration code which can cause a kernel panic due to a use-after-free bug. This race condition might be triggered when all ccw devices associated with a ccwgroup device are removed at the same time (e.g. because the corresponding channel path becomes no longer available). Fix this race condition by clearing the references from the associated ccw devices to the ccw group device during unregistration of the ccw group device. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit f602be639e97024a77062368e123008c94b3109a Author: Heiko Carstens Date: Wed Jan 5 12:48:12 2011 +0100 [S390] perf: add DWARF register lookup for s390 Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 4cc9bed034d1ae588e5b773ee0edeb74ef3c0ff4 Author: Martin Schwidefsky Date: Wed Jan 5 12:48:11 2011 +0100 [S390] cleanup ftrace backend functions Signed-off-by: Martin Schwidefsky commit 5e9a26928f550157563cfc06ce12c4ae121a02ec Author: Martin Schwidefsky Date: Wed Jan 5 12:48:10 2011 +0100 [S390] ptrace cleanup Overhaul program event recording and the code dealing with the ptrace user space interface. Signed-off-by: Martin Schwidefsky commit da7f51c11d5fedca9ba779ee220063ccb4f0a27e Author: Heiko Carstens Date: Wed Jan 5 12:48:09 2011 +0100 [S390] smp/idle: call init_idle() before starting a new cpu Call init_idle() which (re-)initializes the idle task structure before it gets used on a new cpu. That way we can also get rid of the odd preempt_enable_no_resched() call we have in the cpu offline path within cpu_idle(). That call prevented preempt count imbalances between cpu hotplug operations. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f230886b0b0f0ce604395481bea05f3c0ad8fc9e Author: Heiko Carstens Date: Wed Jan 5 12:48:08 2011 +0100 [S390] smp: delay idle task creation Delay idle task creation until a cpu gets set online instead of creating them for all possible cpus at system startup. For one cpu system this should safe more than 1 MB. On my debug system with lots of debug stuff enabled this saves 2 MB. Same as on x86. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 09a8e7adcf960bd6a7204f3f3b377a89ce22efbf Author: Stefan Haberland Date: Wed Jan 5 12:48:07 2011 +0100 [S390] dasd: Correct retry counter for terminated I/O. In case the DASD driver needs to term a running I/O the retry counter is decreased twice. Remove the unnecessary retry counter decrease in das_term_IO. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit e4dbb0f2b5dd6a836d0e5c60aa5f573e0bbcf76a Author: Stefan Haberland Date: Wed Jan 5 12:48:06 2011 +0100 [S390] dasd: Add support for raw ECKD access. Normal I/O operations through the DASD device driver give only access to the data fields of an ECKD device even for track based I/O. This patch extends the DASD device driver to give access to whole ECKD tracks including count, key and data fields. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 6f272b9cec285a9610a2acf101f694bc58bed37e Author: Stefan Haberland Date: Wed Jan 5 12:48:05 2011 +0100 [S390] dasd: Prevent deadlock during suspend/resume. The freeze callback may set a stop bit so that a worker thread could not start I/O. The discipline specific freeze function waits for the worker to be completed. Set the stop_bit after the discipline specific freeze function has returned and no worker is running. Signed-off-by: Stefan Haberland Signed-off-by: Martin Schwidefsky commit 5a27e60dec59a95bd7f8ae9a19ae2ede4f76395b Author: Stefan Weinhuber Date: Wed Jan 5 12:48:04 2011 +0100 [S390] dasd: Improve handling of stolen DASD reservation If a DASD device has been reserved by a Linux system, and later this reservation is ‘stolen’ by a second system by means of an unconditional reserve, then the first system receives a notification about this fact. With this patch such an event can be either ignored, as before, or it can be used to let the device fail all I/O request, so that the device will not block anymore. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit a4d26c6aeceea330ee5e0fb6b017d57e3b252d29 Author: Stefan Weinhuber Date: Wed Jan 5 12:48:03 2011 +0100 [S390] dasd: do path verification for paths added at runtime When a new path is added at runtime, the CIO layer will call the drivers path_event callback. The DASD device driver uses this callback to trigger a path verification for the new path. The driver will use only those paths for I/O, which have been successfully verified. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit ef19298b406f93af4bb249f0776deb8366e97532 Author: Stefan Weinhuber Date: Wed Jan 5 12:48:02 2011 +0100 [S390] dasd: add High Performance FICON multitrack support Some storage systems support multitrack High Performance FICON requests, which read or write data to more than one track. This patch enables the DASD device driver to generate multitrack High Performance FICON requests. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit 9062014cb60194630272709da82d5879d563865e Author: Stefan Weinhuber Date: Wed Jan 5 12:48:01 2011 +0100 [S390] cio: reduce memory consumption of itcw structures Any list of indirect data adresses (TIDAL) used by a TCW must not cross a page boundary. The original itcw implementation complies with this restriction by allocating allmost twice as much memory as actually needed, so that in any case there is enough room for the full TIDAL, either above or below the page boundary. This patch implements an alternative method, by using a TTIC TIDAW to connect TIDAL parts below and above a page boundary. Signed-off-by: Stefan Weinhuber Signed-off-by: Martin Schwidefsky commit f3e1a273594c7d82b07102bd03e8adfe681f2864 Author: Heiko Carstens Date: Wed Jan 5 12:48:00 2011 +0100 [S390] nmi: enable machine checks early Until now machine checks for the swapper process of the IPL cpu are just implicitly (and more or less accidently) enabled when the first time the idle process goes into idle state and loads an enabled wait psw. Before that machine checks are disabled. So let's enable them explicitly in trap_init() so we have a well defined time when machine checks are enabled. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit aa3a41d009d433dd9775b356b2d70551816f1f3c Author: Jan Glauber Date: Wed Jan 5 12:47:59 2011 +0100 [S390] qeth: buffer count imbalance The used buffers counter is not incremented in case of an error so the counter can become negative. Increment the used buffers counter before checking for errors. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 4bc4e965d3e86897e4c7c487a477ccdf13db5b82 Author: Sebastian Ott Date: Wed Jan 5 12:47:58 2011 +0100 [S390] css: update subchannel descriptor Update the subchannel descriptor if we receive a "Installed parameters modified" crw. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 1de3447a41ea72972966b4896a9f8d2b064bd23f Author: Martin Schwidefsky Date: Wed Jan 5 12:47:57 2011 +0100 [S390] 31 bit entry.S update. Make the code in the 31 bit entry.S code as similar as possible to the 64 bit version in entry64.S. That makes it easier to add new code to the first level interrupt handler that affects both 31 and 64 bit kernels. Signed-off-by: Martin Schwidefsky commit ce322ccd53f2505cf8b0ed204631d6ac054ac66a Author: Sebastian Ott Date: Wed Jan 5 12:47:56 2011 +0100 [S390] cio: obtain mdc value per channel path Add support to accumulate the number of 64K-bytes blocks all paths to a device at least support for a transport command. Signed-off-by: Sebastian Ott Signed-off-by: Martin Schwidefsky commit 37e8952174c6c239d1c86125e032fd6ad107a3e6 Author: Heiko Carstens Date: Wed Jan 5 12:47:55 2011 +0100 [S390] nohz: optimize arch_needs_cpu() arch_needs_cpu() gets always executed on the current cpu. Therefore the cpu parameter can be ignored it is possible to use __get_cpu_var() instead of per_cpu() to access the per_cpu variable, which will generate better code. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 90adac58d1a4daf3560739ff5b76497d5ece16c4 Author: Jan Glauber Date: Wed Jan 5 12:47:54 2011 +0100 [S390] qdio: cleanup SIGA sync Simplify the SIGA sync code and add unlikely annotations. In polling mode SBALs may be accessed without interrupt, so call SIGA sync before every scan. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 110da31709023de61735f2d8a3e52c20c23bb570 Author: Jan Glauber Date: Wed Jan 5 12:47:53 2011 +0100 [S390] qdio: remove enhanced SIGA HiperSocket devices only use one SBAL per qdio call without the enhanced SIGA feature. Since that feature is currently not used remove it from the qdio code so the compiler can generate better code for the HiperSocket outbound path. While at it mark the SIGA error conditions as unlikely. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 958c0ba403cb6a693b54be2389f9ef53377fa259 Author: Jan Glauber Date: Wed Jan 5 12:47:52 2011 +0100 [S390] qdio: use proper QEBSM operand for SIGA-R and SIGA-S If QIOASSIST is enabled for a qdio device the SIGA instruction requires a modified function code. This function code modifier was missing for SIGA-R and SIGA-S which can lead to a kernel panic caused by an operand exception. Cc: stable@kernel.org Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 0195843bfda90a215f3b72c9aac2fd0bc9244b67 Author: Jan Glauber Date: Wed Jan 5 12:47:51 2011 +0100 [S390] qdio: outbound queue full counter Add a counter for outbound queue full events to the qdio statistics. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 3d6c76ff32bb9b2ebf6e859855d315eb42e3df50 Author: Jan Glauber Date: Wed Jan 5 12:47:50 2011 +0100 [S390] qdio: outbound tasklet scan threshold Introduce a scan treshold for the qdio outbound queues. By setting the threshold the driver can tell qdio after how much used SBALs qdio should schedule the outbound tasklet that scans the queue for finished SBALs. The threshold is specific by the drivers because a Hipersockets device is much faster in utilizing outbound buffers than a ZFCP or OSA device. The default values after how many used SBALs the tasklet should run are: OSA: > 31 SBALs Hipersockets: > 7 SBALs zfcp: > 55 SBALs Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 4f325184f2d4c1f2258873b2a333005dc4dfcbc0 Author: Jan Glauber Date: Wed Jan 5 12:47:49 2011 +0100 [S390] qdio: prevent race for shared indicators If the shared indicator is used the following race leads to an inbound stall: Device CPU0 CPU1 ======================================================== non-shared DSCI =>1 ALSI => 1 Thin INT ALSI => 0 non-shared DSCI tasklets scheduled shared DSCI => 1 ALSI => 1 shared DSCI => 0 ALSI ? -> set Thin INT ALSI => 0 ALSI was set, shared DSCI => 1 After that no more interrupts occur because the DSCI is still set. Fix that race by only resetting the shared DSCI if it was actually set so the tasklets for all shared devices are scheduled and will run after the interrupt. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 078f8ecaa30718694d1e13d9f415b7ce75b3c968 Author: Felix Beck Date: Wed Jan 5 12:47:48 2011 +0100 [S390] Handling of 4096 bit RSA keys in CRT format. Also process 4096 bit RSA keys in CRT format. Handle them like the smaller keys and take care of the zero padding. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit c2567f8ffa2704f6f2f81013e9a590deca5a865f Author: Felix Beck Date: Wed Jan 5 12:47:47 2011 +0100 [S390] zcrypt: cope with cca restriction of cex3 The cca on the crypto adapter has a restriction in the size of the exponent if a key with a modulus bigger than 2048 bit is used. Thus in that case we have to avoid that the crypto device driver thinks the adapter is defect and sets it offline. Therfore a new member for the zcrypt_device struct called max_exp_bit_length is introduced. This will be set the first time the cca returns the error code function not implemented. If this is done with an adapter twice it will return -EINVAL. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 2ade1fab026b4a103f0105ec4b47654fc2f729c7 Author: Felix Beck Date: Wed Jan 5 12:47:46 2011 +0100 [S390] zcrypt: support for 4096 bit keys for cex3c Definitions for CEX3 card types are changed to support 4096 bit RSA keys in the coprocessor. Signed-off-by: Felix Beck Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit 3e309a66f52e042881f76cbfb9b6c2aa70163e02 Author: Felix Beck Date: Wed Jan 5 12:47:45 2011 +0100 [S390] zcrypt: support for 4096 bit keys for cex3a Definitions for CEX3 card types are changed to support 4096 bit RSA keys. Also new structs for the accelerator mode are needed. Additionaly when checking the length of key parts, the case for bigger (4096 bit) keys is needed. Signed-off-by: Felix Beck Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit b1f933da570576d1f290ea4dc9b896404cbd285d Author: Felix Beck Date: Wed Jan 5 12:47:44 2011 +0100 [S390] zcrypt: Introduce check for 4096 bit support. Implemented an asm in the ap bus and made it accessible for the card specific parts of the zcrypt driver. Thus when a cex3a is recognized a check can be performed to dermine whether the card supports 4096 bit RSA keys. Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 2fcb3686e1601cff992e026dceeab1b22dc81178 Author: Michael Holzheu Date: Wed Jan 5 12:47:43 2011 +0100 [S390] hypfs: Move buffer allocation from open to read Currently the buffer for diagnose data is allocated in the open function of the debugfs file and is released in the close function. This has the drawback that a user (root) can pin that memory by not closing the file. This patch moves the buffer allocation to the read function. The buffer is automatically released after the buffer is copied to userspace. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 6432c015b754fef910dd7468b16fffc2b975348a Author: Martin Schwidefsky Date: Wed Jan 5 12:47:42 2011 +0100 [S390] current_thread_info optimization Use thread_info lowcore field for current_thread_info(), saves an unnecessary calculation. Signed-off-by: Martin Schwidefsky commit b1b750918566c6c4e8ed6c9b3c0f05b4c0a8805c Author: Heiko Carstens Date: Wed Jan 5 12:47:41 2011 +0100 [S390] extint: get rid of early code plus cleanup Get rid of register/unregister_early_external_interrupt() and clean up the code while at it. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 98b799800c3e2f855ef2d2c6263e84fa5d1420a0 Author: Heiko Carstens Date: Wed Jan 5 12:47:40 2011 +0100 [S390] sclp: use register_external_interrupt() Use register_external_interrupt() instead of register_early_external_interrupt(). The early variant is not necessary since kmalloc works already. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit fb0a9d7e865afdae70829a64bb004a74ff67d29f Author: Heiko Carstens Date: Wed Jan 5 12:47:39 2011 +0100 [S390] pfault: delay register of pfault interrupt Use an early init call to initialize pfault. That way it is possible to use the register_external_interrupt() instead of the early variant. No need to enable pfault any earlier since it has only effect if user space processes are running. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 62d146ffe3adfed2747fc36138476c8417ce73a7 Author: Holger Dengler Date: Wed Jan 5 12:47:38 2011 +0100 [S390] ap bus: add support for irq statistics Add support for AP Bus I/O interrupt statistics in /proc/interrupts. Signed-off-by: Holger Dengler Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit 85b81cdd0b038d580dedf6289df7de65826967d6 Author: Heiko Carstens Date: Wed Jan 5 12:47:37 2011 +0100 [S390] ctc: add support for irq statistics Add support for CTC I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 355eb4022b92349f70cd69ce5b9572c71c0be226 Author: Heiko Carstens Date: Wed Jan 5 12:47:36 2011 +0100 [S390] claw: add support for irq statistics Add support for CLAW I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 096a61682e86090e4e74118ff6fa6858ca73aa58 Author: Heiko Carstens Date: Wed Jan 5 12:47:35 2011 +0100 [S390] lcs: add support for irq statistics Add support for LCS I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit f48198d592b0d680b9677bd69edd2290cd0c1f4f Author: Heiko Carstens Date: Wed Jan 5 12:47:34 2011 +0100 [S390] vmur: add support for irq statistics Add support for VMUR I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit b86651721f18f40319efe94ed3eac2d26682e5b9 Author: Heiko Carstens Date: Wed Jan 5 12:47:33 2011 +0100 [S390] tape: add support for irq statistics Add support for ccw based tape I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3fe22f6bfd6f81aafd140d69578d3a2c39674664 Author: Heiko Carstens Date: Wed Jan 5 12:47:32 2011 +0100 [S390] 3270: add support for irq statistics Add support for 3270 I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 12fae5858cd97181c92472c9bb5f098a7eca2ffe Author: Heiko Carstens Date: Wed Jan 5 12:47:31 2011 +0100 [S390] 3215: add support for irq statistics Add support for 3215 I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 3283942b71eb5023184b378230f5f0e3fbb40991 Author: Heiko Carstens Date: Wed Jan 5 12:47:30 2011 +0100 [S390] dasd: add support for irq statistics Add support for DASD I/O interrupt statistics in /proc/interrupts. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 30d77c3e1cbdff304b16ae02cb56baaa308e42fd Author: Jan Glauber Date: Wed Jan 5 12:47:29 2011 +0100 [S390] qdio: add qdio interrupts to interrupt statistics Count traditional qdio interrupts and adapter interrupts for qdio in the interrupt statistics. Signed-off-by: Jan Glauber Signed-off-by: Martin Schwidefsky commit 052ff461c8427629aee887ccc27478fc7373237c Author: Heiko Carstens Date: Wed Jan 5 12:47:28 2011 +0100 [S390] irq: have detailed statistics for interrupt types Up to now /proc/interrupts only has statistics for external and i/o interrupts but doesn't split up them any further. This patch adds a line for every single interrupt source so that it is possible to easier tell what the machine is/was doing. Part of the output now looks like this; CPU0 CPU2 CPU4 EXT: 3898 4232 2305 I/O: 782 315 245 CLK: 1029 1964 727 [EXT] Clock Comparator IPI: 2868 2267 1577 [EXT] Signal Processor TMR: 0 0 0 [EXT] CPU Timer TAL: 0 0 0 [EXT] Timing Alert PFL: 0 0 0 [EXT] Pseudo Page Fault [...] NMI: 0 1 1 [NMI] Machine Checks Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 545b288dcbdea58a2ce2afba5f6a8302d31ac459 Author: Heiko Carstens Date: Wed Jan 5 12:47:27 2011 +0100 [S390] time: let local_tick_enable/disable() reprogram the clock comparator Let local_tick_enable/disable() reprogram the clock comparator so the function names make semantically more sense. Also that way the functions are more symmetric since normally each local_tick_enable() call usually would have a subsequent call to set_clock_comparator() anyway. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 17eb7a5cfa98627e5b34e9a9a33b4f04f1c8832d Author: Heiko Carstens Date: Wed Jan 5 12:47:26 2011 +0100 [S390] time: move local_tick_enable()/disable() to timex.h Move the two functions to timex.h where they make more sense than in hardirq.h. No functional change. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 860dba45e81be2e1ba977617652ae36084daebaf Author: Martin Schwidefsky Date: Wed Jan 5 12:47:25 2011 +0100 [S390] add kprobes annotations Add kprobes annotations to get the massive 'probe kernel.function("*") {}' stress test working. Signed-off-by: Martin Schwidefsky commit 4a1886358b2d68f6f8745bfc10399c2376681acc Author: Martin Schwidefsky Date: Wed Jan 5 12:47:24 2011 +0100 [S390] kprobes: coding style Correct some minor coding style issues. Signed-off-by: Martin Schwidefsky commit 0e917cc3297f3274993d25b5972c2b1c6f763819 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:23 2011 +0100 [S390] kprobes: restructure handler function Restructure the kprobe breakpoint handler function. Add comments to make it more comprehensible and add a sanity check for re-entering kprobes. Signed-off-by: Martin Schwidefsky commit 92b8cbf17ae98a118d3e4a123246a05130114d06 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:22 2011 +0100 [S390] kprobes: jprobe save and restore Register %r14 and %r15 are already stored in jprobe_saved_regs, no need to store them a second time in jprobe_saved_r14 / jprobe_saved_r15. Signed-off-by: Martin Schwidefsky commit 371db06b017c518da2d69ae278c5978ebcd1041a Author: Martin Schwidefsky Date: Wed Jan 5 12:47:21 2011 +0100 [S390] kprobes: insn slots The s390 architecture can execute code on kmalloc/vmalloc memory. No need for the __ARCH_WANT_KPROBES_INSN_SLOT detour. Signed-off-by: Martin Schwidefsky commit b9599798f953084774da926caa8bafd7e244948e Author: Martin Schwidefsky Date: Wed Jan 5 12:47:20 2011 +0100 [S390] kprobes: activation and deactivation Replace set_current_kprobe/reset_current_kprobe/save_previous_kprobe/ restore_previous_kprobe with a simpler scheme push_kprobe/pop_kprobe. The mini kprobes stack can store up to two active kprobes. Signed-off-by: Martin Schwidefsky commit ba640a591574036ab22cd32b47897340b0605342 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:19 2011 +0100 [S390] kprobes: instruction fixup Determine instruction fixup details in resume_execution, no need to do it beforehand. Remove fixup, ilen and reg from arch_specific_insn. Signed-off-by: Martin Schwidefsky commit 5a8b589f8a35b2c69d1819e3365825e4385a844c Author: Martin Schwidefsky Date: Wed Jan 5 12:47:18 2011 +0100 [S390] kprobes: instruction swap Move the definition of the helper structure ins_replace_args to the only place where it is used and drop the old member as it is not needed. Signed-off-by: Martin Schwidefsky commit fc0a1fea6b81095b6c0e01ec3407d04c8341974c Author: Martin Schwidefsky Date: Wed Jan 5 12:47:17 2011 +0100 [S390] kprobes: single step cleanup The saved interrupt mask and the saved control registers are only relevant while single stepping is set up. A secondary kprobe while kprobe single stepping is active may not occur. That makes is safe to remove the save and restore of kprobe_saved_imask / kprobe_save_ctl from save_previous_kprobe and restore_previous_kprobe. Move all single step related code to two functions, enable_singlestep and disable_singlestep. Signed-off-by: Martin Schwidefsky commit 35f2aaa79a2d484c8449f34461464a1e84e36e2b Author: Martin Schwidefsky Date: Wed Jan 5 12:47:16 2011 +0100 [S390] kprobes: single stepped breakpoint Remove special case of a kprobe on a breakpoint while a relocated instruction is single stepped. The only instruction that may cause a fault while kprobe single stepping is active is the relocated instruction. There is no kprobe on the instruction slot retrieved with get_insn_slot(). Signed-off-by: Martin Schwidefsky commit 6f9a3c330652b0fdb65d89e94977a8e79fe730e7 Author: Martin Schwidefsky Date: Wed Jan 5 12:47:15 2011 +0100 [S390] cleanup s390 Kconfig Make use of def_bool and def_tristate where possible and add sensible defaults to the config symbols where applicable. This shortens the defconfig file by another ~40 lines. Signed-off-by: Martin Schwidefsky commit 53ec24b1e6c7118a127cf029a1519a2ce55268ec Author: Felix Beck Date: Wed Jan 5 12:46:44 2011 +0100 [S390] zcrypt: Fix check to look for facility bits 2 & 65 Fix the check for ap interupts to look for facility bits 2 and 65. Make sure that we only register interrupts for aps, if the machine has ap interrupt support. This patch is relevant only for the 2.6.37 stable series. Cc: stable@kernel.org Signed-off-by: Felix Beck Signed-off-by: Martin Schwidefsky commit f6c2ed5dd6ab43447dacc136585fc894e3f3a82d Author: Harsha Priya Date: Wed Jan 5 11:34:51 2011 +0530 ASoC: Fix the device references to codec and platform drivers The soc-core takes the platform and codec driver reference during probe. Few of these references are not released during remove. This cause the platform and codec driver module unload to fail. This patch fixes by the taking only one reference to platform and codec module during probe and releases them correctly during remove. This allows load/unload properly Signed-off-by: Vinod Koul Signed-off-by: Harsha Priya Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5e79d64b038ae0039663f721f4b9f5ce1951d9da Author: Jarkko Nikula Date: Wed Jan 5 12:05:44 2011 +0200 ASoC: Remove needless inclusion of tlv320aic3x.h from machine drivers After multi-component conversion these machine drivers don't actually need anything from sound/soc/codecs/tlv320aic3x.h so don't include it. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0af85dda39d9b673aca8c0ebae004ea70f3efc93 Author: Russell King Date: Wed Dec 15 21:58:50 2010 +0000 ARM: vexpress: add sched_clock() for Versatile Express Add a sched_clock() implementation to Versatile Express using the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Will Deacon Signed-off-by: Russell King commit 1051b9f0f9eab8091fe3bf98320741adf36b4cfa Merge: cde9efe a58154d Author: Russell King Date: Wed Jan 5 10:23:38 2011 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit 74d2b7a34bb69dcbb0a83736c53c33bdc1a6d468 Merge: 8c1b530 2742f2a Author: Mark Brown Date: Wed Jan 5 10:06:55 2011 +0000 Merge branch 'for-2.6.37' into for-2.6.38 Conflicts: sound/soc/samsung/smartq_wm8987.c commit 2742f2ada3578db2fb676c1f23ad6a38d002608e Author: Maurus Cuelenaere Date: Sun Jan 2 20:48:23 2011 +0100 ASoC: Fix SmartQ compilation This makes the SmartQ sound driver compile again with recent ASoC changes. Signed-off-by: Maurus Cuelenaere Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8c1b5306f0da93f5f9bb9aa7024828cb2b7ab387 Author: Mark Brown Date: Sun Jan 2 14:07:46 2011 +0000 ASoC: Change Samsung Kconfig from ASOC_ to SND_SOC_ The rest of ASoC is using SND_SOC_ as the prefix for all the Kconfig symbols so do so for the new Samsung drivers too, rather than using ASOC_ as they currently are. Signed-off-by: Mark Brown Acked-by: Seungwhan Youn Acked-by: Jassi Brar Acked-by: Liam Girdwood commit d3a23e1678a5827c38ed8a465ad91d65e59fa911 Author: Nick Piggin Date: Wed Jan 5 20:01:21 2011 +1100 Revert "fs: use RCU read side protection in d_validate" This reverts commit 3825bdb7ed920845961f32f364454bee5f469abb. You cannot dget() a dentry without having a reference, or holding a lock that guarantees it remains valid. Signed-off-by: Nick Piggin commit 97cbc8fb1e35e328073e84c4031bd338306397d6 Merge: 17d6ce1 14bbb7c Author: Paul Mundt Date: Wed Jan 5 17:30:20 2011 +0900 Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 025a10a76808cfd9e55dbf965d0f1453e4f8ae84 Merge: 6bf45a1 f7dd361 c070c20 d0fb0c4 Author: Paul Mundt Date: Wed Jan 5 17:25:29 2011 +0900 Merge branches 'rmobile/mmcif', 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig Signed-off-by: Paul Mundt commit 14bbb7c61557172e4482d4d97a5f56042a12b969 Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:29 2010 +0000 fbdev: sh_mipi_dsi: use platform provided register layout and values Different sh-mobile SoCs have variations in their MIPI DSI register layouts, besides, different LCD panels require different configuration parameters. This patch switches the driver to use platform-provided MIPI DSI parameters. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 6fd465956e287f2bff8ff70ad4f27825dc3b468c Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:26 2010 +0000 ARM: mach-shmobile: specify sh7372 MIPI DSI register layout Prepare the ap4evb board for the MIPI DSI driver transition to support different register layouts. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 38f3a8794236af422312d280bbe3801130cfa63b Author: Guennadi Liakhovetski Date: Wed Dec 29 08:12:22 2010 +0000 fbdev: sh_mipi_dsi: support different register layouts The register layout of the MIPI DSI unit on sh-mobile SoCs differ. Add platform parameters to support such variations. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 0851d50dc12a844778a9b243e141f713cd8f074f Author: Guennadi Liakhovetski Date: Mon Dec 27 10:23:09 2010 +0000 ARM: mach-shmobile: improve MIPI DSI clock configuration Now, that the MIPI DSI driver implements runtime PM, we don't need anymore to configure clocks statically in the platform code. This patch also adds a DSITX1 clock definition for sh7372 and attaches PHY clocks to respective devices. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 236782a5f3674d06865d822092b8a1ea65a44f96 Author: Guennadi Liakhovetski Date: Mon Dec 27 10:23:05 2010 +0000 fbdev: sh-mobile: implement MIPI DSI runtime PM support On SH-Mobile platforms using runtime PM with the MIPI DSI driver switches the DSI Tx link clock on PM events. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c070c203cde0e019cd373d3247137be11961deb3 Author: Takashi YOSHII Date: Wed Dec 22 14:15:08 2010 +0000 ARM: mach-shmobile: sh73a0: fix div4 table sh73a0 has divisor[12] setting as 1/7 on FRQCRA. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d0fb0c4b3fc9b31cc635e89b6a2f9aaa30bf75db Author: Kuninori Morimoto Date: Tue Dec 28 05:54:53 2010 +0000 ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit ae37c8de74734f640f757be64ddb85f19f042626 Author: Magnus Damm Date: Wed Dec 22 14:47:40 2010 +0000 ARM: mach-shmobile: Mackerel VGA camera support Add VGA camera support to the Mackerel board using soc_camera_platform. The VGA camera module is hooked up using the 8-bit CEU bus, and it is constantly bursting out frames in fixed video mode setting. The camera module does not allow any I2C control. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit eac676e531214f1e276645613acae7d7c4529035 Author: Roel Kluin Date: Sat Jan 1 18:36:36 2011 +0000 sh: correct definitions to access stack pointers A definition like: #define regs_return_value(regs) ((regs)->regs[0]) called with regs_return_value(foo) will be preprocessed to: ((foo)->foo[0]) ^^^ So to fix this to ensure the preprocessor compiles such calls correctly. Signed-off-by: Roel Kluin Signed-off-by: Paul Mundt commit f7dd3611c85f50a98e8f3b9b1d52aaf540ebeb7b Author: Guennadi Liakhovetski Date: Wed Dec 29 07:59:25 2010 +0000 mmc: sh_mmcif: make DMA support by the driver unconditional Simplify the driver by removing the possibility to build it without the DMA support and remove the respective Kconfig parameter. Signed-off-by: Guennadi Liakhovetski Acked-by: Magnus Damm Signed-off-by: Paul Mundt commit c9942c5675e4bae015ece7727ed01b7841a477b8 Author: Greg Ungerer Date: Thu Nov 18 12:52:08 2010 +1000 m68knommu: switch to using -mcpu= flags for ColdFire targets Gcc has deprecated the use of the following ColdFire cpu options: -m5206e, -m528x, -m5307 and -m5407. In there place we should use the equivilent -mcpu= option and setting. Signed-off-by: Greg Ungerer commit 0a977ca3cd6c3f9fc04c6edafcd913d6776361e3 Author: Philippe De Muyter Date: Thu Nov 11 23:57:56 2010 +0100 m68knommu: arch/m68knommu/Kconfig whitespace cleanup Replace 8 spaces, or even 7, by TAB at begin of lines. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit 07ffee59a756e3d16295fa1e0a4849c7a2273a13 Author: Greg Ungerer Date: Wed Nov 10 15:22:19 2010 +1000 m68knommu: create optimal separate instruction and data cache for ColdFire Create separate functions to deal with instruction and data cache flushing. This way we can optimize them for the vairous cache types and arrangements used across the ColdFire family. For example the unified caches in the version 3 cores means we don't need to flush the instruction cache. For the version 2 cores that do not do data cacheing (or where we choose instruction cache only) we don't need to do any data flushing. Signed-off-by: Greg Ungerer commit 4a5bae416562a8224707a1ff30e83ddab1474fb3 Author: Greg Ungerer Date: Tue Nov 9 16:00:17 2010 +1000 m68knommu: support ColdFire caches that do copyback and write-through The version 3 and version 4 ColdFire cache controllers support both write-through and copy-back modes on the data cache. Allow for Kconfig time configuration of this, and set the cache mode appropriately. Signed-off-by: Greg Ungerer commit 0ef6c9b8f7bf62ea05be5b26ee14b18a116b0c2a Author: Greg Ungerer Date: Tue Nov 9 15:31:08 2010 +1000 m68knommu: support version 2 ColdFire split cache The newer version 2 ColdFire CPU cores support a configurable cache arrangement. The cache memory can be used as all instruction cache, all data cache, or split in half for both instruction and data caching. Support this setup via a Kconfig time menu that allows a kernel builder to choose the arrangement they want to use. Signed-off-by: Greg Ungerer commit d475e3e4739ce465df740b51decbbea3b1b51823 Author: Greg Ungerer Date: Tue Nov 9 14:27:50 2010 +1000 m68knommu: make cache push code ColdFire generic Currently the code to push cache lines is only available to version 4 cores. Version 3 cores may also need to use this if we support copy- back caches on them. Move this code to make it more generic, and useful for all version ColdFire cores. With this in place we can now have a single cache_flush_all() code path that does all the right things on all version cores. Signed-off-by: Greg Ungerer commit 8ce877a8eb8293b5b2c07f259d694026b0f519e4 Author: Greg Ungerer Date: Tue Nov 9 13:35:55 2010 +1000 m68knommu: clean up ColdFire cache control code The cache control code for the ColdFire CPU's is a big ugly mess of "#ifdef"ery liberally coated with bit constants. Clean it up. The cache controllers in the various ColdFire parts are actually quite similar. Just differing in some bit flags and options supported. Using the header defines now in place it is pretty easy to factor out the small differences and use common setup and flush/invalidate code. I have preserved the cache setups as they where in the old code (except where obviously wrong - like in the case of the 5249). Following from this it should be easy now to extend the possible setups used on the CACHE controllers that support split cacheing or copy-back or write through options. Signed-off-by: Greg Ungerer commit 3d461401eb5e3a8c471e92500aebd6c115273fba Author: Greg Ungerer Date: Tue Nov 9 10:40:44 2010 +1000 m68knommu: move inclusion of ColdFire v4 cache registers Move the inclusion of the version 4 cache controller registers so that it is with all the other register bit flag definitions. This makes it consistent with the other version core inclusion points, and means we don't need "#ifdef"ery in odd-ball places for these definitions. Signed-off-by: Greg Ungerer commit 278c2cbd59371bc8905d83b7cc3aa0bbe69c00f1 Author: Greg Ungerer Date: Tue Nov 9 10:19:45 2010 +1000 m68knommu: merge bit definitions for version 3 ColdFire cache controller All version 3 based ColdFire CPU cores have a similar cache controller. Merge all the exitsing definitions into a single file, and make them similar in style and naming to the existing version 2 and version 4 cache controller definitions. Signed-off-by: Greg Ungerer commit a12cf0a8c6e2763ac865aa31f296557e07432b8a Author: Greg Ungerer Date: Tue Nov 9 10:12:29 2010 +1000 m68knommu: create bit definitions for the version 2 ColdFire cache controller The version 2 ColdFire CPU based cores all contain a similar cache controller unit. Create a set of bit flag definitions for the supporting registers. Signed-off-by: Greg Ungerer commit 63e83c8a52031555b1e724f98a33f1838dee6345 Author: Greg Ungerer Date: Thu Nov 4 16:17:43 2010 +1000 m68knommu: remove empty __iounmap() it is no used The empty __iounmap() function is not used on m68knommu at all. Signed-off-by: Greg Ungerer commit b00b766d0cca46133955ea8f19f6d259ad854797 Author: Greg Ungerer Date: Thu Nov 4 16:06:02 2010 +1000 m68knommu: remove kernel_map() code, it is not used The kernel_map() functions is not used anywhere, remove it. Signed-off-by: Greg Ungerer commit bb4edc5e4478db21147f86b6682704bfc1125c55 Author: Greg Ungerer Date: Thu Nov 4 16:00:44 2010 +1000 m68knommu: remove do_page_fault(), it is not used The non-MMU m68k does not use the do_page_fault() code, so remove it. Signed-off-by: Greg Ungerer commit 1c83af5f9d7e15a091f11394ad5916a7dcf1a99e Author: Greg Ungerer Date: Thu Nov 4 13:53:26 2010 +1000 m68knommu: use user stack pointer hardware on some ColdFire cores The more modern ColdFire parts (even if based on older version cores) have separate user and supervisor stack pointers (a7 register). Modify the ColdFire CPU setup and exception code to enable and use this on parts that have it. Signed-off-by: Greg Ungerer commit 0762346034a3e94f9c3a5fe8d7c4bcaffbc1cd53 Author: Greg Ungerer Date: Wed Nov 3 16:22:50 2010 +1000 m68knommu: remove command line printing DEBUG There is no need for the DEBUG based command line printing in here. The kernel will print out the command line in the banner later in the boot up. So remove it. Signed-off-by: Greg Ungerer commit fb670fb8aa637d92aeb53407aae0decd71c1bdee Author: Greg Ungerer Date: Wed Nov 3 16:21:05 2010 +1000 m68knommu: remove fasthandler interrupt code There are no users of the old "fasthandler" interrupt entry code. So remove it. Signed-off-by: Greg Ungerer commit 57015421d3f3deafb1f6ccf03a6fe0539763dbee Author: Greg Ungerer Date: Wed Nov 3 12:50:30 2010 +1000 m68knommu: move UART addressing to part specific includes The ColdFire UART base addresses varies between the different ColdFire family members. Instead of keeping the base addresses with the UART definitions keep them with the other addresses definitions for each ColdFire part. The motivation for this move is so that when we add new ColdFire part definitions, they are all in a single file (and we shouldn't normally need to modify the UART definitions in mcfuart.h at all). Signed-off-by: Greg Ungerer commit 733f31b764061d976a60c5ee454632d9562900ea Author: Greg Ungerer Date: Tue Nov 2 17:40:37 2010 +1000 m68knommu: fix clock rate value reported for ColdFire 54xx parts The instruction timings of the ColdFire 54xx family parts are different to other version 4 parts (or version 2 or 3 parts for that matter too). Move the instruction timing setting into the ColdFire part specific headers, and set the 54xx value appropriately. Signed-off-by: Greg Ungerer commit 7fc82b655a169039d8a58fde609b5e778573d5ab Author: Greg Ungerer Date: Tue Nov 2 17:13:27 2010 +1000 m68knommu: move ColdFire CPU names into their headers Move the ColdFire CPU names out of setup.c and into their repsective headers. That way when we add new ones we won't need to modify setup.c any more. Add the missing 548x CPU name. Signed-off-by: Greg Ungerer commit 9e29949cfcf0ed737f5b9778fd232f1e6b825e3e Author: Greg Ungerer Date: Tue Nov 2 12:13:34 2010 +1000 m68knommu: add support for the ColdFire 547x family of processors The Freescale M547x family of ColdFire processors is very similar to the M548x series. We use all the same support for it. Initially all we need is a high level configuration option for it. Signed-off-by: Greg Ungerer commit 5b2e6555ac3eb58a4e5eb5020471df08f0c42c01 Author: Greg Ungerer Date: Tue Nov 2 12:05:29 2010 +1000 m68knommu: make Coldfire 548x support more generic The ColdFire 547x family of processors is very similar to the ColdFire 548x series. Almost all of the support for them is the same. Make the code supporting the 548x more gneric, so it will be capable of supporting both families. For the most part this is a renaming excerise to make the support code more obviously apply to both families. Signed-off-by: Greg Ungerer commit 9c68015b149d45a35114b4a1ed44c21fa66bc430 Author: Philippe De Muyter Date: Wed Oct 27 14:57:49 2010 +0200 m68knommu: Use symbolic constants for cache operations on M54xx Now that we have meaningfull symbolic constants for bit definitions of the cache registers of m5407 and m548x chips, use them to improve readability, portability and efficiency of the cache operations. This also fixes __flush_cache_all for m548x chips : implicit DCACHE_SIZE was exact for m5407, but wrong for m548x. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit b3d75b09bf8998fd302ba339eebbc768a110741b Author: Philippe De Muyter Date: Wed Oct 27 14:57:48 2010 +0200 m68knommu: Move __flush_cache_all definition for m54xx in m54xxacr.h __flush_cache_all for m54xx is intrinsically related to the bit definitions in m54xxacr.h. Move it there from cacheflush_no.h, for easier maintenance. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit 5291fa98565a2f4d27ec59380e8497eba2af948d Author: Philippe De Muyter Date: Wed Oct 27 14:57:47 2010 +0200 m68knommu: Create new m54xxacr.h from m5407sim.h subpart The MCF548x have the same cache control registers as the MCF5407. Extract the bit definitions for the ACR and CACR registers from m5407sim.h and move them to a new file m54xxacr.h. Those definitions are not used anywhere yet, so no other file is involved. This is a preparation for m54xx cache support cleanup. Signed-off-by: Philippe De Muyter Signed-off-by: Greg Ungerer commit 66b37c6777c4686f121fe4a83176e535a7f4b1af Author: Dave Airlie Date: Tue Dec 7 14:24:25 2010 +1000 vga_switcheroo: split switching into two stages. stage 1: turn card on, switch boot vga pointer. stage 2: switch fbs, switch mux and power off old card. Signed-off-by: Dave Airlie commit 5bcf719b7db0f9366cedaf102b081f99b1c325ae Author: Dave Airlie Date: Tue Dec 7 09:20:40 2010 +1000 drm/switcheroo: track state of switch in drivers. We need to track the state of the switch in drivers, so that after s/r we don't resume the card we've explicitly switched off before. Also don't allow a userspace open to occur if we've switched the gpu off. Signed-off-by: Dave Airlie commit 8d608aa6295242fe4c4b6105b8c59c6a5b232d89 Author: Dave Airlie Date: Tue Dec 7 08:57:57 2010 +1000 vga_switcheroo: add reprobe hook for fbcon to recheck connected outputs. This adds a hook after the mux is switched for the driver to reprobe the connected outputs. Signed-off-by: Dave Airlie commit d1fbd923da0f982f12b61a44e74c2e1f74c6ef56 Author: Dave Airlie Date: Mon Dec 6 12:56:44 2010 +1000 nouveau/acpi: improve detection of what is IGD and what is DIS. This improves the IGD/DIS picking using firstly if Intel, then if the bus is bus 0. There may be a correct way to do this, but I've no idea what it is. Signed-off-by: Dave Airlie commit 5ccb377feaaff3daa1e9a179534bbd7550d78af6 Author: Dave Airlie Date: Tue Dec 7 13:56:26 2010 +1000 drm/nouveau: add delayed switch complete callback. this just adds the callback on the delayed switch mechanism. Signed-off-by: Dave Airlie commit 851ab954daee0d8328e239a468835e36e6215182 Author: Dave Airlie Date: Mon Dec 6 12:35:52 2010 +1000 vga_switcheroo: add debugging mux switch option. This allows the mux to be switched from userspace using MIGD/MDIS command to the switch. Signed-off-by: Dave Airlie commit 5cfb3c3a1013e7fca54c3624871755cdfd960b3b Author: Dave Airlie Date: Mon Dec 6 12:31:50 2010 +1000 vga_switcheroo: make power switch handler optional At least on the nvidia mux the power switch seems to be executed by the ACPI PS0/PS3 methods so need to do it explicitly. Signed-off-by: Dave Airlie commit 6c2df40ec00e52a5fb0c691b0e79324b9015aaa4 Author: Dave Airlie Date: Mon Dec 6 12:30:31 2010 +1000 vga_switcheroo: print the IGD/DIS flag in the debugfs output. We really want to see this so we can confirm that we pick the right one. Signed-off-by: Dave Airlie commit 050855887236701c5e7ff803b42265824ce99885 Author: Sam Ravnborg Date: Tue Jan 4 11:39:19 2011 +0000 sparc: update copyright in piggyback.c Update copyright info in piggyback.c to include info from piggyback_64.c. Include my own copyright too. Signed-off-by: Sam Ravnborg Cc: Josip Rodin Cc: Jakub Jelinek Signed-off-by: David S. Miller commit 9202db2202288f0013c3285b291d8281a8190962 Author: Sam Ravnborg Date: Tue Jan 4 11:39:18 2011 +0000 sparc: unify strip command in boot/Makefile Include an additional "Kernel is ready" print for zImage Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 56818a6f9105ac016ecf5907f7cb63bcdab639fe Author: Sam Ravnborg Date: Tue Jan 4 11:39:17 2011 +0000 sparc: rename piggyback_32 to piggyback Now that we use the same piggyback for 32 and 64 bit we can drop the _32 suffix. Include some trivial unification in the Makefile now that 32 and 64 bit can share the same piggyback command. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 1075c4ef707ca83afbeb0950094436eb0245ec86 Author: Sam Ravnborg Date: Tue Jan 4 11:39:16 2011 +0000 sparc: fix tftpboot.img for sparc64 on little-endian host piggyback_32 adapted to support sparc64: - locating "HdrS" differs for sparc and sparc64 - sparc64 updates a_text, a_data + a_bss in the final a.out header Updated Makefile to use piggyback_32 for sparc64. Deleted the now unused piggyback_64.c piggyback_32.c is host endian neutral and works on both little-endian and big-endian hosts. This fixes a long standing bug where sparc64 could not generate tftpboot.img on a x86 host. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit a020bb17b7046cd97ea6924ca99325b6e516bc2d Author: Sam Ravnborg Date: Tue Jan 4 11:39:15 2011 +0000 sparc: add $BITS to piggyback arguments Add new option to piggyback that identify if this is for 32 or 64 bit. Use this information to determine the alignment used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 571e08f6e2ddd6ec5d547358f55342726c063072 Author: Sam Ravnborg Date: Tue Jan 4 11:39:14 2011 +0000 sparc: remove obsolete ELF support in piggyback_32.c As we always convert to a.out there is no need to support ELF. Removing ELF support because: - it is not used - it simplifies code to support a.out only Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 9c239053045568abf960b01e4eb2c7205e3cd7d6 Author: Sam Ravnborg Date: Tue Jan 4 11:39:13 2011 +0000 sparc: additional comments to piggyback_32.c While reverse engineering the functionality of piggyback I missed that the code was actually commented. So I added a few comments. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b2a39b0d8ec2ce2bdcff4e01572b4e885220254d Author: Sam Ravnborg Date: Tue Jan 4 11:39:12 2011 +0000 sparc: use _start for the start entry (like 64 bit does) We use "_start" in 64 bit - do the same in 32 bit. It is always good to be consistent. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit e405ae76af19cd2c85335b842f880a2bc98ba785 Author: Sam Ravnborg Date: Tue Jan 4 11:39:11 2011 +0000 sparc: use trapbase in setup_arch start and trapbase point to the same address. But using start to assing to sparc_ttable looked confusing. Replace this with the use of trapbase. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 2fe74fa9662f8df51e6ef18227089f54cc07e16a Author: Sam Ravnborg Date: Tue Jan 4 11:39:10 2011 +0000 sparc: refactor piggy_32.c Refactoring to increase readability (a little). - sort includes - spaces around operators - small helpers introduced - added a few comments Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit b7f758659265c173380b792862aaad1c23c0e004 Author: Russell King - ARM Linux Date: Mon Jan 3 22:46:17 2011 +0000 ARM: PL08x: prevent dma_set_runtime_config() reconfiguring memcpy channels Prevent dma_set_runtime_config() being used to alter the configuration supplied by the platform for memcpy channel configuration. No one should be trying to change this configuration. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit f0fd944625b6e406dc273b8dffa16e0728c973e6 Author: Russell King - ARM Linux Date: Mon Jan 3 22:45:57 2011 +0000 ARM: PL08x: allow dma_set_runtime_config() to return errors There are cases in dma_set_runtime_config() where we fail to perform the requested action - and we just issue a KERN_ERR message in that case. We have the facility to return an error to the caller, so that is what we should do. When we encounter an error due to invalid parameters, we should not modify driver state. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit c370e594efe2993620d24d41a78f325102e99d1c Author: Russell King - ARM Linux Date: Mon Jan 3 22:45:37 2011 +0000 ARM: PL08x: fix locking between prepare function and submit function The PL08x driver holds on to the channel lock with interrupts disabled between the prepare and the subsequent submit API functions. This means that the locking state when the prepare function returns is dependent on whether it suceeeds or not. It did this to ensure that the physical channel wasn't released, and as it used to add the descriptor onto the pending list at prepare time rather than submit time. Now that we have reorganized the code to remove those reasons, we can now safely release the spinlock at the end of preparation and reacquire it in our submit function. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 8087aacda040bdbf84940712d132ce80c30b9d5d Author: Russell King - ARM Linux Date: Mon Jan 3 22:45:17 2011 +0000 ARM: PL08x: introduce 'phychan_hold' to hold on to physical channels Introduce 'phychan_hold' to hold on to physical DMA channels while we're preparing a new descriptor for it. This will be incremented when we allocate a physical channel and set the MUX registers during the preparation of the TXD, and will only be decremented when the TXD is submitted. This prevents the physical channel being given up before the new TXD is placed on the queue. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 501e67e82dee68d0a594ec0549f3d6a2943c91f5 Author: Russell King - ARM Linux Date: Mon Jan 3 22:44:57 2011 +0000 ARM: PL08x: put txd's on the pending list in pl08x_tx_submit() Don't place TXDs on the pending list when they're prepared - place them on the list when they're ready to be submitted. Also, only place memcpy requests in the wait state when they're submitted and don't have a physical channel associated. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 15c17232fbd1f7687c740c3c26f9e7f337bd9e36 Author: Russell King - ARM Linux Date: Mon Jan 3 22:44:36 2011 +0000 ARM: PL08x: rename 'desc_list' as 'pend_list' This 'desc_list' is actually a list of pending descriptors, so name it after its function (pending list) rather than what it contains (descriptors). Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 3d992e1a6f8465db3921ef75bfc490fbd2f40cd3 Author: Russell King - ARM Linux Date: Mon Jan 3 22:44:16 2011 +0000 ARM: PL08x: implement unmapping of memcpy buffers The DMA engine API requires DMA engine implementations to unmap buffers passed into the non-slave DMA methods unless the relevant completion flag is set. We aren't doing this, so implement this facility. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit c04287948ec8308fceedda980373bc7d53620255 Author: Russell King - ARM Linux Date: Mon Jan 3 22:43:56 2011 +0000 ARM: PL08x: store prep_* flags in async_tx structure Like other DMA engine drivers do, store the passed flags into the async_tx structure, so they can be checked when the operation completes. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit d7244e9a27a3da27d62aabf560ee828d7991493e Author: Russell King - ARM Linux Date: Mon Jan 3 22:43:35 2011 +0000 ARM: PL08x: shrink srcbus/dstbus in txd structure We only need to store the dma address. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 542361f8e385355c68e263eba49d4306739b9220 Author: Russell King - ARM Linux Date: Mon Jan 3 22:43:15 2011 +0000 ARM: PL08x: don't manipulate txd->srcbus or txd->dstbus during LLI fill Don't alter any txd->srcbus or txd->dstbus values while building the LLI list. This allows us to see the original dma_addr_t values passed in via the prep_memcpy() method. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 5f638b4f313e345bf02700910e581bccf71212f5 Author: Russell King - ARM Linux Date: Mon Jan 3 22:42:55 2011 +0000 ARM: PL08x: fix fill_bytes calculation The number of bytes we want to fill into any LLI is the minimum of: - number of bytes remaining in the transfer - number of bytes we can transfer in a single LLI - number of bytes we can transfer without overflowing the source boundary - number of bytes we can transfer without overflowing the destination boundary The minimum of the first two is already calculated (target_len). We limit the boundary calculations to this number of bytes, which will then give us the number of bytes we can place into this LLI. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit d6cf7b597f7158616106068930d1c6203d9359eb Author: Russell King - ARM Linux Date: Mon Jan 3 22:42:34 2011 +0000 ARM: PL08x: use min() to calculate target_len Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit b61be8d728abad7fd98e62e98f22325f8f254b51 Author: Russell King - ARM Linux Date: Mon Jan 3 22:42:14 2011 +0000 ARM: PL08x: ensure pl08x_pre_boundary() works for any value of addr pl08x_pre_boundary() was unsafe with addresses towards the top of memory space: boundary = ((addr >> PL08X_BOUNDARY_SHIFT) + 1) << PL08X_BOUNDARY_SHIFT; This can overflow a 32-bit number, producing zero. When it does: if (boundary < addr + len) return boundary - addr; else return len; results in (boundary - addr) returning either a large positive value. Also if addr + len overflows, this calculation also fails. We can fix this trivially as the only thing we're actually interested in is the value of the least significant PL08X_BOUNDARY_SHIFT bits: boundary_len = PL08X_BOUNDARY_SIZE - (addr & (PL08X_BOUNDARY_SIZE - 1)); gives us the number of bytes before 'addr' becomes a multiple of PL08X_BOUNDARY_SIZE. We can then just take the min() of the two calculated lengths. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 0059005f2cbf4847551b9ad9915ffffe23aef0b9 Author: Russell King - ARM Linux Date: Mon Jan 3 22:41:54 2011 +0000 ARM: PL08x: make pl08x_fill_lli_for_desc() return void We don't need pl08x_fill_lli_for_desc() to return num_llis + 1 as we know that's what it always does. We can just pass in num_llis and use post-increment in the caller. This makes the code slightly easier to read. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 858c21c0f380fb9c78f47f3e372f9baadc54dffe Author: Russell King - ARM Linux Date: Mon Jan 3 22:41:34 2011 +0000 ARM: PL08x: move callback outside spinlock'd region Calling the callback handler with spinlocks in the tasklet held leads to deadlock when dmaengine functions are called: BUG: spinlock lockup on CPU#0, sh/417, c1870a08 Backtrace: ... [] (do_raw_spin_lock+0x0/0x154) from [] (_raw_spin_lock_irqsave+0x54/0x60) [] (_raw_spin_lock_irqsave+0x0/0x60) from [] (pl08x_prep_channel_resources+0x718/0x8b4) [] (pl08x_prep_channel_resources+0x0/0x8b4) from [] (pl08x_prep_slave_sg+0x120/0x19c) [] (pl08x_prep_slave_sg+0x0/0x19c) from [] (pl011_dma_tx_refill+0x164/0x224) [] (pl011_dma_tx_refill+0x0/0x224) from [] (pl011_dma_tx_callback+0x7c/0xc4) [] (pl011_dma_tx_callback+0x0/0xc4) from [] (pl08x_tasklet+0x60/0x368) [] (pl08x_tasklet+0x0/0x368) from [] (tasklet_action+0xa0/0x100) Dan quoted the documentation: > 2/ Completion callback routines cannot submit new operations.  This >    results in recursion in the synchronous case and spin_locks being >    acquired twice in the asynchronous case. but then followed up to say: > I should clarify, this is the async_memcpy() api requirement which is > not used outside of md/raid5. DMA drivers can and do allow new > submissions from callbacks, and the ones that do so properly move the > callback outside of the driver lock. So let's fix it by moving the callback out of the spinlocked region. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 30749cb4a40f02a199640011e5ab5c5f60b8482e Author: Russell King - ARM Linux Date: Mon Jan 3 22:41:13 2011 +0000 ARM: PL08x: allow AHB master port selection to be configured Platforms need to be able to control which AHB master interface is used, as each AHB master interface may be asymetric. Allow the interfaces used for fetching LLIs, memory, and each peripheral to be configured individually. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit c7da9a56d608145cc763bcfc9329b92c4244d8d9 Author: Russell King - ARM Linux Date: Mon Jan 3 22:40:53 2011 +0000 ARM: PL08x: move AHB master port selection into prep_* functions As we initialize the default cctl value in the prep_* functions along with the increment settings, we don't need to repeat the selection of the AHB ports each time we create a LLI entry. Do this in the prep_* functions once per transfer. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 1cae78f12028eebdc9107eaf168add46e66fb3f8 Author: Russell King - ARM Linux Date: Mon Jan 3 22:40:33 2011 +0000 ARM: PL08x: move cctl increment and protection setup to prep_slave_sg We don't need to initialize the cctl increment and protection values in the runtime_config method - we have all the inforamtion to setup these values in prep_slave_sg(). Move their initialization there. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 70b5ed6b6d72cd8b1a3d4b7b878a0dd132bec7ba Author: Russell King - ARM Linux Date: Mon Jan 3 22:40:13 2011 +0000 ARM: PL08x: move default cctl into txd structure Rather than modifying platform data while preparing a transfer, copy the cctl value into the txd structure and modify the value there. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 09b3c323332206aaadfb7aa13efffa82e7719b35 Author: Russell King - ARM Linux Date: Mon Jan 3 22:39:53 2011 +0000 ARM: PL08x: assign ccfg DMA request signal in prep_phy_channel() There is no need to wait until we start processing a tx descriptor before setting up the DMA request selection in the ccfg register. We know which channel and request will be used in prep_phy_channel(), so setup the ccfg request selection at txd creation time in prep_phy_channel(). Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 4983a04fd2562986360b646b378f267308bc22c0 Author: Russell King - ARM Linux Date: Mon Jan 3 22:39:33 2011 +0000 ARM: PL08x: move ccfg into txd structure The ccfg register is used to configure the channel parameters - the type and direction of transfer, the flow control signal and IRQ mask enables. The type and direction of transfer is known in the relevent prep_* function where a txd is created. The IRQ mask enables are always set, and the flow control signals are always set when we start processing a txd according to phychan->signal. If we store the ccfg value in the txd structure, we can avoid modifying platform data - and even having it in platform data at all. So, remove it from platform data too. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 19524d77ec34faf58d313ba34fb755ef6e159216 Author: Russell King - ARM Linux Date: Mon Jan 3 22:39:13 2011 +0000 ARM: PL08x: avoid duplicating registers in txd and phychan structures As we now have all the code accessing the phychan {csrc,cdst,clli,cctl, ccfg} members in one function, there's no point storing the data into the struct. Get rid of the struct members. Re-order the register dump in the dev_dbg() to reflect the order we write the registers to the DMA device. The txd {csrc,cdst,clli,cctl} values are duplicates of the lli[0] values, so there's no point duplicating these either. Program the DMAC registers directly from the lli[0] values. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit c885bee4f10323a1ff3f19e1aa2aa6f4e7f89dd8 Author: Russell King - ARM Linux Date: Mon Jan 3 22:38:52 2011 +0000 ARM: PL08x: combine functions to start DMA into one function There is no need for pl08x_config_phychan_for_txd(), pl08x_set_cregs() and pl08x_enable_phy_chan() to be separate - they are always called in sequence. Combine them into one function. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit db9f136a60c8727c8e1c9c4f2494821caebf5a7b Author: Russell King - ARM Linux Date: Mon Jan 3 22:38:32 2011 +0000 ARM: PL08x: clean up LLI lookup As the LLI list is an array, we can use maths to locate which LLI index we're currently at, and then sum up the remaining LLI entries until we reach the end of the list. This makes the code much easier to read, and much less susceptible to falling off the end of the array. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit bfddfb45056fa95a778f0baf463ac0f9fc926d5c Author: Russell King - ARM Linux Date: Mon Jan 3 22:38:12 2011 +0000 ARM: PL08x: rename lli.next to lli.lli The LLI pointer in the documentation is placed into the LLI register, so name it LLI rather than 'next'. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit e25761d72c80751c8741f5f93abab14232eef347 Author: Russell King - ARM Linux Date: Mon Jan 3 22:37:52 2011 +0000 ARM: PL08x: use 'u32' for LLI structure members, not dma_addr_t Use 'u32' for the LLI structure members, which are defined by hardware to be 32-bit. dma_addr_t is much more vague about its actual size. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit cace658572ba5d1075f3891e823130a66f3e330f Author: Russell King - ARM Linux Date: Mon Jan 3 22:37:31 2011 +0000 ARM: PL08x: use 'size_t' for lengths Use size_t for variables denoting lengths throughout, and use the 'z' qualifier for printing the value. For safety, add a BUG_ON() in pl08x_fill_lli_for_desc() to catch the remainder potentially becoming negative. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 56b618820c92a5efa2145fbbac373fffbb024a94 Author: Russell King - ARM Linux Date: Mon Jan 3 22:37:10 2011 +0000 ARM: PL08x: don't try to use llis_bus as a pointer llis_bus is the DMA address of the LLI array. Casting it to be a pointer just to be able to use pointer arithmetic on it is not nice. We can trivially deal with the places where we do arithmetic on it, and it's actually cleaner this way. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 4c0df6a3ce8eb947647c7ed2640d0172936d8ef3 Author: Russell King - ARM Linux Date: Mon Jan 3 22:36:50 2011 +0000 ARM: PL08x: don't assume that the LLI pointer has the bus bit clear We only want use the address of the LLI pointer when locating the corresponding structure in memory, so clear the master bus selection bit. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 19386b3234fdbe4d33492574d83e63a8dace18d3 Author: Russell King - ARM Linux Date: Mon Jan 3 22:36:29 2011 +0000 ARM: PL08x: ensure loops use cpu_relax() Tight loops should use cpu_relax() to allow CPUs to reduce power consumption while waiting for events. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 8c8cc2b1040f51a2f89724edbf976774128339eb Author: Russell King - ARM Linux Date: Mon Jan 3 22:36:09 2011 +0000 ARM: PL08x: consolidate physical channel release code Consolidate duplicated channel release code into release_phy_channel() Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit ac3cd20df9d74bb205bb34f69407477a884ff8a3 Author: Russell King - ARM Linux Date: Mon Jan 3 22:35:49 2011 +0000 ARM: PL08x: consolidate common txd initialization Consolidate code which allocates and initializes txds. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 7cb72ad959b16ac594118977b7954a7d2ec7a052 Author: Russell King - ARM Linux Date: Mon Jan 3 22:35:28 2011 +0000 ARM: PL08x: avoid 'void *' struct fields when we can type them properly Avoid using 'void *' struct fields when the structs are not defined in linux/amba/pl08x.h - instead, forward declare the struct names, and use these instead. This ensures we have proper typechecking. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit f96ca9ec27159c1c8718aa8d0ed03051cd12e884 Author: Russell King - ARM Linux Date: Mon Jan 3 22:35:08 2011 +0000 ARM: PL08x: constify vendor data pointers We should never modify the vendor data structure so make it const. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit b58b6b5bedf4d5da7a0cb2dce3b42d010c3aef03 Author: Russell King - ARM Linux Date: Mon Jan 3 22:34:48 2011 +0000 ARM: PL08x: remove circular buffer support The driver already won't initialize a channel with a circular buffer; the check in pl08x_prep_channel_resources() sees to that. Remove circular buffer support for the time being. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit ad0a3ad33c96cbba98ba62116771fb836c551e60 Author: Russell King - ARM Linux Date: Mon Jan 3 22:34:27 2011 +0000 ARM: PL08x: remove unnecessary NULL and BUG checks The tasklet always is initialized with a non-NULL data argument. It is not possible for it to be called with a NULL data argument (unless something is very wrong in the tasklet code - in which case lots of stuff will break). Therefore, as plchan can never be NULL, remove this unnecessary BUG check. In pl08x_tasklet(), we've already dereferenced plchan->at, so it can't be NULL here. Remove this unnecessary BUG check. pl08x_fill_llis_for_desc() and pl08x_free_txd() are always called with a non-NULL txd argument - either as a consequence of the code paths or as a result of other checks already in place. We don't need to repeat the non-NULL check in these functions. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 730404ac1c47403af67420705980c99e90bf182f Author: Russell King - ARM Linux Date: Mon Jan 3 22:34:07 2011 +0000 ARM: PL08x: remove unnecessary includes We don't need to include linux/pci.h as we aren't a PCI driver. We aren't doing any processor specific functions, so asm/processor.h is not required. asm/cacheflush.h shouldn't be used, we have the DMA API for this. DMA interfaces aren't required as we're only implementing the dmaengine API and not a platform-private DMA API. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 9c132992689d7d27a4e17545b6279db4e03c0943 Author: Russell King - ARM Linux Date: Mon Jan 3 22:33:47 2011 +0000 ARM: PL08x: prefix hex numbers with 0x A driver which emits both decimal and hex numbers in its printk creates confusion as to what is what. Prefix hex numbers with 0x. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit b05cd8f4c04a29eebfa65c45fabc78a02f16a782 Author: Russell King - ARM Linux Date: Mon Jan 3 22:33:26 2011 +0000 ARM: PL08x: improve the announcement printk Include the revision number of the PL08x primecell in the boot-time printk to allow proper identification of the peripheral. Reformat the announcement printk format reflect what we do for other primecell drivers - generally "PLXXX revX at 0xNNNNNNNN irq X". Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 9dc2c200a0551754f91e1b322dcb3d782cd709b2 Author: Russell King - ARM Linux Date: Mon Jan 3 22:33:06 2011 +0000 ARM: PL08x: add comment explaining the flow control methods Explain the two flow control methods which the PL08x implements, along with the problem which peripheral flow control presents. This helps people understand why we are unable to use these DMA controllers with (eg) the MMCI. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 3e2a037c1de79af999a54581cbf1e8a5c933fd95 Author: Russell King - ARM Linux Date: Mon Jan 3 22:32:46 2011 +0000 ARM: PL08x: fix sparse warnings drivers/dma/amba-pl08x.c:1895:40: warning: Unknown escape '%' drivers/dma/amba-pl08x.c:1903:40: warning: Unknown escape '%' drivers/dma/amba-pl08x.c:513:6: warning: symbol 'pl08x_choose_master_bus' was not declared. Should it be static? drivers/dma/amba-pl08x.c:604:5: warning: symbol 'pl08x_fill_llis_for_desc' was not declared. Should it be static? drivers/dma/amba-pl08x.c:1442:32: warning: symbol 'pl08x_prep_slave_sg' was not declared. Should it be static? Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 98838f90d92f6f0abf6d6a99880c0ff3127633b8 Author: Russell King - ARM Linux Date: Mon Jan 3 22:32:26 2011 +0000 ARM: PL08x: fix deadlock in terminate_all Trying to disable a tasklet while holding a spinlock which the tasklet will take is a recipe for deadlock - tasklet_disable() will wait for the tasklet to finish running, which it will never do. In any case, there is not a corresponding tasklet_enable(), so once the tasklet is disabled, it will never run again until reboot. It's safe to just remove the tasklet_disable() as we remove all current and pending descriptors before releasing this spinlock. This means that the tasklet will find no remaining work if it subsequently runs. The only remaining issue is that the callback for an already submitted txd may be in progress, or even called after terminate_all() returns. There's not much that can be done about that as waiting for the callback to complete before returning will also lead to deadlocks. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 9c0bb43bbd02fba0b235f8993d1f175734fa8735 Author: Russell King - ARM Linux Date: Mon Jan 3 22:32:05 2011 +0000 ARM: PL08x: fix missed spin-unlock in pl08x_issue_pending() pl08x_issue_pending() returns with the spinlock locked and interrupts disabled if the channel is waiting for a physical DMA to become free. This is wrong - especially as pl08x_issue_pending() is an API function as it leads to deadlocks. Fix it to always return with the spinlock unlocked. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit dafa73171be8dd31b485f5839e3376b1ca908e24 Author: Russell King - ARM Linux Date: Mon Jan 3 22:31:45 2011 +0000 ARM: PL08x: fix a leak when preparing TXDs If we fail to allocate the LLI, the prep_* function will return NULL. However, the TXD we allocated will not be placed on any list, nor will it be freed - we'll just drop all references to it. Make sure we free it rather than leaking TXDs. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit bf072af461c166964fb110cfcafccd752fbb4c64 Author: Russell King - ARM Linux Date: Mon Jan 3 22:31:24 2011 +0000 ARM: PL08x: fix locking in tasklet Tasklets are run from an interruptible context. The slave DMA functions can be called from within IRQ handlers. Taking the spinlock without disabling interrupts allows an interrupt handler to run, which may try to take the spinlock again, resulting in deadlock. Fix this by using the irqsave spinlocks. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 91aa5fadb831e7b6ea473a526a6b49c6dc4819ce Author: Russell King - ARM Linux Date: Mon Jan 3 22:31:04 2011 +0000 ARM: PL08x: fix atomic_t usage and tx_submit() return value range The last_issued variable uses an atomic type, which is only incremented inside a protected region, and then read. Everywhere else only reads the value, so it isn't using atomic_t correctly, and it doesn't even need to. Moreover, the DMA engine code provides us with a variable for this already - chan.cookie. Use chan.cookie instead. Also, avoid negative dma_cookie_t values - negative returns from tx_submit() mean failure, yet in reality we always succeed. Restart from cookie 1, just like other DMA engine drivers do. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit 4440aacf3a171a0ab498feda58d100a320c5d9ff Author: Russell King - ARM Linux Date: Mon Jan 3 22:30:44 2011 +0000 ARM: PL08x: fix array overflow in dma_set_runtime_config() If maxburst was passed in as zero, we would overflow the burst_sizes[] array. Fix this by checking for this condition, and defaulting to single transfer 'bursts'. Improve the readability of the loop using a for() loop rather than a while() loop with the iterator initialized far from the loop. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit e8b5e11df3d02e7bbd85c025cc705a8e67746f73 Author: Russell King - ARM Linux Date: Mon Jan 3 22:30:24 2011 +0000 ARM: PL08x: fix spelling errors Correct mis-spellings in comments and printk strings. Signed-off-by: Russell King Acked-by: Linus Walleij Signed-off-by: Dan Williams commit d49278e3351b34870cbffffc5067348a318e7b06 Author: Per Forlin Date: Mon Dec 20 18:31:38 2010 +0100 dmaengine: dma40: Add support to split up large elements The maximum transfer size of the stedma40 is (64k-1) x data-width. If the transfer size of one element exceeds this limit the job is split up and sent as linked transfer. Signed-off-by: Per Forlin Signed-off-by: Dan Williams commit 6f3d772fb8a039de8f21d725f5e38c252b4c0efd Author: Takuma Umeya Date: Wed Dec 15 14:09:01 2010 +0900 nfs4: set source address when callback is generated when callback is generated in NFSv4 server, it doesn't set the source address. When an alias IP is utilized on NFSv4 server and suppose the client is accessing via that alias IP (e.g. eth0:0), the client invokes the callback to the IP address that is set on the original device (e.g. eth0). This behavior results in timeout of xprt. The patch sets the IP address that the client should invoke callback to. Signed-off-by: Takuma Umeya [bfields@redhat.com: Simplify gen_callback arguments, use helper function] Signed-off-by: J. Bruce Fields commit ab10f1dd914ad87e0370bd8b82f77dcd32b6d941 Merge: f56d463 957c461 Author: Kukjin Kim Date: Wed Jan 5 09:39:23 2011 +0900 Merge branch 'dev/cleanup-clocks' into for-next commit 140e3008e7fe1526cbb12f8f07dbc273ac713b75 Author: Tejun Heo Date: Tue Dec 28 16:20:47 2010 +0100 [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event SDEV_MEDIA_CHANGE event was first added by commit a341cd0f (SCSI: add asynchronous event notification API) for SATA AN support and then extended to cover generic media change events by commit 285e9670 ([SCSI] sr,sd: send media state change modification events). This event was mapped to block device in userland with all properties stripped to simulate CHANGE event on the block device, which, in turn, was used to trigger further userspace action on media change. The recent addition of disk event framework kept this event for backward compatibility but it turns out to be unnecessary and causes erratic and inefficient behavior. The new disk event generates proper events on the block devices and the compat events are mapped to block device with all properties stripped, so the block device ends up generating multiple duplicate events for single actual event. This patch removes the compat event generation from both sr and sd as suggested by Kay Sievers. Both existing and newer versions of udev and the associated tools will behave better with the removal of these events as they from the beginning were expecting events on the block devices. Signed-off-by: Tejun Heo Acked-by: Kay Sievers Signed-off-by: James Bottomley commit 3c726023402a2f3b28f49b9d90ebf9e71151157d Author: J. Bruce Fields Date: Tue Jan 4 17:53:52 2011 -0500 nfsd4: return nfs errno from name_to_id functions This avoids the need for the confusing ESRCH mapping. Signed-off-by: J. Bruce Fields commit 775a1905e1e042e830eae31e70efec9387eb3e1d Author: J. Bruce Fields Date: Tue Jan 4 17:38:41 2011 -0500 nfsd4: remove outdated pathname-comments Signed-off-by: J. Bruce Fields commit 2ca72e17e5acb1052c35c9faba609c2289ce7a92 Author: J. Bruce Fields Date: Tue Jan 4 17:37:15 2011 -0500 nfsd4: move idmap and acl header files into fs/nfsd These are internal nfsd interfaces. Signed-off-by: J. Bruce Fields commit f6af99ec1b261e21219d5eba99e3af48fc6c32d4 Author: J. Bruce Fields Date: Tue Jan 4 18:02:15 2011 -0500 nfsd4: name->id mapping should fail with BADOWNER not BADNAME According to rfc 3530 BADNAME is for strings that represent paths; BADOWNER is for user/group names that don't map. And the too-long name should probably be BADOWNER as well; it's effectively the same as if we couldn't map it. Cc: stable@kernel.org Reported-by: Trond Myklebust Reported-by: Simon Kirby Signed-off-by: J. Bruce Fields commit 17db7042b7ff77a4ae8b83ab42ec8286a9715a48 Author: Alex Deucher Date: Tue Dec 21 16:05:39 2010 -0500 drm/radeon/kms: implement gpu lockup check for evergreen Now that soft reset works, we can add this. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4f125010d2d02c481a0fdf5aee23a9f937bc5de1 Merge: 204663c 989d873 Author: Dave Airlie Date: Wed Jan 5 08:31:08 2011 +1000 Merge branch 'master' of /home/airlied/kernel/linux-2.6 into drm-core-next commit 255c7cf810e4776ae8f1023332060459f30d8a2a Author: J. Bruce Fields Date: Sun Oct 31 12:35:48 2010 -0400 locks: minor setlease cleanup Signed-off-by: J. Bruce Fields commit c45821d263a8a5109d69a9e8942b8d65bcd5f31a Author: J. Bruce Fields Date: Sun Oct 31 00:04:44 2010 -0400 locks: eliminate fl_mylease callback The nfs server only supports read delegations for now, so we don't care how conflicts are determined. All we care is that unlocks are recognized as matching the leases they are meant to remove. After the last patch, a comparison of struct files will work for that purpose. So we no longer need this callback. Signed-off-by: J. Bruce Fields commit c84d500bc41658165ceb0dd04dc6a75249940fba Author: J. Bruce Fields Date: Sat Oct 30 23:35:04 2010 -0400 nfsd4: use a single struct file for delegations When we converted to sharing struct filess between nfs4 opens I went too far and also used the same mechanism for delegations. But keeping a reference to the struct file ensures it will outlast the lease, and allows us to remove the lease with the same file as we added it. Signed-off-by: J. Bruce Fields commit e63eb9375089f9d2041305d04c3f33a194e0e014 Author: J. Bruce Fields Date: Sat Oct 30 17:41:26 2010 -0400 nfsd4: eliminate lease delete callback nfsd controls the lifetime of the lease, not the lock code, so there's no need for this callback on lease destruction. Signed-off-by: J. Bruce Fields commit fdef7aa5d4020fd94ffcbf0078d6bd9e5a111e19 Author: J. Bruce Fields Date: Tue Jan 4 14:12:47 2011 -0500 svcrpc: ensure cache_check caller sees updated entry Supposes cache_check runs simultaneously with an update on a different CPU: cache_check task doing update ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^ 1. test for CACHE_VALID 1'. set entry->data & !CACHE_NEGATIVE 2. use entry->data 2'. set CACHE_VALID If the two memory writes performed in step 1' and 2' appear misordered with respect to the reads in step 1 and 2, then the caller could get stale data at step 2 even though it saw CACHE_VALID set on the cache entry. Add memory barriers to prevent this. Reviewed-by: NeilBrown Signed-off-by: J. Bruce Fields commit 6bab93f87ec703bf6650875881b11f9f27d7da56 Author: J. Bruce Fields Date: Mon Jan 3 15:10:27 2011 -0500 svcrpc: take lock on turning entry NEGATIVE in cache_check We attempt to turn a cache entry negative in place. But that entry may already have been filled in by some other task since we last checked whether it was valid, so we could be modifying an already-valid entry. If nothing else there's a likely leak in such a case when the entry is eventually put() and contents are not freed because it has CACHE_NEGATIVE set. So, take the cache_lock just as sunrpc_cache_update() does. Reviewed-by: NeilBrown Signed-off-by: J. Bruce Fields commit da165dd60e136d0609e0a2c0c2a9b9a5372200d6 Author: J. Bruce Fields Date: Sun Jan 2 22:13:18 2011 -0500 nfsd: remove some unnecessary dropit handling We no longer need a few of these special cases. Signed-off-by: J. Bruce Fields commit 062304a815fe10068c478a4a3f28cf091c55cb82 Author: J. Bruce Fields Date: Sun Jan 2 22:05:33 2011 -0500 nfsd: stop translating EAGAIN to nfserr_dropit We no longer need this. Also, EWOULDBLOCK is generally a synonym for EAGAIN, but that may not be true on all architectures, so map it as well. Signed-off-by: J. Bruce Fields commit 9e701c610923aaeac8b38b9202a686d1cc9ee35d Author: J. Bruce Fields Date: Sun Jan 2 21:56:36 2011 -0500 svcrpc: simpler request dropping Currently we use -EAGAIN returns to determine when to drop a deferred request. On its own, that is error-prone, as it makes us treat -EAGAIN returns from other functions specially to prevent inadvertent dropping. So, use a flag on the request instead. Returning an error on request deferral is still required, to prevent further processing, but we no longer need worry that an error return on its own could result in a drop. Signed-off-by: J. Bruce Fields commit d76d1815f3e72fb627ad7f95ef63120b0a557c9c Author: J. Bruce Fields Date: Sun Jan 2 21:28:34 2011 -0500 svcrpc: avoid double reply caused by deferral race Commit d29068c431599fa "sunrpc: Simplify cache_defer_req and related functions." asserted that cache_check() could determine success or failure of cache_defer_req() by checking the CACHE_PENDING bit. This isn't quite right. We need to know whether cache_defer_req() created a deferred request, in which case sending an rpc reply has become the responsibility of the deferred request, and it is important that we not send our own reply, resulting in two different replies to the same request. And the CACHE_PENDING bit doesn't tell us that; we could have succesfully created a deferred request at the same time as another thread cleared the CACHE_PENDING bit. So, partially revert that commit, to ensure that cache_check() returns -EAGAIN if and only if a deferred request has been created. Signed-off-by: J. Bruce Fields Acked-by: NeilBrown commit 3beb6cd1d448e7ded938bbd676493e6a08e9a6cd Author: J. Bruce Fields Date: Sat Jan 1 15:43:50 2011 -0500 nfsd: don't drop requests on -ENOMEM We never want to drop a request if we could return a JUKEBOX/DELAY error instead; so, convert to nfserr_jukebox and let nfsd_dispatch() convert that to a dropit error as a last resort if JUKEBOX/DELAY is unavailable (as in the NFSv2 case). Signed-off-by: J. Bruce Fields commit 65e4c8945575abca4e368e05ca3e9f77df030290 Author: Kirill A. Shutemov Date: Thu Dec 16 15:25:54 2010 +0200 nfsd: declare several functions of nfs4callback as static setup_callback_client(), nfsd4_release_cb() and nfsd4_process_cb_update() do not have users outside the translation unit. Let's declare it as static. Signed-off-by: Kirill A. Shutemov Signed-off-by: J. Bruce Fields commit bdd5f05d91e8ae68075b812ce244c918d3d752cd Author: J. Bruce Fields Date: Tue Jan 4 13:31:45 2011 -0500 SUNRPC: Remove more code when NFSD_DEPRECATED is not configured Signed-off-by: NeilBrown [bfields@redhat.com: moved svcauth_unix_purge outside ifdef's.] Signed-off-by: J. Bruce Fields commit 31f7aa65f536995c6d933c57230919ae408952a5 Author: J. Bruce Fields Date: Fri Dec 24 14:03:38 2010 -0500 svcrpc: modifying valid sunrpc cache entries is racy Once a sunrpc cache entry is VALID, we should be replacing it (and allowing any concurrent users to destroy it on last put) instead of trying to update it in place. Otherwise someone referencing the ip_map we're modifying here could try to use the m_client just as we're putting the last reference. The bug should only be seen by users of the legacy nfsd interfaces. (Thanks to Neil for suggestion to use sunrpc_invalidate.) Reviewed-by: NeilBrown Signed-off-by: J. Bruce Fields commit 65e5341b9a0c39767ae1fecc727d70eda0dd6d83 Author: Chris Mason Date: Fri Dec 24 06:41:52 2010 -0500 Btrfs: fix off by one while setting block groups readonly When we read in block groups, we'll set non-redundant groups readonly if we find a raid1, DUP or raid10 group. But the ro code has an off by one bug in the math around testing to make sure out accounting doesn't go wrong. Signed-off-by: Chris Mason commit dbbe68bb12b34f3e450da7a73c20e6fa1f85d63a Merge: 7b26e5e 9fc3bbb Author: David S. Miller Date: Tue Jan 4 11:57:25 2011 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit db98a6cfcc9ac951067c9a2cb60459b618fd7b10 Author: roel kluin Date: Mon Jan 3 12:03:44 2011 -0800 libertas: down_interruptible() can return -EINTR, not EINTR Fix test in lbs_spi_thread(). down_interruptible() can return -EINTR, but not EINTR. Signed-off-by: Roel Kluin Cc: Dan Williams Signed-off-by: Andrew Morton Signed-off-by: John W. Linville commit b5c34f662a3519d34f9634a14d8de638fdbe0ca3 Author: Johannes Berg Date: Mon Jan 3 19:51:09 2011 +0100 mac80211: fix some key comments and code The key documentation is slightly out of date, fix that. Also, the list entry in the key struct is no longer used that way, so list_del_init() isn't necessary any more there. Finally, ieee80211_key_link() is no longer invoked under RCU read lock, but rather with an appropriate station lock held. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cc72128750700d01c31f583a355c5f8f809498bb Author: Sujith Manoharan Date: Mon Jan 3 21:22:18 2011 +0530 ath9k_htc: Fix packet injection To inject a packet in monitor mode, a dummy station has to be associated with the monitor interface in the target. Failing to do this would result in a firmware crash on the device. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit a8851d10aadb46b25db4459aa0d1150c957d2bc1 Author: Dan Carpenter Date: Mon Jan 3 08:46:29 2011 +0300 ath5k: ath5k_eeprom_mode_from_channel() returns signed ath5k_eeprom_mode_from_channel() returns -1 on error but we're storing the result in "ee_mode" which is an unsigned char. This breaks the error handling. This patch makes "ee_mode" an int. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 2ae79d52cdac733037490486792a53de9fb8d6b6 Author: Mohammed Shafi Shajakhan Date: Fri Dec 31 20:49:00 2010 +0530 ath9k : few rate control clean ups Remove some obvious looking dead code and rename few functions Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 707e634326448190bfe2d937c44ec05c8dea63c4 Author: Christian Lamparter Date: Thu Dec 30 17:29:53 2010 +0100 Revert "mac80211: temporarily disable reorder release timer" This reverts enables the reorder release timer once again. The issues laid out in: Have been addressed by: mac80211: serialize rx path workers mac80211: ignore PSM bit of reordered frames Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 24a8fdad35835e8d71f7c4b978a246fafed2e7b4 Author: Christian Lamparter Date: Thu Dec 30 17:25:29 2010 +0100 mac80211: serialize rx path workers This patch addresses the issue of serialization between the main rx path and various reorder release timers. It converts the previously local "frames" queue into a global rx queue [rx_skb_queue]. This way, everyone (be it the main rx-path or some reorder release timeout) can add frames to it. Only one active rx handler worker [ieee80211_rx_handlers] is needed. All other threads which have lost the race of "runnning_rx_handler" can now simply "return", knowing that the thread who had the "edge" will also take care of their workload. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 1186488b4a4d4871e40cb1604ba3ede3d4b7cc90 Author: Rajkumar Manoharan Date: Thu Dec 30 19:07:44 2010 +0530 ath9k: fix beacon restart on channel change Restart the beacon timers only if the beacon was already configured. Otherwise beacons timers are restarted unnecessarily in unassociated state too. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bd8027a72a1af95efd1dc8ea6df2fd9724c885b2 Author: Mohammed Shafi Shajakhan Date: Thu Dec 30 12:18:01 2010 +0530 Revert "ath9k: Parse DTIM period from mac80211" This reverts commit 0ce3bcfc84900a64347b0fe1140229bd81314008. Event though with the above commit we obtain the configured DTIM period from the AP rather than always hardcoding it to '1', this seems to cause problems under the following scenarios: * Preventing association with broken AP's * Adds latency in roaming So its better to always use the safe value of '1' for dtim period Cc: Jouni Malinen Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ff039c6fb372c87a3cc4fd25bb846790cb35edb8 Author: Bob Copeland Date: Wed Dec 29 17:09:02 2010 -0500 cfg80211: fix transposition of words in printk Fixes the misplaced article in the following: "cfg80211: Updating information on frequency 5785 MHz for 20 a MHz width channel with regulatory rule:" Signed-off-by: Bob Copeland Signed-off-by: John W. Linville commit f76b57b47e5fd423f9827c7b0ba7bbd06cca6b9b Author: Joel A Fernandes Date: Tue Dec 28 19:28:11 2010 -0600 mac80211: Fix mesh portal communication with other mesh nodes. Fixed a bug where if a mesh interface has a different MAC address from its bridge interface, then it would not be able to send data traffic to any other mesh node. This also adds support for communication between mesh nodes and external bridged nodes by using a 6 address format if the source is a node within the mesh and the destination is an external node proxied by a mesh portal. Signed-off-by: Joel A Fernandes Signed-off-by: John W. Linville commit 1c30cc19081c16b1fe73ac13f2cb2abc009cdcc4 Author: Felix Fietkau Date: Tue Dec 28 15:46:16 2010 +0100 ath9k_hw: fix dma descriptor rx error bit parsing An Rx DMA descriptor can have multiple error bits set, and some error bits (e.g. MIC failure) are filtered by the driver based on other criteria. Remove the 'else' in various error bit checks so that all error information is properly passed to the driver. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1e1f4ad25fab29ca48b1166e74a81e9c89ddf0fb Author: Sujith Manoharan Date: Tue Dec 28 14:28:52 2010 +0530 ath9k_htc: Move LED/RFKILL code to htc_drv_gpio.c And add the copyright/license header. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 039a07215e0fca00c450f4bf1dc9b458bdfe8559 Author: Sujith Manoharan Date: Tue Dec 28 14:28:37 2010 +0530 ath9k_htc: Fix fast channel change When returning to the operating channel, a full HW reset has to be done instead of a fast channel change. Since sw_scan_complete() is called after the config() call for the home channel, we end up doing a FCC. Fix this issue by checking the OFFCHANNEL flag to determine FCC. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 73908674c6957082e8ab57daed57d2bb97a1ebba Author: Sujith Manoharan Date: Tue Dec 28 14:28:27 2010 +0530 ath9k_htc: Handle FATAL events The device has to be reset when a FATAL event is received. Not doing so would leave the card in a non-working state. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 66e3547431a8738416b508badfb9f326d11dabcc Author: Sujith Manoharan Date: Tue Dec 28 14:28:14 2010 +0530 ath9k_htc: Move work cancellation outside of mutex There is no need to lock the various work cancellation calls. This will be helpful when handling FATAL events. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ff8f59b5bbdf1527235b8c88d859c7d23691324f Author: Sujith Manoharan Date: Tue Dec 28 14:28:05 2010 +0530 ath9k_htc: Handle pending URBs properly When doing a channel change, the pending URBs have to be killed properly on calling htc_stop(). This fixes the probe response timeout seen when sending UDP traffic at a high rate and running background scan at the same time. Cc: stable Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit ee832d3e9e72abf83931205a2f5379944be501c2 Author: Mohammed Shafi Shajakhan Date: Tue Dec 28 13:06:26 2010 +0530 ath9k: Few clean ups in beacon config parameters Some minor clean ups in assigning values to beacon config parameters Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 4cfda47b69d0a37e5fc0292addba6d0f5f671a14 Author: Christian Lamparter Date: Mon Dec 27 23:21:26 2010 +0100 mac80211: ignore PSM bit of reordered frames This patch tackles one of the problems of my reorder release timer patch from August. => What if the reorder release triggers and ap_sta_ps_end (called by ieee80211_rx_h_sta_process) accidentally clears the WLAN_STA_PS_STA flag, because 100ms ago - when the STA was still active - frames were put into the reorder buffer. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 5af3c1d195a6169a925a929e800dc4fce2a545ae Author: Helmut Schaa Date: Mon Dec 27 15:07:35 2010 +0100 rt2x00: Fix comment about removed spinlock The comment doesn't match the code anymore. Fix that. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 48103d25c4ca00a1d0692895f9aa68fcac6bc6af Author: Helmut Schaa Date: Mon Dec 27 15:07:16 2010 +0100 rt2x00: Remove unused interface spinlock Since the last user of intf->lock is gone we can safely remove it. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit bfe6a15d60671993eb3d4ac396b1f442ae08581c Author: Helmut Schaa Date: Mon Dec 27 15:06:57 2010 +0100 rt2x00: Simplify intf->delayed_flags locking Instead of protecting delayed_flags with a spinlock use atomic bitops to make the code more readable. Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f833eea0a77b0910ea202468175bfc80470d44d0 Author: Helmut Schaa Date: Mon Dec 27 15:06:36 2010 +0100 rt2x00: Remove superfluous assignment of mpdu_density The tx desciptor already gets initialized to 0. Hence, there's no need to explicitly assign 0 to mpdu_density here. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 11f16aefcc07178972f149f1a1d53e6868481394 Author: Ismael Luceno Date: Mon Dec 27 15:06:17 2010 +0100 rt2x00: Fix panic on frame padding for rt2800 usb devices Backtrace: rt2800usb_write_tx_data rt2x00queue_write_tx_frame rt2x00mac_tx invoke_tx_handlers __ieee80211_tx ieee80211_tx virt_to_head_page ieee80211_xmit ieee80211_tx_skb ieee80211_scan_work schedule ieee80211_scan_work process_one_work ... It tried to expand the skb past it's end using skb_put. So I replaced it with a call to skb_padto, which takes the issue into account. Signed-off-by: Ismael Luceno Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 736e3acadce8438e610b897af2b1c472ed58444b Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:55 2010 +0100 rt2x00: Fix pointer errors. Fix some pointer errors in the various calls to memcpy, memset and memmove. Although none of these errors are fatal (the expression used now results in the same pointer value) it is better to use the proper expression. All errors are having to deal with arrays. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a39fd6be19bde021314262a6d2193b3792c808db Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:35 2010 +0100 rt2x00: remove intf->mac field. The mac field of the rt2x00_intf structure is written to once and used twice. In both these uses the mac address is available via other means. Remove this field as it does not appear to be necessary. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 773d1b98268a9effac047fd2ab1c47bf9f7a9e5f Author: Gertjan van Wingerde Date: Mon Dec 27 15:05:14 2010 +0100 rt2x00: Remove intf->bssid field. The bssid field in struct rt2x00_intf is only written to once, and is never read from. Remove this field, as it appears to not be needed. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5235189c8edddf2eb32982f814bc858b55e6350a Author: Johannes Stezenbach Date: Mon Dec 27 15:04:54 2010 +0100 rt2x00: allow txstatus_fifo w/o txstatus_tasklet When DRIVER_REQUIRE_TXSTATUS_FIFO is set, intialize the txstatus_fifo, but initialize rt2x00dev->txstatus_tasklet only when both DRIVER_REQUIRE_TXSTATUS_FIFO and rt2x00dev->ops->lib->txstatus_tasklet are set. This allows the txstatus_fifo to be used by rt2800usb which does not use txstatus_tasklet. Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c4d63244218bf93d1f0cdf4389e0906df8f506c1 Author: Johannes Stezenbach Date: Mon Dec 27 15:04:29 2010 +0100 rt2x00: simplify txstatus_fifo handling Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 97e2c40269e168df986daf94af1c62e07d4fc599 Author: Christian Lamparter Date: Sun Dec 26 18:22:29 2010 +0100 carl9170: fix usb pm suspend->resume woes This patch revamps some common code-paths which are shared between (re-)initialization and suspend/resume subroutines. It also adds some helpful comments about quirks and associated difficulties. It's quite big, but it should fix #25382: And hopefully the code is robust enough to deal with all possible suspend/resume scenarios without requiring the user to do any sort of manual and possibly dangerous work. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3b386510f49ff5c6e6ac1001da4f3c922ae7de3f Author: Christian Lamparter Date: Sun Dec 26 18:22:16 2010 +0100 carl9170: reduce channel change delay By removing two "safety" msleeps (and an echo nop), the channel change delay is effectively halved. Previously, the delay could be as long as 260 ms and the device could not go off-channel without risking to miss the next DTIM beacon [interval ~307 ms]. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit c9e57f0fdccf74ef7884fed61d212e524b9c4bcd Author: Christian Lamparter Date: Sun Dec 26 18:21:53 2010 +0100 carl9170: add missing return-value check This patch adds a forgotten bail-out path. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit bb007554fe1f66c4796c7c7ae7bfc735fc8213f7 Author: Bob Copeland Date: Sun Dec 26 12:10:05 2010 -0500 ath5k: fix cycle counter inconsistent locking ath5k_reset is called from process context and takes the cc_lock with plain spin_lock(), but cc_lock can also be taken from tasklets in softirq context. Thus we need to at least use spin_lock_bh. This fixes the following lockdep warning: [ 19.967874] sky2 0000:01:00.0: eth0: enabling interface [ 19.982761] ieee80211 phy0: device now idle [ 20.904809] NET: Registered protocol family 17 [ 21.243857] ieee80211 phy0: device no longer idle - scanning [ 21.404343] [ 21.404346] ================================= [ 21.404450] [ INFO: inconsistent lock state ] [ 21.404518] 2.6.37-rc7-wl+ #242 [ 21.404582] --------------------------------- [ 21.404650] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 21.404721] kworker/u:4/982 [HC0[0]:SC1[3]:HE1:SE0] takes: [ 21.404792] (&(&common->cc_lock)->rlock){+.?...}, at: [] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] {SOFTIRQ-ON-W} state was registered at: [ 21.405011] [] __lock_acquire+0x62f/0x13c1 [ 21.405011] [] lock_acquire+0xd5/0xf1 [ 21.405011] [] _raw_spin_lock+0x45/0x72 [ 21.405011] [] ath5k_reset+0x2c0/0x349 [ath5k] [ 21.405011] [] ath5k_start+0xb8/0x139 [ath5k] [ 21.405011] [] ieee80211_do_open+0x13f/0x819 [mac80211] [ 21.405011] [] ieee80211_open+0x63/0x66 [mac80211] [ 21.405011] [] __dev_open+0x8d/0xb6 [ 21.405011] [] __dev_change_flags+0x9d/0x114 [ 21.405011] [] dev_change_flags+0x18/0x44 [ 21.405011] [] do_setlink+0x23f/0x521 [ 21.405011] [] rtnl_setlink+0xe6/0xea [ 21.405011] [] rtnetlink_rcv_msg+0x18a/0x1a0 [ 21.405011] [] netlink_rcv_skb+0x35/0x7b [ 21.405011] [] rtnetlink_rcv+0x20/0x27 [ 21.405011] [] netlink_unicast+0x1bb/0x21e [ 21.405011] [] netlink_sendmsg+0x23b/0x288 [ 21.405011] [] sock_sendmsg+0xac/0xc4 [ 21.405011] [] sys_sendmsg+0x152/0x1a2 [ 21.405011] [] sys_socketcall+0x214/0x275 [ 21.405011] [] sysenter_do_call+0x12/0x36 [ 21.405011] irq event stamp: 138032 [ 21.405011] hardirqs last enabled at (138032): [] _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] hardirqs last disabled at (138031): [] _raw_spin_lock_irqsave+0x18/0x7e [ 21.405011] softirqs last enabled at (138024): [] ieee80211_tx_skb+0x47/0x49 [mac80211] [ 21.405011] softirqs last disabled at (138027): [] do_softirq+0x63/0xb4 [ 21.405011] [ 21.405011] other info that might help us debug this: [ 21.405011] 3 locks held by kworker/u:4/982: [ 21.405011] #0: (name){+.+.+.}, at: [] process_one_work+0x1b8/0x41b [ 21.405011] #1: ((&(&local->scan_work)->work)){+.+.+.}, at: [] process_one_work+0x1b8/0x41b [ 21.405011] #2: (&local->mtx){+.+.+.}, at: [] ieee80211_scan_work+0x32/0x4a4 [mac80211] [ 21.405011] [ 21.405011] stack backtrace: [ 21.405011] Pid: 982, comm: kworker/u:4 Not tainted 2.6.37-rc7-wl+ #242 [ 21.405011] Call Trace: [ 21.405011] [] ? printk+0x1d/0x25 [ 21.405011] [] print_usage_bug+0x181/0x18b [ 21.405011] [] ? check_usage_forwards+0x0/0xb6 [ 21.405011] [] mark_lock+0x2a0/0x4aa [ 21.405011] [] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [] __lock_acquire+0x5ba/0x13c1 [ 21.405011] [] ? trace_hardirqs_off_caller+0x18/0x8d [ 21.405011] [] ? trace_hardirqs_off+0xb/0xd [ 21.405011] [] ? local_clock+0x2c/0x4f [ 21.405011] [] ? save_trace+0x2/0xa0 [ 21.405011] [] ? mark_held_locks+0x43/0x5b [ 21.405011] [] ? _raw_spin_unlock_irqrestore+0x3b/0x5e [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] lock_acquire+0xd5/0xf1 [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] _raw_spin_lock_bh+0x4a/0x77 [ 21.405011] [] ? ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] ath5k_ani_calibration+0x29/0x5d9 [ath5k] [ 21.405011] [] ? mark_held_locks+0x43/0x5b [ 21.405011] [] ath5k_tasklet_ani+0x1d/0x27 [ath5k] [ 21.405011] [] tasklet_action+0x96/0x137 [ 21.405011] [] __do_softirq+0xde/0x1c3 [ 21.405011] [] ? arch_get_unmapped_area_topdown+0x3b/0x127 [ 21.405011] [] ? __do_softirq+0x0/0x1c3 [ 21.405011] [] ? irq_exit+0x3d/0x49 [ 21.405011] [] ? do_IRQ+0x98/0xac [ 21.405011] [] ? common_interrupt+0x2e/0x34 [ 21.405011] [] ? sys_unshare+0x57/0x226 [ 21.405011] [] ? queue_delayed_work+0x1/0x27 [ 21.405011] [] ? ieee80211_queue_delayed_work+0x2e/0x33 [mac80211] [ 21.405011] [] ? ieee80211_scan_work+0x45f/0x4a4 [mac80211] [ 21.405011] [] ? process_one_work+0x26e/0x41b [ 21.405011] [] ? process_one_work+0x1b8/0x41b [ 21.405011] [] ? ieee80211_scan_work+0x0/0x4a4 [mac80211] [ 21.405011] [] ? worker_thread+0x18a/0x2a5 [ 21.405011] [] ? _raw_spin_unlock_irqrestore+0x47/0x5e [ 21.405011] [] ? worker_thread+0x0/0x2a5 [ 21.405011] [] ? kthread+0x67/0x6c [ 21.405011] [] ? kthread+0x0/0x6c [ 21.405011] [] ? kernel_thread_helper+0x6/0x10 Signed-off-by: Bob Copeland Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 44cefead807daf96d0f43eb494b1eb5edb5454bf Author: Brian Prodoehl Date: Sat Dec 25 14:34:43 2010 -0500 ath9k: fix spur mitigation no-spur case for AR9002 For the AR9002, the spur frequency read from the EEPROM is mangled before being compared against AR_NO_SPUR. This results in the driver trying to set up the spur mitigation for bogus spurs, rather than cleanly breaking out. Signed-off-by: Brian Prodoehl Signed-off-by: John W. Linville commit ad9082adfc0a6bdcef1bad2f22485575479d7a9d Author: Akinobu Mita Date: Sat Dec 25 15:03:58 2010 +0900 airo: use simple_write_to_buffer Simplify write file operation for /proc files by using simple_write_to_buffer(). Signed-off-by: Akinobu Mita Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: John W. Linville commit 52671e43dbfb0e0dfa5fab604cb3984bd1d777a6 Author: Senthil Balasubramanian Date: Thu Dec 23 21:06:57 2010 +0530 ath9k: spin_lock_bh is not required within tasklet context. Disabling BH is not required while running from a tasklet context and so replace spin_lock_bh with just spin_lock. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit cd017f25e391dfabaca185bb4a5aefd02fd6c0ca Author: Stanislaw Gruszka Date: Thu Dec 23 15:12:30 2010 +0100 iwlagn: fix scan tx antenna setting on 5Ghz band Looks that we do not set correctly antennas when scanning on 5Ghz band and when bluetooth is enabled, because priv->cfg->scan_tx_antennas[band] is only defined for IEEE80211_BAND_2GHZ. To fix we check band before limiting antennas to first one. This allow to remove hard coded cfg->scan_tx_antennas[band]. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit cd2c5486526b744fb505e18c9d981b35feaf283a Author: Bruno Randolf Date: Wed Dec 22 19:20:32 2010 +0900 ath5k: Move mac80211 functions into new file Move mac80211 functions into new file mac80211-ops.c to have a better separation and to make base.c smaller. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 7b26e5ebd8b27b0126a84ae7f9a42aa8293d6c48 Author: Francois-Xavier Le Bail Date: Tue Jan 4 09:10:20 2011 +0000 net: typos in comments in include/linux/igmp.h There are typos in comments in include/linux/igmp.h: 83 #define IGMP_HOST_MEMBERSHIP_QUERY 0x11 /* From RFC1112 */ 84 #define IGMP_HOST_MEMBERSHIP_REPORT 0x12 /* Ditto */ [snip] 88 #define IGMPV2_HOST_MEMBERSHIP_REPORT 0x16 /* V2 version of 0x11 */ 89 #define IGMP_HOST_LEAVE_MESSAGE 0x17 90 #define IGMPV3_HOST_MEMBERSHIP_REPORT 0x22 /* V3 version of 0x11 */ The line 88 and 90 are about REPORT messages. The IGMP_HOST_MEMBERSHIP_REPORT (IGMP V1) value is 0x12. So the comment on line 88 must be /* V2 version of 0x12 */, and the comment on line 90 must be /* V3 version of 0x12 */. Signed-off-by: Francois-Xavier Le Bail Signed-off-by: David S. Miller commit 0511af9e9a43c64dd7e23e642c9087710688768c Merge: 782a9e3 003ea98 Author: John W. Linville Date: Tue Jan 4 14:26:34 2011 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 782a9e31e81956a271375c0ba8d46fbb0480983e Merge: 5c4bc1c 17f9cc3 Author: John W. Linville Date: Tue Jan 4 14:25:28 2011 -0500 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit d2460f4b2fa6dbdeec800414f9cf5b1fc8b71197 Author: Johannes Berg Date: Mon Jan 3 19:42:24 2011 +0100 mac80211: add missing synchronize_rcu commit ad0e2b5a00dbec303e4682b403bb6703d11dcdb2 Author: Johannes Berg Date: Tue Jun 1 10:19:19 2010 +0200 mac80211: simplify key locking removed the synchronization against RCU and thus opened a race window where we can use a key for TX while it is already freed. Put a synchronisation into the right place to close that window. Reported-by: Jussi Kivilinna Cc: stable@kernel.org [2.6.36+] Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 919bbad580445801c22ef6ccbe624551fee652bd Author: Milton Miller Date: Thu Dec 30 02:01:03 2010 -0600 mac80211: fix mesh forwarding when ratelimited too Commit b51aff057c9d0ef6c529dc25fd9f775faf7b6c63 said: Under memory pressure, the mac80211 mesh code may helpfully print a message that it failed to clone a mesh frame and then will proceed to crash trying to use it anyway. Fix that. Avoid the reference whenever the frame copy is unsuccessful regardless of the debug message being suppressed or printed. Cc: stable@kernel.org [2.6.27+] Signed-off-by: Milton Miller Signed-off-by: John W. Linville commit f28f3313aa97dcb46954f90f596d75f8faf4626e Author: Daniel Hellstrom Date: Tue Jan 4 01:41:35 2011 +0000 Added support for ampopts in APBUART driver. Used in AMP systems. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit d89ddf0da8f0a140d4dc2e2dbc594fb278e33db5 Author: Daniel Hellstrom Date: Tue Jan 4 01:41:34 2011 +0000 APBUART: added raw AMBA vendor/device number to match against. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 9663eb21fcfeb1ed9afd73d14bbc4198796cfc7b Author: Daniel Hellstrom Date: Tue Jan 4 01:41:33 2011 +0000 SPARC/LEON: avoid AMBAPP name duplicates in openprom fs when REG is missing When the REG property is not available the NODE-ID is used as an unique identifier in order to avoid filesystem name duplicates in /proc/openprom filesystem Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 2791c1a4390085789e37347fc49f7d189fedae88 Author: Daniel Hellstrom Date: Tue Jan 4 01:41:32 2011 +0000 SPARC/LEON: added support for selecting Timer Core and Timer within core The ability to select Timer Core and Timer instance for system clock makes it possible for multiple AMP systems to coexist. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 9742e72cd1e24ede007daa8f3eb1cece66f0fd0f Author: Daniel Hellstrom Date: Tue Jan 4 01:41:31 2011 +0000 LEON: added raw AMBA vendor/device number to find TIMER, IRQCTRL Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit e2305e37d4c82ef55be54e9edc8a7e2250739b4f Author: Daniel Hellstrom Date: Tue Jan 4 01:41:30 2011 +0000 SPARC/LEON: added support for IRQAMP IRQ Controller Needed for LEON AMP systems where different CPUs are routed to different IRQ controllers. This patch selects the IRQ Controller which has been routed to the boot CPU, it is up to the boot loader to configure the IRQ controller. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 53aea7caf2e27108912b9b9dbc5bfe18dbbaec9d Author: Daniel Hellstrom Date: Tue Jan 4 01:41:29 2011 +0000 SPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 554d1d027b19265c4aa3f718b3126d2b86e09a08 Author: Stanislaw Gruszka Date: Thu Dec 23 12:38:21 2010 +0100 iwlagn: enable only rfkill interrupt when device is down Since commit 6cd0b1cb872b3bf9fc5de4536404206ab74bafdd "iwlagn: fix hw-rfkill while the interface is down", we enable interrupts when device is not ready to receive them. However hardware, when it is in some inconsistent state, can generate other than rfkill interrupts and crash the system. I can reproduce crash with "kernel BUG at drivers/net/wireless/iwlwifi/iwl-agn.c:1010!" message, when forcing firmware restarts. To fix only enable rfkill interrupt when down device and after probe. I checked patch on laptop with 5100 device, rfkill change is still passed to user space when device is down. Signed-off-by: Stanislaw Gruszka Cc: stable@kernel.org Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 36f54ff67bc78c6d8dc4a90ac257165e05fdd8da Author: Hans Verkuil Date: Fri Dec 31 12:34:32 2010 -0300 [media] v4l2-compat-ioctl32: fix compile warning drivers/media/video/v4l2-compat-ioctl32.c: In function 'get_v4l2_format32': drivers/media/video/v4l2-compat-ioctl32.c:169:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type' drivers/media/video/v4l2-compat-ioctl32.c: In function 'put_v4l2_format32': drivers/media/video/v4l2-compat-ioctl32.c:200:2: warning: case value '0' not in enumerated type 'enum v4l2_buf_type' Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1a5e5af0d2111fdc39c6f2275ed2a9e2e6dd69e2 Author: Hans Verkuil Date: Fri Dec 31 12:30:56 2010 -0300 [media] zoran: fix compiler warning drivers/media/video/zoran/zoran_driver.c: In function 'zoran_dqbuf': drivers/media/video/zoran/zoran_driver.c:2197:21: warning: 'bs.frame' may be used uninitialized in this function Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 0c8fc77e481a3bfc243336085a3fe1fc71f9c1fb Author: Hans Verkuil Date: Fri Dec 31 12:26:53 2010 -0300 [media] tda18218: fix compile warning drivers/media/common/tuners/tda18218.c: In function 'tda18218_wr_regs': drivers/media/common/tuners/tda18218.c:58:5: warning: 'ret' may be used uninitialized in this function Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 4f77b86c665ff6a167edfdf152ebfa997783fa17 Author: Hans Verkuil Date: Fri Dec 31 12:25:32 2010 -0300 [media] ngene: fix compile warning drivers/media/dvb/ngene/ngene-core.c: In function 'ngene_start': drivers/media/dvb/ngene/ngene-core.c:1308:16: warning: unused variable 'flags' Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 64c2ce8b72eceec4030b04bca32d098b3d1431bb Author: Aneesh Kumar K.V Date: Thu Dec 9 11:35:25 2010 +0000 nfsv4: Switch to generic xattr handling code This patch make nfsv4 use the generic xattr handling code to get the nfsv4 acl. This will help us to add richacl support to nfsv4 in later patches Signed-off-by: Aneesh Kumar K.V Signed-off-by: Trond Myklebust commit a8a5da996df7d2d91b5aef2752da9adcefea4bc6 Author: Aneesh Kumar K.V Date: Thu Dec 9 11:35:14 2010 +0000 nfs: Set MS_POSIXACL always We want to skip VFS applying mode for NFS. So set MS_POSIXACL always and selectively use umask. Ideally we would want to use umask only when we don't have inheritable ACEs set. But NFS currently don't allow to send umask to the server. So this is best what we can do and this is consistent with NFSv3 Signed-off-by: Aneesh Kumar K.V Signed-off-by: Trond Myklebust commit bf0c84f1614bffc59565d04f09b9ac6b1aa269a9 Author: Namhyung Kim Date: Tue Dec 28 17:02:46 2010 +0000 NFS: use ERR_CAST() Use ERR_CAST() intead of wierd-looking cast. Signed-off-by: Namhyung Kim Signed-off-by: Trond Myklebust commit 5f3e97c9ee6290befb5a2e78baf95ff951a8a34a Author: J. Bruce Fields Date: Tue Dec 21 23:49:34 2010 +0000 nfs: fix mispelling of idmap CONFIG symbol Trivial, but confusing when you're trying to grep through this code.... Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit beb0f0a9fba1fa98b378329a9a5b0a73f25097ae Author: Trond Myklebust Date: Mon Dec 20 21:19:26 2010 +0000 kernel panic when mount NFSv4 On Tue, 2010-12-14 at 16:58 +0800, Mi Jinlong wrote: > Hi, > > When testing NFSv4 at RHEL6 with kernel 2.6.32, I got a kernel panic > at NFS client's __rpc_create_common function. > > The panic place is: > rpc_mkpipe > __rpc_lookup_create() <=== find pipefile *idmap* > __rpc_mkpipe() <=== pipefile is *idmap* > __rpc_create_common() > ****** BUG_ON(!d_unhashed(dentry)); ****** *panic* > > It means that the dentry's d_flags have be set DCACHE_UNHASHED, > but it should not be set here. > > Is someone known this bug? or give me some idea? > > A reproduce program is append, but it can't reproduce the bug every time. > the export is: "/nfsroot *(rw,no_root_squash,fsid=0,insecure)" > > And the panic message is append. > > ============================================================================ > #!/bin/sh > > LOOPTOTAL=768 > LOOPCOUNT=0 > ret=0 > > while [ $LOOPCOUNT -ne $LOOPTOTAL ] > do > ((LOOPCOUNT += 1)) > service nfs restart > /usr/sbin/rpc.idmapd > mount -t nfs4 127.0.0.1:/ /mnt|| return 1; > ls -l /var/lib/nfs/rpc_pipefs/nfs/*/ > umount /mnt > echo $LOOPCOUNT > done > > =============================================================================== > Code: af 60 01 00 00 89 fa 89 f0 e8 64 cf 89 f0 e8 5c 7c 64 cf 31 c0 8b 5c 24 10 8b > 74 24 14 8b 7c 24 18 8b 6c 24 1c 83 c4 20 c3 <0f> 0b eb fc 8b 46 28 c7 44 24 08 20 > de ee f0 c7 44 24 04 56 ea > EIP:[] __rpc_create_common+0x8a/0xc0 [sunrpc] SS:ESP 0068:eccb5d28 > ---[ end trace 8f5606cd08928ed2]--- > Kernel panic - not syncing: Fatal exception > Pid:7131, comm: mount.nfs4 Tainted: G D -------------------2.6.32 #1 > Call Trace: > [] ? panic+0x42/0xed > [] ? oops_end+0xbc/0xd0 > [] ? do_invalid_op+0x0/0x90 > [] ? do_invalid_op+0x7f/0x90 > [] ? __rpc_create_common+0x8a/0xc0[sunrpc] > [] ? rpc_free_task+0x33/0x70[sunrpc] > [] ? prc_call_sync+0x48/0x60[sunrpc] > [] ? rpc_ping+0x4e/0x60[sunrpc] > [] ? rpc_create+0x38f/0x4f0[sunrpc] > [] ? error_code+0x73/0x78 > [] ? __rpc_create_common+0x8a/0xc0[sunrpc] > [] ? d_lookup+0x2a/0x40 > [] ? rpc_mkpipe+0x111/0x1b0[sunrpc] > [] ? nfs_create_rpc_client+0xb4/0xf0[nfs] > [] ? nfs_fscache_get_client_cookie+0x1d/0x50[nfs] > [] ? nfs_idmap_new+0x7b/0x140[nfs] > [] ? strlcpy+0x3a/0x60 > [] ? nfs4_set_client+0xea/0x2b0[nfs] > [] ? nfs4_create_server+0xac/0x1b0[nfs] > [] ? krealloc+0x40/0x50 > [] ? nfs4_remote_get_sb+0x6b/0x250[nfs] > [] ? kstrdup+0x3c/0x60 > [] ? vfs_kern_mount+0x69/0x170 > [] ? nfs_do_root_mount+0x6c/0xa0[nfs] > [] ? nfs4_try_mount+0x37/0xa0[nfs] > [] ? nfs4_validate_text_mount_data+-x7d/0xf0[nfs] > [] ? nfs4_get_sb+0x92/0x2f0 > [] ? vfs_kern_mount+0x69/0x170 > [] ? get_fs_type+0x32/0xb0 > [] ? do_kern_mount+0x3f/0xe0 > [] ? do_mount+0x2ef/0x740 > [] ? copy_mount_options+0xb0/0x120 > [] ? sys_mount+0x6e/0xa0 Hi, Does the following patch fix the problem? Cheers Trond -------------------------- SUNRPC: Fix a BUG in __rpc_create_common From: Trond Myklebust Mi Jinlong reports: When testing NFSv4 at RHEL6 with kernel 2.6.32, I got a kernel panic at NFS client's __rpc_create_common function. The panic place is: rpc_mkpipe __rpc_lookup_create() <=== find pipefile *idmap* __rpc_mkpipe() <=== pipefile is *idmap* __rpc_create_common() ****** BUG_ON(!d_unhashed(dentry)); ****** *panic* The test is wrong: we can find ourselves with a hashed negative dentry here if the idmapper tried to look up the file before we got round to creating it. Just replace the BUG_ON() with a d_drop(dentry). Reported-by: Mi Jinlong Signed-off-by: Trond Myklebust commit 51f128ea1c9224c1e3cf6c6a1498431d97699668 Author: Dan Carpenter Date: Sun Jan 2 20:20:42 2011 +0000 lockd: double unlock in next_host_state() We unlock again after we goto out. Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust commit 878215feb8b2417c4700090b4335739858cf7b5a Author: Jesper Juhl Date: Fri Dec 24 22:22:37 2010 +0000 NFS: Don't leak in nfs_proc_symlink() Hi, In fs/nfs/proc.c::nfs_proc_symlink() we will leak memory if either nfs_alloc_fhandle() or nfs_alloc_fattr() returns NULL but the other one doesn't. This patch ensures memory allocated by one when the other fails is always released (this is safe since nfs_free_fattr() and nfs_free_fhandle() both call kfree which deals gracefully with NULL pointers). Signed-off-by: Jesper Juhl Signed-off-by: Trond Myklebust commit e6de30d63eb17c5cbb7affdfc71df95286bfa7d9 Author: françois romieu Date: Mon Jan 3 15:08:37 2011 +0000 r8169: more 8168dp support. Adapted from version 8.019.00 of Realtek's r8168 driver Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 650e8d5d1fdd5e55869136e2df54287a4432d87f Author: françois romieu Date: Mon Jan 3 15:08:29 2011 +0000 r8169: rtl_csi_access_enable rename. Newer 8168 needs a slightly different rtl_csi_access_enable. This patch separates some noise from the real thing. No functional change. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit b646d90053f887c1bc243191e693a9b02d09f2c2 Author: françois romieu Date: Mon Jan 3 15:08:21 2011 +0000 r8169: magic. Adapted from version 8.019.00 of Realtek's r8168 driver. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 065c27c184d64aeb9ae107c0ef7026ea3642b15b Author: françois romieu Date: Mon Jan 3 15:08:12 2011 +0000 r8169: phy power ops Bits from : - version 8.019.00 of Realtek's 8168 driver - version 1.019.00 of Realtek's 8101 driver Plain old 8169 (PCI) devices do not seem to need anything akin to it. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit c0e45c1ca3162acb2e77b3d9e152ce6e7b6fa3f5 Author: françois romieu Date: Mon Jan 3 15:08:04 2011 +0000 r8169: 8168DP specific MII registers access methods. Adapted from version 8.019.00 of Realtek's r8168 driver and amended per Hayes Wang's correction : - OCPDR_GPHY_REG_SHIFT must be 16, not 12 - the reg should be at bit 16 ~ 22, whence OCPDR_REG_MASK Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit 4da19633429f67c794b013488348550f457298c4 Author: françois romieu Date: Mon Jan 3 15:07:55 2011 +0000 r8169: use device dependent methods to access the MII registers. Current mdio_{read/write} needs device specific information to work correctly with newer chipsets. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit f0298f8143e89ac4da306e14b9aa1927e93916d0 Author: françois romieu Date: Mon Jan 3 15:07:42 2011 +0000 r8169: identify different registers. Documentation (sort of). The location are the same, the values are the same but it is just accidental. Note that the 810x could cope with a smaller value as it does not support jumbo frames. Signed-off-by: Francois Romieu Cc: Hayes Signed-off-by: David S. Miller commit bca03d5f32c8ee9b5cfa1d32640a63fded6cb3c0 Author: françois romieu Date: Mon Jan 3 15:07:31 2011 +0000 r8169: remove the firmware of RTL8111D. The binary file of the firmware is moved to linux-firmware repository. The firmwares are rtl_nic/rtl8168d-1.fw and rtl_nic/rtl8168d-2.fw. The driver goes along if the firmware couldn't be found. However, it is suggested to be done with the suitable firmware. Some wrong PHY parameters are directly corrected in the driver. Simple firmware checking added per Ben Hutchings suggestion. Signed-off-by: Hayes Wang Signed-off-by: Francois Romieu Cc: Ben Hutchings Signed-off-by: David S. Miller commit 101e5f77bf35679809586e250b6c62193d2ed179 Author: Mike Galbraith Date: Fri Dec 31 09:32:30 2010 +0100 sched, autogroup: Fix reference leak The cgroup exit mess also uncovered a struct autogroup reference leak. copy_process() was simply freeing vs putting the signal_struct, stranding a reference. Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra Cc: Oleg Nesterov LKML-Reference: <1293784350.6839.2.camel@marge.simson.net> Signed-off-by: Ingo Molnar commit 4f8219875a0dad2cfad9e93a3fafcd9626db98d2 Author: Mike Galbraith Date: Thu Dec 16 15:09:52 2010 +0100 sched, autogroup: Fix potential access to freed memory Oleg pointed out that the /proc interface kref_get() useage may race with the final put during autogroup_move_group(). A signal->autogroup assignment may be in flight when the /proc interface dereference, leaving them taking a reference to an already dead group. Reported-by: Oleg Nesterov Signed-off-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1292508592.5940.28.camel@maggy.simson.net> Signed-off-by: Ingo Molnar commit c73b7d02da9bfb4fadafc118a24ee868708839b6 Author: Tejun Heo Date: Tue Jan 4 15:38:44 2011 +1100 crypto: mark crypto workqueues CPU_INTENSIVE kcrypto_wq and pcrypt->wq's are used to run ciphers and may consume considerable amount of CPU cycles. Mark both as CPU_INTENSIVE so that they don't block other work items. As the workqueues are primarily used to burn CPU cycles, concurrency levels shouldn't matter much and are left at 1. A higher value may be beneficial and needs investigation. Signed-off-by: Tejun Heo Signed-off-by: Herbert Xu commit 41f2977d40798ce45f4da7a1291039ffbe9e1dbc Author: Roel Kluin Date: Tue Jan 4 15:37:16 2011 +1100 crypto: mv_cesa - dont return PTR_ERR() of wrong pointer Fix a PTR_ERR() return of the wrong pointer Signed-off-by: Roel Kluin Signed-off-by: Herbert Xu commit 3181c22587cfeb1fe415e55b2dd8b83c7cc33e44 Author: Adrian-Ken Rueegsegger Date: Tue Jan 4 15:35:51 2011 +1100 crypto: ripemd - Set module author and update email address Signed-off-by: Adrian-Ken Rueegsegger Signed-off-by: Herbert Xu commit a58154d1c3535f451a409abbd0bda6770b2d9380 Author: Yong Shen Date: Tue Jan 4 14:22:56 2011 +0800 ARM i.MX53: Make MX53 EVK bootable 1. Add entries to Kconfig 2. Add machine definition 3. Add Uart platform data, pad setting and base address 4. Adjust GPIO irq number Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit 644b1d586d6670262501057ae99d893fadb012de Author: Yong Shen Date: Tue Jan 4 14:22:55 2011 +0800 ARM i.MX53: Some bug fix about MX53 MSL code 1. pll_base address should return right value 2. uart parent clk is from pll3 Signed-off-by: Yong Shen Signed-off-by: Sascha Hauer commit ae5e49c79c051ea1d5ca91cbd4a0d22189067ba3 Author: Alan Ott Date: Tue Jan 4 00:37:22 2011 -0500 HID: hidraw: add compatibility ioctl() for 32-bit applications. Added the ioctl function to the compat_ioctl pointer in the file_operations struct. Before this, some ioctls would fail for 32-bit apps on 64-bit systems. Signed-off-by: Alan Ott Acked-by: Arnd Bergmann Signed-off-by: Jiri Kosina commit ebd1373d40be1f295e48877c7582fe9028164e6e Author: Minchan Kim Date: Tue Jan 4 01:36:48 2011 +0900 writeback: fix global_dirty_limits comment runtime -> real-time Change runtime with real-time Cc: Wu Fengguang Signed-off-by: Minchan Kim Signed-off-by: Jiri Kosina commit 957c461e82f7a8ddcd7fb25c01c43917f64fde33 Author: Kukjin Kim Date: Tue Jan 4 17:58:22 2011 +0900 ARM: S5PV310: Tidy init+disable clock usage and s3c24xx_register_clocks cleanup This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using and cleanups the return of s3c24xx_register_clocks() because it includes it. Signed-off-by: Kukjin Kim commit 3c0fa647159895139d4a25f3d87b90af26789a5c Author: Kukjin Kim Date: Tue Jan 4 17:51:30 2011 +0900 ARM: S5PV210: Tidy init+disable clock usage and s3c24xx_register_clocks cleanup This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using and cleanups the return of s3c24xx_register_clocks() because it includes it. Signed-off-by: Kukjin Kim commit 96ee39c445243dc58b71d72456a5bd19d9b04f31 Author: Kukjin Kim Date: Tue Jan 4 17:45:18 2011 +0900 ARM: S5PC100: Tidy register and disable clock usage This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Kukjin Kim commit 1526631d0255d63b981a374a6623893032b04af0 Author: Kukjin Kim Date: Tue Jan 4 18:14:00 2011 +0900 ARM: S5P6450: Tidy register and disable clock usage This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Kukjin Kim commit e89c5d07cd523391d859cdf689fd2cb673269e85 Author: Kukjin Kim Date: Tue Jan 4 18:10:53 2011 +0900 ARM: S5P6442: Tidy register and disable clock usage This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Kukjin Kim commit 9f6bb3f5675a22fdcebb9565ec2122a2b2903aa2 Author: Kukjin Kim Date: Tue Jan 4 18:12:57 2011 +0900 ARM: S5P6440: Tidy register and disable clock usage This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Kukjin Kim commit cdb216de6e3291493f6bd033f2eec49c80dc8015 Author: Kukjin Kim Date: Tue Jan 4 18:27:18 2011 +0900 ARM: S3C64XX: Tidy register and disable clock usage This patch changes the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Cc: Ben Dooks Signed-off-by: Kukjin Kim commit d50d8fe192428090790e7178e9507e981e0b005b Author: Rusty Russell Date: Tue Jan 4 17:20:54 2011 +1030 x86, mm: Initialize initial_page_table before paravirt jumps v2.6.36-rc8-54-gb40827f (x86-32, mm: Add an initial page table for core bootstrapping) made x86 boot using initial_page_table and broke lguest. For 2.6.37 we simply cut & paste the initialization code into lguest (da32dac10126 "lguest: populate initial_page_table"), now we fix it properly by doing that initialization before the paravirt jump. Signed-off-by: Rusty Russell Acked-by: Jeremy Fitzhardinge Cc: lguest Cc: Linus Torvalds Cc: Andrew Morton Cc: Peter Zijlstra LKML-Reference: <201101041720.54535.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar commit bc030d6cb9532877c1c5a3f5e7123344fa24a285 Merge: d3bd058 387c31c Author: Ingo Molnar Date: Tue Jan 4 09:43:42 2011 +0100 Merge commit 'v2.6.37-rc8' into x86/apic Conflicts: arch/x86/include/asm/io_apic.h Merge reason: move to a fresh -rc, resolve the conflict. Signed-off-by: Ingo Molnar commit 6706125e291bd3dddd269e043323a6ab93ccd5fb Author: Yong Zhang Date: Fri Dec 31 21:58:58 2010 +0800 sched: Remove redundant CONFIG_CGROUP_SCHED ifdef CONFIG_[FAIR|RT]_GROUP_SCHED always means CONFIG_CGROUP_SCHED Signed-off-by: Yong Zhang Cc: Peter Zijlstra LKML-Reference: <1293803938-8157-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Ingo Molnar commit 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e Author: Clemens Ladisch Date: Mon Dec 13 14:56:02 2010 +0100 firewire: use split transaction timeout only for split transactions Instead of starting the split transaction timeout timer when any request is submitted, start it only when the destination's ACK_PENDING has been received. This prevents us from using a timeout that is too short, and, if the controller's AT queue is emptying very slowly, from cancelling a packet that has not yet been sent. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 693a50b511818e07a131efc944cba1a504b63d3d Author: Stefan Richter Date: Sat Jan 1 15:17:05 2011 +0100 firewire: ohci: consolidate context status flags "firewire: ohci: restart iso DMA contexts on resume from low power mode" added the flag struct context.active and "firewire: ohci: cache the context run bit" added struct context.running. These flags contain the same information; combine them. Also, normalize whitespace in pci_resume(). Signed-off-by: Stefan Richter commit 386a4153a2c1455e424f280d636efa3c91864466 Author: Clemens Ladisch Date: Fri Dec 24 14:42:46 2010 +0100 firewire: ohci: cache the context run bit The DMA context run control bit is entirely controlled by software, so it is safe to cache it. This allows the driver to avoid doing an additional MMIO read when queueing an AT packet. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 78dec56d6a56322e1b728d51f3a7def416d36b34 Author: Stefan Richter Date: Sat Jan 1 15:15:40 2011 +0100 firewire: ohci: flush AT contexts after bus reset - addendum Add comments - on why bus_reset_tasklet flushes AT queues, - that commit 76f73ca1b291 can possibly be reverted now. Signed-off-by: Stefan Richter Acked-by: Jarod Wilson commit 672d8eafe38e9324055b8c0d0ad6e95c43b6d52a Author: Rob Herring Date: Tue Nov 16 14:33:51 2010 -0600 ipmi: explicitly include of_address.h and of_irq.h of_address.h and of_irq.h are implicitly included on powerpc. Adding them fixes builds on non-powerpc platforms. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 20c457b8587bee4644d998331d9e13be82e05b4c Author: Thomas Renninger Date: Mon Jan 3 17:50:45 2011 +0100 perf timechart: Adjust perf timechart to the new power events builtin-timechart must only pass -e power:xy events if they are supported by the running kernel, otherwise try to fetch the old power:power{start,end} events. For this I added the tiny helper function: int is_valid_tracepoint(const char *event_string) to parse-events.[hc], which could be more generic as an interface and support hardware/software/... events, not only tracepoints, but someone else could extend that if needed... Signed-off-by: Thomas Renninger Acked-by: Arjan van de Ven Acked-by: Jean Pihet LKML-Reference: <1294073445-14812-4-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar commit 25e41933b58777f2d020c3b0186b430ea004ec28 Author: Thomas Renninger Date: Mon Jan 3 17:50:44 2011 +0100 perf: Clean up power events by introducing new, more generic ones Add these new power trace events: power:cpu_idle power:cpu_frequency power:machine_suspend The old C-state/idle accounting events: power:power_start power:power_end Have now a replacement (but we are still keeping the old tracepoints for compatibility): power:cpu_idle and power:power_frequency is replaced with: power:cpu_frequency power:machine_suspend is newly introduced. Jean Pihet has a patch integrated into the generic layer (kernel/power/suspend.c) which will make use of it. the type= field got removed from both, it was never used and the type is differed by the event type itself. perf timechart userspace tool gets adjusted in a separate patch. Signed-off-by: Thomas Renninger Signed-off-by: Ingo Molnar Acked-by: Arjan van de Ven Acked-by: Jean Pihet Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Linus Torvalds Cc: rjw@sisk.pl LKML-Reference: <1294073445-14812-3-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de> commit 61a0d49c33c7fd57c14895e5b0760bd02b65ac1f Author: Thomas Renninger Date: Mon Jan 3 17:50:43 2011 +0100 perf: Do not export power_frequency, but power_start event power_frequency moved to drivers/cpufreq/cpufreq.c which has to be compiled in, no need to export it. intel_idle can a be module though... Signed-off-by: Thomas Renninger Signed-off-by: Ingo Molnar Acked-by: Jean Pihet Cc: Jean Pihet Cc: Arjan van de Ven Cc: rjw@sisk.pl LKML-Reference: <1294073445-14812-2-git-send-email-trenn@suse.de> Signed-off-by: Ingo Molnar LKML-Reference: <1290072314-31155-2-git-send-email-trenn@suse.de> commit 928585536ff5a8f320e60efc60e2b7ef2a5f548d Merge: cc22219 d854861 Author: Ingo Molnar Date: Tue Jan 4 08:10:28 2011 +0100 Merge branch 'perf/test' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit cc2221969906a166a638aecdbae84a3d0462719e Merge: 56f4c40 387c31c Author: Ingo Molnar Date: Tue Jan 4 08:08:51 2011 +0100 Merge commit 'v2.6.37-rc8' into perf/core Merge reason: pick up latest -rc. Signed-off-by: Ingo Molnar commit 55ee4ef30241a62b700f79517e6d5ef2ddbefa67 Author: Christoph Lameter Date: Thu Dec 16 12:15:15 2010 -0600 gameport: use this_cpu_read instead of lookup Signed-off-by: Christoph Lameter Acked-by: "H. Peter Anvin" Signed-off-by: Tejun Heo commit 357089fca91f639dd005ae0721f5f932b4f276ab Author: Christoph Lameter Date: Thu Dec 16 12:14:43 2010 -0600 x86: udelay: Use this_cpu_read to avoid address calculation The code will use a segment prefix instead of doing the lookup and calculation. Signed-off-by: Christoph Lameter Acked-by: "H. Peter Anvin" Signed-off-by: Tejun Heo commit 42bb8d56953a06de50941d6d3df89dc3023bb92d Author: Michael Chan Date: Mon Jan 3 15:21:46 2011 +0000 cnic: Do not call bnx2i when bnx2i is calling cnic_unregister_driver() We should call bnx2i to send the iSCSI netlink message earlier in cnic_unregister_device(). By the time cnic_unregister_driver() is called, bnx2i may have freed data structures used by the upcalls. Update version to 2.2.12. Reviewed-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 57045c996fb4e035f1d152b7e04315fc223352e9 Author: Michael Chan Date: Mon Jan 3 15:21:45 2011 +0000 cnic: Do not allow iSCSI and FCoE on bnx2x multi-function mode Because the hardware does not yet support these in this mode. Reviewed-by: Benjamin Li Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4a3a255289e7e322b8044286cce85031990f888a Author: Andres Salomon Date: Thu Nov 11 22:42:06 2010 -0800 sparc: explicitly cast negative phandle checks to s32 When we switched sparc from using 'int's to 'phandle's (which is a u32), we neglected to do anything with the various checks for -1. For those tests, explicitly cast the phandles to s32. Signed-off-by: Andres Salomon Acked-by: David S. Miller Signed-off-by: Grant Likely commit d854861c4292a4e675a5d3bfd862c5f7421c81e8 Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 00:16:20 2011 -0200 perf test: Add test for counting open syscalls To test the use of the perf_evsel class on something other than the tools from where we refactored code to create it. It calls open() N times and then checks if the event created to monitor it returns N events. [acme@felicio linux]$ perf test 1: vmlinux symtab matches kallsyms: Ok 2: detect open syscall event: Ok [acme@felicio linux]$ It does. Cc: Frederic Weisbecker Cc: Han Pingtian 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 4eed11d5e24540dc133003b6e8f904cb747ac4bb Author: Arnaldo Carvalho de Melo Date: Tue Jan 4 00:13:17 2011 -0200 perf evsel: Auto allocate resources needed for some methods While writing the first user of the routines created from the ad-hoc routines in the existing builtins I noticed that the resulting set of calls was too long, reduce it by doing some best effort allocations. Tools that need to operate on multiple threads and cpus should pre-allocate enough resources by explicitely calling the perf_evsel__alloc_{fd,counters} methods. 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 86bd5e8603b00b06189328c6d7034d2dc434d6bb Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 23:09:46 2011 -0200 perf evsel: Use {cpu,thread}_map to shorten list of parameters 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 5c98d466e49267a9221f30958d45cd06f794269a Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:53:33 2011 -0200 perf tools: Refactor all_tids to hold nr and the map So that later, we can pass the thread_map instance instead of (thread_num, thread_map) for things like perf_evsel__open and friends, just like was done with cpu_map. 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 60d567e2d9187379d642f6aba7c8a52b3fd5d261 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:49:48 2011 -0200 perf tools: Refactor cpumap to hold nr and the map So that later, we can pass the cpu_map instance instead of (nr_cpus, cpu_map) for things like perf_evsel__open and friends. 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 48290609c0d265f5dac0fca6fd4e3c5732542f67 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:48:12 2011 -0200 perf evsel: Introduce per cpu and per thread open helpers Abstracting away the loops needed to create the various event fd handlers. The users have to pass a confiruged perf->evsel.attr field, which is already usable after perf_evsel__new (constructor) time, using defaults. Comes out of the ad-hoc routines in builtin-stat, that now uses it. Fixed a small silly bug where we were die()ing before killing our children, dysfunctional family this one 8-) 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 c52b12ed2511e6c031a0295fd903ea72b93701fb Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 17:45:52 2011 -0200 perf evsel: Steal the counter reading routines from stat Making them hopefully generic enough to be used in 'perf test', well see. 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 eda6bee6c7e67b5bd17bdbced0926f5687f686d5 Author: Rodolfo Giometti Date: Fri Nov 26 17:06:56 2010 +0100 i2c-mv64xxx: send repeated START between messages in xfer As stated into file include/linux/i2c.h we must send a repeated START between messages in the same xfer groupset: * Except when I2C "protocol mangling" is used, all I2C adapters implement * the standard rules for I2C transactions. Each transaction begins with a * START. That is followed by the slave address, and a bit encoding read * versus write. Then follow all the data bytes, possibly including a byte * with SMBus PEC. The transfer terminates with a NAK, or when all those * bytes have been transferred and ACKed. If this is the last message in a * group, it is followed by a STOP. Otherwise it is followed by the next * @i2c_msg transaction segment, beginning with a (repeated) START. Signed-off-by: Rodolfo Giometti Signed-off-by: Mauro Barella Signed-off-by: Ben Dooks commit 6d779a4c3f97023fe329ef33aba25c8aaadf281b Author: Linus Walleij Date: Tue Nov 30 16:59:29 2010 +0100 i2c-nomadik: fix regression on adapter name The Nomadik I2C adapter does not provide a name for the struct passed into i2c_add_numbered_adapter() causing a regression on 2.6.37-rc3 due to commit 2236baa75f704851d3cd3310569058151acb1f06 adding sanity checks for adapters. Fix this by providing a name proper. Cc: Jean Delvare Signed-off-by: Linus Walleij Signed-off-by: Ben Dooks commit 6a91b558648cffa94227b4ff9c6c996930bbdfd2 Author: Samu Onkalo Date: Thu Nov 18 12:04:20 2010 +0200 i2c-omap: Set latency requirements only once for several messages Ordinary I2C read consist of two messages. First a write operation to tell register address and then read operation to get data. CPU wake up latency is set and removed twice in read case. Set latency requirement before the message processing loop and remove the requirement after the loop to remove latency adjustment operations between the messages. Signed-off-by: Samu Onkalo Acked-by: Kevin Hilman Acked-by: Paul Walmsley Signed-off-by: Ben Dooks commit e9bc8fa5df1c398890e0963afe07425d994240b7 Author: Tomoya MORINAGA Date: Tue Nov 9 13:25:22 2010 +0900 i2c-eg20t: add driver for Intel EG20T I2C driver for Intel EG20T PCH Signed-off-by: Tomoya MORINAGA Reviewed-by: Linus Walleij Signed-off-by: Qi Wang [ben-linux@fluff.org: reworded commit message] Signed-off-by: Ben Dooks commit d9240e612ba79287e29f2eac52f94a2016fb0914 Author: Jonas Bonn Date: Wed Nov 24 17:26:22 2010 +0100 i2c-ocores: add some device tree documentation This puts some documentation for the device tree configuration at the head of the driver file. Hopefully this can get moved to a common area for this type of documentation at a later date; unfortunately, there isn't really such a place in the kernel tree at this time. Furthermore, the regstep and clock-frequency parameters are really bus parameters and should probably be passed to the driver in a better way. Consider that a TODO. Signed-off-by: Jonas Bonn Signed-off-by: Ben Dooks commit 47def5b80f087d033013c0609679812cfafd6b49 Author: Jonas Bonn Date: Wed Nov 24 17:26:21 2010 +0100 i2c-ocores: Use devres for resource allocation This patch converts the i2c-cores driver to use devres routines for resource allocation. Signed-off-by: Jonas Bonn Signed-off-by: Ben Dooks commit 049bb69d82e5f7f356949c1ae34a244b3338611b Author: Jonas Bonn Date: Wed Nov 24 17:26:20 2010 +0100 i2c-ocores: Adapt for device tree This patch adapts the i2c-ocores driver for being defined and configured via a device tree description. The device tree bits need to be protected by CONFIG_OF guards as this is still an optional feature. Signed-off-by: Jonas Bonn Signed-off-by: Ben Dooks commit 747fcc91cb5bade1f681b3a8d0e6d4f697d865fd Author: Aaro Koskinen Date: Mon Nov 29 12:33:39 2010 +0200 i2c-iop3xx: add iomem annotation Eliminate unnecessary casts and the following sparse warnings: drivers/i2c/busses/i2c-iop3xx.c:65:9: warning: incorrect type in argument 1 (different base types) drivers/i2c/busses/i2c-iop3xx.c:65:9: expected void const volatile [noderef] * drivers/i2c/busses/i2c-iop3xx.c:65:9: got unsigned int [ the previous warning is repeated 18 times ] drivers/i2c/busses/i2c-iop3xx.c:456:33: warning: cast removes address space of expression Signed-off-by: Aaro Koskinen Signed-off-by: Ben Dooks commit 301a3da358b4af84915f575479e4f0885be47b73 Author: Grant Likely Date: Mon Jan 3 15:02:47 2011 -0700 powerpc/405: Fix missing #{address,size}-cells in i2c node Signed-off-by: Grant Likely commit c8bf6b52af670496f1e8145600e74a3ef3942a4c Author: John Bonesio Date: Wed Nov 17 15:28:56 2010 -0800 powerpc/5200: dts: refactor dts files This patch creates mpc5200b.dtsi containing the information for the MPC5200b SoC then modifies all of the dts files for MPC5200b based systems to use mpc5200b.dtsi. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 11946c826d02a16521edc777d88470a6a0fe1441 Author: John Bonesio Date: Wed Nov 17 15:28:47 2010 -0800 powerpc/5200: dts: Change combatible strings on localbus This patch changes some incorrect compatible strings on the local plus bus node in dts files for MPC5200b based systems. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 6847317377c871c6e7a8d54e5849bcd0f9b11eb4 Author: John Bonesio Date: Wed Nov 17 15:28:39 2010 -0800 powerpc/5200: dts: remove unused properties This patch remove unused properties in dts files in preparation of refactoring the dts files for MPC5200b based boards. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit abf1e27fbb4200a010b8fcb1be8cc02485744862 Author: John Bonesio Date: Wed Nov 17 15:28:30 2010 -0800 powerpc/5200: dts: rename nodes to prepare for refactoring dts files This patch renames nodes in dts fils for MPC5200b files to prepare for refactoring of these files later. When refactoring it will be easier to verify the results if the node names aren't changing at the same time. Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit 658f29a51e9830e620bb9a1ce3534b318a38bfeb Author: John Bonesio Date: Wed Nov 17 15:28:20 2010 -0800 of/flattree: Update dtc to current mainline. Pull in recent changes from the main dtc repository. These changes primarily allow multiple device trees to be declared which are merged by dtc. This feature allows us to include a basic dts file and then provide more information for the specific system through the merging functionality. Changes pulled from git://git.jdl.com/software/dtc.git commit id: 37c0b6a0, "dtc: Add code to make diffing trees easier" Signed-off-by: John Bonesio Signed-off-by: Grant Likely commit cd1e65044d4473cca9a01bae7b7938f065044a4b Author: Grant Likely Date: Mon Jan 3 15:51:11 2011 -0700 of/device: Don't register disabled devices Device nodes with the property status="disabled" are not usable and so don't register them when parsing the device tree for devices. Signed-off-by: Grant Likely Cc: Hollis Blanchard Cc: Deepak Saxena Cc: Scott Wood , Cc: David Gibson Cc: Benjamin Herrenschmidt commit cf562b4a550b3cd9d602a05bc27aaaaa376947b4 Author: Jochen Friedrich Date: Mon Jan 3 12:19:00 2011 +0100 ARM: 6607/1: sa1100: Update platform device registration Replace some magic numbers with constants and add interrupt definitions. Signed-off-by: Jochen Friedrich Signed-off-by: Russell King commit 4f444e2b59dd4255d121b57ec41a4a8c5d6bce46 Author: Jochen Friedrich Date: Mon Jan 3 12:09:05 2011 +0100 ARM: 6606/1: sa1100: Fix platform device registration Since commit 7a5b4e16c880f8350d255dc188f81622905618c1, simpad devices don't boot anymore, since platform devices are registered too early. Fix by moving the registration from map_io to arch_initcall as done on other sa1100 boards. Signed-off-by: Jochen Friedrich Acked-by: Kristoffer Ericson Signed-off-by: Russell King commit 82b662dc41027527675740de15344d1b4e34958e Author: Clemens Ladisch Date: Fri Dec 24 14:40:15 2010 +0100 firewire: ohci: flush AT contexts after bus reset for OHCI 1.2 The OHCI 1.2 (draft) specification, clause 7.2.3.3, allows and recommends that, after a bus reset, the controller does not flush all the packets in the AT queues. Therefore, the driver has to do this itself. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 1a9180a20f3a314fda3e96b77570cad3864b2896 Author: Tomas Winkler Date: Mon Jan 3 11:08:58 2011 +0000 net/bridge: fix trivial sparse errors net/bridge//br_stp_if.c:148:66: warning: conversion of net/bridge//br_stp_if.c:148:66: int to net/bridge//br_stp_if.c:148:66: int enum umh_wait net/bridge//netfilter/ebtables.c:1150:30: warning: Using plain integer as NULL pointer Signed-off-by: Tomas Winkler Signed-off-by: David S. Miller commit ebd80880c55364d2850e1ff569869245142318e0 Author: Sedat Dilek Date: Mon Jan 3 11:22:15 2011 +0000 depca: Fix section mismatch derived from depca_isa_probe() This fixes the following warning: WARNING: drivers/net/depca.o(.data+0x0): Section mismatch in reference from the variable depca_isa_driver to the function .init.text:depca_isa_probe() The variable depca_isa_driver references the function __init depca_isa_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, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit 1170bed04e2acf720de9ccceabe40ff8c56c9c79 Author: Sedat Dilek Date: Mon Jan 3 11:15:58 2011 +0000 smsc-ircc2: Fix section mismatch derived from smsc_ircc_pnp_probe() This fixes the following warning: drivers/net/irda/smsc-ircc2.o(.data+0x18): Section mismatch in reference from the variable smsc_ircc_pnp_driver to the function .init.text:smsc_ircc_pnp_probe() The variable smsc_ircc_pnp_driver references the function __init smsc_ircc_pnp_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, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit cbad832239e70b91502a5e6ce1fc53a464ad6345 Author: Sedat Dilek Date: Mon Jan 3 11:06:58 2011 +0000 ksz884x: Fix section mismatch derived from pcidev_init() This fixes the following warning: WARNING: drivers/net/ksz884x.o(.data+0x18): Section mismatch in reference from the variable pci_device_driver to the function .init.text:pcidev_init() The variable pci_device_driver references the function __init pcidev_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, Tested with linux-next (next-20101231) Signed-off-by: Sedat Dilek Signed-off-by: David S. Miller commit 6bd121e2d4dcabb145d390a7131ec83102dfb838 Author: Grant Likely Date: Mon Jan 3 14:06:17 2011 -0700 powerpc/dts: fix syntax bugs in bluestone.dts Signed-off-by: Grant Likely commit da81c3b9825c826bfb06a4dcc0524c671985eb68 Author: Rob Herring Date: Tue Nov 16 14:33:50 2010 -0600 of: Fixes for OF probing on little endian systems Fixes for sdhci-of and ipmi drivers. Auditing all drivers using of_get_property did not find other occurrences likely to be used on LE platforms. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 236cdc7bc718566a7e7cb9f763b51a8dcad88cbe Author: Rob Herring Date: Mon Jan 3 11:56:38 2011 -0600 of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF Some OF drivers could likely be used on non-powerpc OF based platforms, so fix the kconfig depends to be CONFIG_OF instead of CONFIG_PPC_OF. Compile tested on ARM and sparc. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 39980292fda20b38baf95bfa577db8b678eecc86 Author: Eric Dumazet Date: Mon Jan 3 10:35:22 2011 +0000 ifb: add performance flags Le lundi 03 janvier 2011 à 11:40 -0800, David Miller a écrit : > From: Jarek Poplawski > Date: Mon, 3 Jan 2011 20:37:03 +0100 > > > On Sun, Jan 02, 2011 at 09:24:36PM +0100, Eric Dumazet wrote: > >> Le mercredi 29 décembre 2010 ?? 00:07 +0100, Jarek Poplawski a écrit : > >> > >> > Ingress is before vlans handler so these features and the > >> > NETIF_F_HW_VLAN_TX flag seem useful for ifb considering > >> > dev_hard_start_xmit() checks. > >> > >> OK, here is v2 of the patch then, thanks everybody. > >> > >> > >> [PATCH v2 net-next-2.6] ifb: add performance flags > >> > >> IFB can use the full set of features flags (NETIF_F_SG | > >> NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to > >> avoid unnecessary split of some packets (GRO for example) > >> > >> Changli suggested to also set vlan_features, > > > > He also suggested more GSO flags of which especially NETIF_F_TSO6 > > seems interesting (wrt GRO)? > > I think at least TSO6 would very much be appropriate here. Yes, why not, I am only wondering why loopback / dummy (and others ?) only set NETIF_F_TSO :) Since I want to play with ECN, I might also add NETIF_F_TSO_ECN ;) For other flags, I really doubt it can matter on ifb ? [PATCH v3 net-next-2.6] ifb: add performance flags IFB can use the full set of features flags (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | NETIF_F_NO_CSUM | NETIF_F_HIGHDMA) to avoid unnecessary split of some packets (GRO for example) Changli suggested to also set vlan_features, NETIF_F_TSO6, NETIF_F_TSO_ECN. Jarek suggested to add NETIF_F_HW_VLAN_TX as well. Signed-off-by: Eric Dumazet Cc: Changli Gao Cc: Jarek Poplawski Cc: Pawel Staszewski Signed-off-by: David S. Miller commit 5f66dd35b49ea81a03e71bfd74c28364f4e32d21 Author: Sam Ravnborg Date: Mon Jan 3 08:27:55 2011 +0000 sparc: fix sparse warnings in arch/sparc/prom for 32 bit build Fix following sparse warnings: arch/sparc/prom/bootstr_32.c:32:35: warning: Using plain integer as NULL pointer arch/sparc/prom/memory.c:61:13: warning: symbol 'prom_meminit' was not declared. Should it be static? arch/sparc/prom/misc_32.c:74:1: error: symbol 'prom_halt' redeclared with different type (originally declared at arch/sparc/include/asm/oplib_32.h:67) - different modifiers arch/sparc/prom/ranges.c:16:26: warning: symbol 'promlib_obio_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:17:5: warning: symbol 'num_obio_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:39:1: warning: symbol 'prom_adjust_ranges' was not declared. Should it be static? arch/sparc/prom/ranges.c:69:13: warning: symbol 'prom_ranges_init' was not declared. Should it be static? arch/sparc/prom/tree_32.c:286:22: warning: Using plain integer as NULL pointer arch/sparc/prom/tree_32.c:286:38: warning: Using plain integer as NULL pointer None of the warnings indicated any serious issues. We are now sparse clean for 32 bit build in arch/sparc/prom. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 0dfb33a0d7e2d9316eb4441a065ddd173f87223e Author: Eric Dumazet Date: Mon Jan 3 08:11:38 2011 +0000 sch_red: report backlog information Provide child qdisc backlog (byte count) information so that "tc -s qdisc" can report it to user. packet count is already correctly provided. qdisc red 11: parent 1:11 limit 60Kb min 15Kb max 45Kb ecn Sent 3116427684 bytes 1415782 pkt (dropped 8, overlimits 7866 requeues 0) rate 242385Kbit 13630pps backlog 13560b 8p requeues 0 marked 7865 early 1 pdrop 7 other 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7f891cf1fc0d5d5c5b359caec77e5383e1d55986 Author: Shmulik Ravid Date: Mon Jan 3 08:04:59 2011 +0000 dcbnl: more informed return values for new dcbnl routines More accurate return values for the following (new) dcbnl routines: dcbnl_getdcbx() dcbnl_setdcbx() dcbnl_getfeatcfg() dcbnl_setfeatcfg() Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 87e609760b5304ef0c0c53cf4d0b29fde9812e1b Author: Michal Simek Date: Mon Jan 3 00:32:36 2011 +0000 ll_temac: Fix section mismatch from the temac_of_probe Replace __init by __devinit. Warning message: WARNING: vmlinux.o(.data+0xbc14): Section mismatch in reference from the variable temac_of_driver to the function .init.text:temac_of_probe() The variable temac_of_driver references the function __init temac_of_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: Michal Simek Acked-by: Grant Likely Signed-off-by: David S. Miller commit 68763c890eb2a60f9b50a061502f94e0cf20fdfe Author: Michal Simek Date: Sun Jan 2 22:54:09 2011 +0000 trivial: Fix typo fault in netdevice.h Signed-off-by: Michal Simek Signed-off-by: David S. Miller commit 9f84f8886b98a9411ee20a10ca390487507037b9 Author: amit salecha Date: Sun Jan 2 21:58:45 2011 +0000 netxen: update driver version 4.0.75 Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit e4baaf719807ffc87c6321f3914b93dd512b64c4 Author: Sucheta Chakraborty Date: Sun Jan 2 21:58:44 2011 +0000 netxen: enable LRO based on NETIF_F_LRO o Enable/disable LRO in device based on NETIF_F_LRO flag, instead of using driver private flag. o Disable LRO, if rx csum offloading is off. David Miller, You should use netdev_info() instead of dev_info(). Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit cfa60917f0ba6eca83f41aef3cb4a7dd7736ac9f Author: Cliff Wickman Date: Mon Jan 3 12:03:53 2011 -0600 x86, UV, BAU: Extend for more than 16 cpus per socket Fix a hard-coded limit of a maximum of 16 cpu's per socket. The UV Broadcast Assist Unit code initializes by scanning the cpu topology of the system and assigning a master cpu for each socket and UV hub. That scan had an assumption of a limit of 16 cpus per socket. With Westmere we are going over that limit. The UV hub hardware will allow up to 32. If the scan finds the system has gone over that limit it returns an error and we print a warning and fall back to doing TLB shootdowns without the BAU. Signed-off-by: Cliff Wickman Cc: # .37.x LKML-Reference: Signed-off-by: Ingo Molnar commit 0cf445ceaf43be31c5fc70b0e2d5fdccb291c925 Author: Paul Gortmaker Date: Sat Jan 1 13:28:30 2011 +0000 netdev: Update status of 8390 based drivers in MAINTAINERS With the original 8 bit ISA ne1000 card being over 20 years old, it only makes sense to consider ne.c and all the other toplevel 8390 based driver files as legacy for obsolete hardware. The most recent thing made in large quantities that was 8390 based were those crazy PCI ne2k clones - and even they are now 10+ years old. Also remove myself as maintainer, since the only changes to these drivers going forward will be the generic API type changes that touch all drivers. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit f08c3117c349ea56bd57be347b0b5f8be8c3143c Author: Paul Gortmaker Date: Sat Jan 1 13:15:01 2011 +0000 net/Space: delete orphaned externs from deleted drivers The drivers associated with the prototypes in this commit have been deleted some time ago, but the externs escaped detection. Using a simple "git grep" shows that these references are historical artefacts, only mentioned by the deleted lines. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 70d544d0576775a2b3923a7e68cb49b0313d80c9 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:51:39 2011 -0200 perf evsel: Delete the event selectors at exit Freeing all the possibly allocated resources, reducing complexity on each tool exit path. 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 1e7972cc5c16e06f258b0278d8c9adfb5aa75c68 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:50:55 2011 -0200 perf util: Move do_read from session to util Not really something to be exported from session.c. Rename it to 'readn' as others did in the past. 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 daec78a09de3df5fbfbbd167da0304d49d7fcfe5 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:49:44 2011 -0200 perf evsel: Adopt MATCH_EVENT macro from 'stat' 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 69aad6f1ee69546dea8535ab8f3da9f445d57328 Author: Arnaldo Carvalho de Melo Date: Mon Jan 3 16:39:04 2011 -0200 perf tools: Introduce event selectors Out of ad-hoc code and global arrays with hard coded sizes. This is the first step on having a library that will be first used on regression tests in the 'perf test' tool. [acme@felicio linux]$ size /tmp/perf.before text data bss dec hex filename 1273776 97384 5104416 6475576 62cf38 /tmp/perf.before [acme@felicio linux]$ size /tmp/perf.new text data bss dec hex filename 1275422 97416 1392416 2765254 2a31c6 /tmp/perf.new 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 c32e061fa19893ce4acf95d97d5613a161f0f1b7 Author: roel kluin Date: Sat Jan 1 19:40:23 2011 +0100 [SCSI] arcmsr: fix write to device check Use command->sc_data_direction instead of trying (incorrectly) to figure it out from the command itself [jejb: fix up compile failure] Signed-off-by: Roel Kluin Acked-by: NickCheng Signed-off-by: James Bottomley commit 474ffb74c75ea9845860ffb24cdc127eda0d5657 Author: Tomas Henzl Date: Wed Dec 22 16:52:40 2010 +0100 [SCSI] lpfc: lower stack use in lpfc_fc_frame_check according to checkstack the lpfc_fc_frame_check occupies the first place in stack usage: make checkstack objdump -d vmlinux $(find . -name '*.ko') | \ perl /root/rpmbuild/BUILD/kernel-2.6.32/linux-2.6.32.x86_64/scripts/checkstack.pl x86_64 0x000013f4 lpfc_fc_frame_check [lpfc]: 1936 ... This change makes the rctl_names static, thus not on stack. Signed-off-by: Tomas Henzl Acked-by: James Smart Signed-off-by: James Bottomley commit 9e76a97efd31a08cb19d0ba12013b8fb4ad3e474 Author: R, Durgadoss Date: Mon Jan 3 17:22:04 2011 +0530 x86, hwmon: Add core threshold notification to therm_throt.c This patch adds code to therm_throt.c to notify core thermal threshold events. These thresholds are supported by the IA32_THERM_INTERRUPT register. The status/log for the same is monitored using the IA32_THERM_STATUS register. The necessary #defines are in msr-index.h. A call back is added to mce.h, to further notify the thermal stack, about the threshold events. Signed-off-by: Durgadoss R LKML-Reference: Signed-off-by: H. Peter Anvin commit 41511704b678f7b101a76e58d6c6b7bbe2a9ad70 Author: Alan Stern Date: Mon Nov 15 16:04:56 2010 -0500 [SCSI] eliminate an unnecessary local variable from scsi_remove_target() Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit 96de6d447f40612acb93f81a561a834177cca685 Author: Sascha Hauer Date: Mon Dec 6 11:37:30 2010 +0100 ARM i.MX51: rename IPU irqs Signed-off-by: Sascha Hauer commit b848169b37f71c494ea59b260ba665290c23c350 Author: Sascha Hauer Date: Mon Dec 6 09:13:21 2010 +0100 ARM i.MX51: Add ipu clock support Signed-off-by: Sascha Hauer commit 8dd11f80ab73fa6d47f4a9aabb5cee7bc69e7f7a Author: Justin P. Mattock Date: Thu Dec 30 16:09:40 2010 -0800 ppc: fix comment typo singal -> signal The patches below fixes a typo "singal" to "signal". Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 48e34d0f4f357bb24fa4c6f84a93b9b8349db722 Author: Justin P. Mattock Date: Thu Dec 30 15:07:58 2010 -0800 drivers: fix comment typo diable -> disable. The below patch fixes a typo "diable" to "disable" and also fixes another typo in a comment. Please let me know if this is correct or not. Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit f3449bf31d352f70c80a7993c272a7854ae98086 Author: Justin P. Mattock Date: Thu Dec 30 15:07:50 2010 -0800 m68k: fix comment typo diable -> disable. The below patch fixes a typo "diable" to "disable". Please let me know if this is correct or not. Signed-off-by: Justin P. Mattock Acked-by: Geert Uytterhoeven Signed-off-by: Jiri Kosina commit 62e45c14fb9a978dca6c7a5dc8372cc8ea2f42c8 Author: Justin P. Mattock Date: Thu Dec 30 15:07:56 2010 -0800 wireless: comment typo fix diable -> disable. The below patch fixes a typo "diable" to "disable". Please let me know if this is correct or not. Signed-off-by: Justin P. Mattock Acked-by: Larry Finger Signed-off-by: Jiri Kosina commit eb78bd7d8a39415245a8d20ae3b464ddde68b20a Author: Justin P. Mattock Date: Thu Dec 30 15:08:03 2010 -0800 media: comment typo fix diable -> disable. The below patch fixes a typo "diable" to "disable". Signed-off-by: Justin P. Mattock Acked-by: Mauro Carvalho Chehab Signed-off-by: Jiri Kosina commit c67a3e09a5316bb34a14e2751cee719339934235 Author: Fabio Estevam Date: Mon Jan 3 11:16:39 2011 -0200 ARM: imx/mx27_3ds: Add PMIC support MX27_3DS board has a MC13783 PMIC connected to the CSPI2 port. Add support for the PMIC. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit a6e8dc46ff0b7defbfa4f29a71aee263377ec573 Author: Tejun Heo Date: Mon Jan 3 15:01:48 2011 +0100 bio-integrity: mark kintegrityd_wq highpri and CPU intensive Work items processed by kintegrityd_wq won't block much, may burn a lot of CPU cycles and affect IO latency. Use alloc_workqueue() to mark it highpri and CPU intensive with max concurrency of 1. Signed-off-by: Tejun Heo Cc: Martin K. Petersen Signed-off-by: Jens Axboe commit 89b90be2d877a904b1704e4029db65655bfc6282 Author: Tejun Heo Date: Mon Jan 3 15:01:47 2011 +0100 block: make kblockd_workqueue smarter kblockd is used for unplugging and may affect IO latency and throughput and the max number of concurrent work items are bound by the number of block devices. Make it HIGHPRI workqueue w/ default max concurrency. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 44dd4ff33cde33d52d4376130f770b50f64218ca Author: Jim Cromie Date: Wed Dec 29 10:09:33 2010 -0500 remove doc for obsolete dynamic-printk kernel-parameter re: commit e9d376f0fa66bd630fe27403669c6ae6c22a868f Author: Jason Baron Date: Thu Feb 5 11:51:38 2009 -0500 dynamic debug: combine dprintk and dynamic printk Above commit obsoleted the kernel parameter, and even removed its entry in kernel-parameters.txt, but got reinsterted through 0cb55ad2ad55 ("docs: alphabetize entries in kernel-parameters.txt") Signed-off-by: Jim Cromie Signed-off-by: Jiri Kosina commit 50ed380afb5c5858409e99cf971a311c4e64a5b3 Author: Jim Cromie Date: Sat Jul 3 23:18:11 2010 -0600 remove extraneous 'is' from Documentation/iostats.txt fix "is increases", drop "is" Signed-off-by: Jim Cromie Signed-off-by: Jiri Kosina commit 9380f2af16940d1a65cb522d6a5876de65c28e7d Author: Stefan Weil Date: Sun Jan 2 15:21:49 2011 +0100 Fix spelling milisec -> ms in snd_ps3 module parameter description Instead of replacing 'milisec' by 'millisec', I decided to use the more common SI unit. Other drivers use 'milliseconds' or 'ms', too ('millisec' is never used). Cc: Geert Uytterhoeven Cc: Jiri Kosina Cc: linux-kernel@vger.kernel.org Signed-off-by: Stefan Weil Acked-by: Geert Uytterhoeven Signed-off-by: Jiri Kosina commit e8a8b252fb37489f881957ab0f2f8ea9a2341dd1 Author: Stefan Weil Date: Sun Jan 2 15:12:42 2011 +0100 Fix spelling mistakes in comments milisecond -> millisecond meassge -> message Cc: Kalle Valo Cc: Jiri Kosina Cc: linux-kernel@vger.kernel.org Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 9eedd96301cad8ab58ee8c1e579677d0a75c2ba1 Author: Russell King Date: Mon Jan 3 00:00:17 2011 +0000 ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn() Replace the page_to_dma() and dma_to_page() macros with their PFN equivalents. This allows us to map parts of memory which do not have a struct page allocated to them to bus addresses. This will be used internally by dma_alloc_coherent()/dma_alloc_writecombine(). Build tested on Versatile, OMAP1, IOP13xx and KS8695. Tested-by: Janusz Krzysztofik Signed-off-by: Russell King commit f56d463423b825ff5bf4b63e0dc443557934165c Merge: f651ef6 d03e119 Author: Kukjin Kim Date: Mon Jan 3 19:36:39 2011 +0900 Merge branch 'next-s3c64xx' into for-next commit 7f01af04bdf59448f3d75744d7ad9713331bd0f7 Author: Michal Simek Date: Mon Jan 3 11:35:28 2011 +0100 microblaze: trivial: Fix removed the part of line Signed-off-by: Michal Simek commit d03e119c08359f9217154d6a4201689639fe29c8 Author: Jassi Brar Date: Mon Jan 3 19:36:25 2011 +0900 ARM: S3C64XX: Clear DMA_HALT upon start The stop function sets the DMA_HALT bit, which prevents the DMA transfer to resume after stop, for example during audio PAUSE/PLAY cycle. Clear the HALT bit during start. Signed-off-by: Jassi Brar Signed-off-by: Kukjin Kim commit cde9efef401563943d5a58eb9b7274bfdc08ca9b Merge: 50401d7 60ebe15 Author: Russell King Date: Mon Jan 3 10:31:54 2011 +0000 Merge branch 'ux500-core' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into devel-stable commit 50401d77ee4904673042dd737eed436067cc23f5 Merge: 206323c 760efe6 Author: Russell King Date: Mon Jan 3 10:31:38 2011 +0000 Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable commit f651ef6575d8816143afbad4492584979589bd46 Merge: c6906c3 04ea1cc Author: Kukjin Kim Date: Mon Jan 3 19:20:21 2011 +0900 Merge branch 'next-samsung-irq_data' into for-next commit 04ea1cc8ab0f1e9db9aeaef79476e5c1a2027f6a Author: Lennert Buytenhek Date: Tue Dec 14 22:55:57 2010 +0100 ARM: SAMSUNG: some GENERIC_HARDIRQS_NO_DEPRECATED build fixes When GENERIC_HARDIRQS_NO_DEPRECATED is enabled, a number of struct irq_desc members stop being directly accessible, and need to be accessed via the irq_data struct instead -- this patch fixes up the plat-samsung sites that still access those members directly. Signed-off-by: Lennert Buytenhek Signed-off-by: Kukjin Kim commit bb0b2374677b0678e671254112a326135522aba7 Author: Lennert Buytenhek Date: Tue Dec 14 22:55:26 2010 +0100 ARM: S5P: irq_data conversion Signed-off-by: Lennert Buytenhek Signed-off-by: Kukjin Kim commit 57436c2db4426c5dcbaaba0acd5204f5fa71b762 Author: Lennert Buytenhek Date: Mon Jan 3 19:15:54 2011 +0900 ARM: S3C24XX: irq_data conversion Signed-off-by: Lennert Buytenhek [kgene.kim@samsung.com: coding-style fixes] Signed-off-by: Kukjin Kim commit c6906c3e29a4a28660f70421935c91cf6b8ab1e1 Merge: 285dee7 8267e2e Author: Kukjin Kim Date: Mon Jan 3 18:59:54 2011 +0900 Merge branch 'next-s5pv310' into for-next Conflicts: arch/arm/mach-s5pv310/Makefile commit 8267e2e0fba74a944f9d0c9afd7779eb7272f5e7 Merge: fa353e9 b333fb1 Author: Kukjin Kim Date: Mon Jan 3 18:58:50 2011 +0900 Merge branch 'dev/s5pv310-cpufreq' into next-s5pv310 commit 3370d82f3b3ff04d082a9c343a80019282e41261 Author: Michal Simek Date: Tue Dec 7 11:55:06 2010 +0100 microblaze: Fix __muldi3 function for little-endian. __muldi3 was written for big endian platforms. Code contained half word read/write instructions which are not compatible with little endian cpu. Asm __muldi3 implementation is replaced by C version. Signed-off-by: Michal Simek commit 711669e5b80b6f2d88f61ed8a9681f83d8cbd201 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:58 2010 +0100 mx51: fix usb clock support Current code doesn't really enable the usb clocks so if they're disabled when booting linux, the kernel/machine will hang as soon as someone is trying to read a usb register Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 8305ed75d1418f02933a48bcabdbb5032d885628 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:57 2010 +0100 MX51: Add support for usb host 2 Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 08406f540c7ce4cfed96fb240906eee04b9e3eb7 Author: Arnaud Patard (Rtp) Date: Mon Dec 20 16:48:56 2010 +0100 arch/arm/plat-mxc/ehci.c: fix errors/typos This patch is fixing some issues : - MXC_OTG_UCTRL_OPM_BIT is for USBCTRL register and not PHYCTRL register. - the MXC_EHCI_WAKEUP_ENABLED check was only clearing the bits so never allows to set them. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0d95b75e2dd736b23f7cc0971d2f2aacea7f3e49 Author: Fabio Estevam Date: Tue Dec 21 16:38:22 2010 -0200 ARM: mx3/mx31_3ds: Add support for USB Host2 port Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 1c50e67263a6ab8abb9234e2357bd02134fb4b99 Author: Fabio Estevam Date: Tue Dec 21 16:38:21 2010 -0200 ARM: mx3/mx31_3ds: Add support for OTG host mode Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 460d30a329a4186192598131505d9f75e6c5e2bc Author: Fabio Estevam Date: Wed Dec 22 12:25:32 2010 -0200 ARM: imx/mx25_3ds: Add USB support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 96cf4239c72af1fa099affc720731bad2f86927b Author: Fabio Estevam Date: Wed Dec 22 12:25:31 2010 -0200 ARM: imx/mx27_3ds: Add USB OTG support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 130a0ddad9e8f48250dd0e4a5f35aa8afa9d1c5f Author: Fabio Estevam Date: Wed Dec 22 12:25:30 2010 -0200 ARM: mx3/mx35_3ds: Add USB OTG Host mode Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 17b931468729df6921981700bf18c75609c2f6af Author: Michal Simek Date: Fri Nov 12 14:27:10 2010 +0100 microblaze: Clear i/dcache for sw breakpoints There is necessary to flush dcache and invalidate icache for address where breakpoint (brki r16, 0x18) was. The reason is that for some cases icache line still keeps brki instruction and it is not updated by origin instruction maintains by gdbserver. Signed-off-by: Michal Simek commit 1fef891761ddcbd7e57ec3961a0fb748003222ac Merge: d3d4b60 1d3f33d Author: Sascha Hauer Date: Mon Jan 3 10:15:11 2011 +0100 Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new commit 27cbe8d4d1012847029dd8d7af1d6a41c22ddec6 Author: Michal Simek Date: Mon Dec 20 15:03:11 2010 +0100 microblaze: Remove useless early_init_dt_check_for_initrd Remove copy&paste error. Microblaze doesn't support initrd. Signed-off-by: Walter Goossens Signed-off-by: Michal Simek commit e3288f310111f7d18c323d95ae998765dee8c825 Author: Michal Simek Date: Wed Dec 29 14:34:46 2010 +0100 microblaze: Fix unaligned exception for little endian platform Half word unaligned accesses need to be fixed. Signed-off-by: Michal Simek commit a3c26959cc893cafc78a8c4e7d7ca6d4ffe4525c Author: Michal Simek Date: Tue Dec 28 14:44:51 2010 +0100 microblaze: Add PVR for Microblaze v8.00.b Microblaze v8.00.b have 0x13 version string. Signed-off-by: Michal Simek commit 990dbcc6853a20af54703a27b54788ba49ed6372 Author: roel kluin Date: Sat Jan 1 18:17:45 2011 +0100 microblaze: Correct PVR access macros A definition like: called with PVR_IS_FULL(foo) will be preprocessed to: (foo.foo[0] & PVR0_PVR_FULL_MASK) ^^^ So to fix this and ensure the preprocessor compiles calls correctly: Signed-off-by: Roel Kluin Signed-off-by: Michal Simek commit d3d4b60b12369eded0ea0c5dffee0888ec4d80cd Author: Richard Zhao Date: Thu Dec 30 19:25:06 2010 +0800 arm: mx50: add mx50 reference design board support Add basic function and uart device support. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 3d5a44be308203a9a192a77037fb613c2f82ed85 Author: Richard Zhao Date: Thu Dec 30 19:25:05 2010 +0800 arm: mx50: add core functions support except clock Add core definitions and memory map, gpio, irq, iomux, uart device support. Signed-off-by: Richard Zhao Signed-off-by: Sascha Hauer commit 02226a20bcfb01322d4a168f2ed6a6e4366796fd Author: Richard Zhao Date: Thu Dec 30 19:25:03 2010 +0800 arm: mx5: mx51/53 have different mxc_cpu_type definition Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit dca3abf8d071cb78bac8c8f50259e9fe3a81a4bd Author: Richard Zhao Date: Thu Dec 30 19:25:02 2010 +0800 arm: mx51: define mx51's own MXC_GPIO_IRQS mx5 SoCs have different GPIO port count. Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit b086e97b20f150e81609a04ed7da92e12d77f1b0 Author: Richard Zhao Date: Thu Dec 30 19:25:01 2010 +0800 arm: plat-mxc: add full parameter macro to define gpio port Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 626d90c884591005fdaa9464de81731aab23b864 Author: Richard Zhao Date: Thu Dec 30 19:25:00 2010 +0800 ARM: mx5: use config to define boot related addresses Signed-off-by: Richard Zhao Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 1f42be484ffc5559a29466c82adac7dd472d4439 Author: Sam Ravnborg Date: Sat Jan 1 12:53:11 2011 +0000 sparc: remove unused prom tree functions Remove the following unused funtions: prom_nodematch() prom_firstprop() prom_node_has_property() Also declare a few local functions static. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit a7e4236511c678bf012901faf3c285d199a1adc8 Author: Sam Ravnborg Date: Sat Jan 1 12:53:10 2011 +0000 sparc: remove unused prom cpu functions Remove the following unused funtions: prom_stopcpu() prom_idlecpu() prom_restartcpu() Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit efef2e497717958d9c8bde24998c5a915dd04cd5 Author: Sam Ravnborg Date: Sat Jan 1 12:53:09 2011 +0000 sparc: drop prom/palloc.c None of the functions was used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 743ceeed277c77a7e6751649ad0c4fa42af8063b Author: Sam Ravnborg Date: Sat Jan 1 12:53:08 2011 +0000 sparc: drop prom/devmap.c None of the functions was used. Signed-off-by: Sam Ravnborg Signed-off-by: David S. Miller commit 0fbf8ed976af5bb43cf9cf2492161eb9688fee0c Author: Jesper Juhl Date: Sun Jan 2 22:17:00 2011 +0100 HID: hid-picolcd: Fix memory leak in picolcd_debug_out_report() We have a memory leak in drivers/hid/hid-picolcd.c::picolcd_debug_out_report() in an error path.. We are not always freeing the memory allocated to 'buff' - this patch makes sure we always kfree() what we allocate with kmalloc() when it is no longer needed. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 15095bb0fe779c0403091bda7adce5fb3bb9ca35 Author: Russell King Date: Sun Jan 2 15:05:21 2011 +0000 ARM: TWD: enable one-shot mode Allow one shot timer mode to be used with the TWD. This allows NOHZ mode to be used on SMP systems using the TWD localtimer. Tested on Versatile Express and U8500. Tested-by: Linus Walleij Signed-off-by: Russell King commit e9d3f95159005c42dcb3642a73a6bd751dceba78 Author: Kuninori Morimoto Date: Tue Dec 28 14:55:45 2010 +0900 ASoC: sh: fsi-da7210: remove unnecessary format settings Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown commit 689c69120ea3c8db069e11a7065ceffee90d0460 Author: Andreas Mohr Date: Mon Dec 27 21:17:35 2010 +0100 ALSA: azt3328: improve snd_azf3328_codec_setdmaa() - add some WARN_ONCE - add multi-I/O helper (and use helper struct) - fix off-by-1 DMA length bug - better variable naming Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit da237f35a8a503fb8893fb3b9d0622a991bcebef Author: Andreas Mohr Date: Mon Dec 27 21:17:26 2010 +0100 ALSA: azt3328: use proper private_data hookup for codec identification - much improved implementation due to clean codec hierarchy - preparation for potential per-codec spinlock change NOTE: additionally removes a chip->pcm[codec_type] NULL ptr check (due to it requiring access to external chip struct), however I believe this to be ok since this condition should not occur and most drivers don't check against that either. Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 345855951a7d36eed815fd129c49b7ee2b7a6864 Author: Andreas Mohr Date: Mon Dec 27 21:17:11 2010 +0100 ALSA: azt3328: use a helper variable to remove one indirection in hotpath Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 9fd8d36caabaf3102f14cf652d5ca012d775aaa8 Author: Andreas Mohr Date: Mon Dec 27 21:17:00 2010 +0100 ALSA: azt3328: cosmetics: use a helper variable for codec setup Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 8d9a114e6d4acabf6b23ca8bccf0e486c3bdf85c Author: Andreas Mohr Date: Mon Dec 27 21:16:49 2010 +0100 ALSA: azt3328: _setfmt() update - use a separate variable for the frequency part, don't always "or" it - use a "clever"(?) macro to shorten the code Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit adf5931f8c412e90f47033ca6bc7a0bc8a930ba1 Author: Andreas Mohr Date: Mon Dec 27 21:16:43 2010 +0100 ALSA: azt3328: cosmetics, minor updates - correct samples to be POSIX shell compatible - add logging of jiffies value in _pointer() - several comments - cleanup Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 010c520e20413dfd567d568aba2b7238acd37e33 Author: Avi Kivity Date: Mon Oct 11 14:23:39 2010 +0200 KVM: Don't reset mmu context unnecessarily when updating EFER The only bit of EFER that affects the mmu is NX, and this is already accounted for (LME only takes effect when changing cr0). Based on a patch by Hillf Danton. Signed-off-by: Avi Kivity commit 40cd201e37073b3e2281cf2c73fcf5674f22267f Author: Paul Gortmaker Date: Sat Jan 1 14:56:18 2011 -0800 tipc: update log.h re-include protection to reflect new name The tipc/dbg.h file was recently renamed to tipc/log.h, but the re-include define was not updated accordingly. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 0885a30b699a2c96d892b61cc48e8ba68fe87bfc Author: stephen hemminger Date: Fri Dec 31 15:34:27 2010 +0000 sky2: implement 64 bit stats This implements 64 bit statistics support and fixes races when reading counter values. The PHY counters can only be accessed 16 bits at a time, so they are subject to carry races. NB: * TX/RX counters are maintained in software because the the hardware packet count is only a 32 bit value. * Error counters are really only 32 bit. * Old 32 bit counter fields in dev->stats still used for some software counters Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a016892cd6eb8d3dd9769021b088917ac7371abd Author: Allan Stephens Date: Fri Dec 31 18:59:35 2010 +0000 tipc: remove extraneous braces from single statements Cleans up TIPC's source code to eliminate the presence of unnecessary use of {} around single statements. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit e3ec9c7d5eea9adf2c604c623c987360cc700b88 Author: Allan Stephens Date: Fri Dec 31 18:59:34 2010 +0000 tipc: remove zeroing assignments to static global variables Cleans up TIPC's source code to eliminate the needless initialization of static variables to zero. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 2db9983a4318818845193bd577879c0620705e82 Author: Allan Stephens Date: Fri Dec 31 18:59:33 2010 +0000 tipc: split variable assignments out of conditional expressions Cleans up TIPC's source code to eliminate assigning values to variables within conditional expressions, improving code readability and reducing warnings from various code checker tools. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 0e65967e33be61e5f67727edd4ea829b47676fc0 Author: Allan Stephens Date: Fri Dec 31 18:59:32 2010 +0000 tipc: cleanup various cosmetic whitespace issues Cleans up TIPC's source code to eliminate deviations from generally accepted coding conventions relating to leading/trailing white space and white space around commas, braces, cases, and sizeof. These changes are purely cosmetic and do not alter the operation of TIPC in any way. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 25860c3bd5bd1db236d4fd5826d76127d677dc28 Author: Paul Gortmaker Date: Fri Dec 31 18:59:31 2010 +0000 tipc: recode getsockopt error handling for better readability The existing code for the copy to user and error handling at the end of getsockopt isn't easy to follow, due to the excessive use of if/else. By simply using return where appropriate, it can be made smaller and easier to follow at the same time. Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit e83504f72456809cdbdbc91700d3ba6370c9da1c Author: Allan Stephens Date: Fri Dec 31 18:59:30 2010 +0000 tipc: remove pointless check for NULL prior to kfree It is acceptable to call kfree() with NULL, so these checks are not serving any useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 886ef52a8ce6930a9d0c58267d5b5038ac3e8d30 Author: Allan Stephens Date: Fri Dec 31 18:59:29 2010 +0000 tipc: remove redundant #includes Eliminates a number of #include statements that no longer serve any useful purpose. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 6e7e309c62ab584348e0fef90c8e3e48f634dba1 Author: Allan Stephens Date: Fri Dec 31 18:59:28 2010 +0000 tipc: Finish streamlining of debugging code Completes the simplification of TIPC's debugging capabilities. By default TIPC includes no debugging code, and any debugging code added by developers that calls the dbg() and dbg_macros() is compiled out. If debugging support is enabled, TIPC prints out some additional data about its internal state when certain abnormal conditions occur, and any developer-added calls to the TIPC debug macros are compiled in. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8d64a5ba58157dedc61f3f1f51e1c5d66f32a484 Author: Allan Stephens Date: Fri Dec 31 18:59:27 2010 +0000 tipc: Prune down link-specific debugging code Eliminates most link-specific debugging code in TIPC, which is now largely unnecessary. All calls to the link-specific debugging macros have been removed, as are the macros themselves; in addition, the optional allocation of print buffers to hold debugging information for each link endpoint has been removed. The ability for TIPC to print out helpful diagnostic information when link retransmit failures occur has been retained for the time being, as an aid in tracking down the cause of such failures. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 7ced6890bf81d311ab2ea846f92d5f3d0951c08c Author: Allan Stephens Date: Fri Dec 31 18:59:26 2010 +0000 tipc: remove dump() and tipc_dump_dbg() Eliminates calls to two debugging macros that are being completely obsoleted, as well as any associated debugging routines that are no longer required. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b29f14284989b3d0b3a5ce268b5b1fc4df9c5795 Author: Allan Stephens Date: Fri Dec 31 18:59:25 2010 +0000 tipc: remove calls to dbg() and msg_dbg() Eliminates obsolete calls to two of TIPC's main debugging macros, as well as a pair of associated debugging routines that are no longer required. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit f5e75269f59f7c3816f23314b924895e4ecf8409 Author: Allan Stephens Date: Fri Dec 31 18:59:24 2010 +0000 tipc: rename dbg.[ch] to log.[ch] As the first step in removing obsolete debugging code from TIPC the files that implement TIPC's non-debug-related log buffer subsystem are renamed to better reflect their true nature. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 5af5479296fba0ace5d5cab84045de5b19bde3fe Author: Allan Stephens Date: Fri Dec 31 18:59:23 2010 +0000 tipc: Remove internal linked list of node objects Eliminates a sorted list TIPC uses to keep track of the neighboring nodes it has links to, since this duplicates information already present in the internal array of node object pointers. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit b0c1e928c85023c73780b5d9873406ccf1cd8019 Author: Allan Stephens Date: Fri Dec 31 18:59:22 2010 +0000 tipc: Remove user registry subsystem Eliminates routines, data structures, and files that make up TIPC's user registry. The user registry is no longer needed since the native API routines that utilized it no longer exist and there are no longer any internal TIPC services that use it. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit aa70200e001fc4d76552c974c94f65ab26020203 Author: Allan Stephens Date: Fri Dec 31 18:59:21 2010 +0000 tipc: Eliminate use of user registry by topology service Simplifies TIPC's network topology service so that it no longer registers its ports with the user registry, since the service doesn't take advantage of any of the registry's capabilities. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 7a488fd3d40a127d0d6057ecd2696f39e11e63c3 Author: Allan Stephens Date: Fri Dec 31 18:59:20 2010 +0000 tipc: Eliminate use of user registry by configuration service Simplifies TIPC's configuration service so that it no longer registers its port with the user registry, since the service doesn't take advantage of any of the registry's capabilities. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8f92df6ad49da958d97e171762d0a97a3dc738f1 Author: Allan Stephens Date: Fri Dec 31 18:59:19 2010 +0000 tipc: Remove prototype code for supporting multiple clusters Eliminates routines, data structures, and files that were intended to allow TIPC to support a network containing multiple clusters. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 51a8e4dee7653698ba4c6e7de71053665f075273 Author: Allan Stephens Date: Fri Dec 31 18:59:18 2010 +0000 tipc: Remove prototype code for supporting inter-cluster routing Eliminates routines and data structures that were intended to allow TIPC to route messages to other clusters. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 08c80e9a031df0a8f0269477a32f5eae47d7a146 Author: Allan Stephens Date: Fri Dec 31 18:59:17 2010 +0000 tipc: Remove prototype code for supporting slave nodes Simplifies routines and data structures that were intended to allow TIPC to support slave nodes (i.e. nodes that did not have links to all of the other nodes in its cluster, forcing TIPC to route messages that it could not deliver directly through a non-slave node). Currently, TIPC supports only networks containing non-slave nodes, so this code is unnecessary. Note: The latest edition of the TIPC 2.0 Specification has eliminated the concept of slave nodes entirely. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 51f98a8d70583b18cb08b19353aeed5efb0244af Author: Allan Stephens Date: Fri Dec 31 18:59:16 2010 +0000 tipc: Remove prototype code for supporting multiple zones Eliminates routines, data structures, and files that were intended to allows TIPC to support a network containing multiple zones. Currently, TIPC supports only networks consisting of a single cluster within a single zone, so this code is unnecessary. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit aa6027cacdd912ce884953714fcc7392b6155bc6 Author: Eric Dumazet Date: Sat Jan 1 05:22:46 2011 +0000 tg3: fix warnings In case CONFIG_PM_SLEEP is disabled, we dont need tg3_suspend() and tg3_resume(). drivers/net/tg3.c:15056: warning: ‘tg3_suspend’ defined but not used drivers/net/tg3.c:15110: warning: ‘tg3_resume’ defined but not used Signed-off-by: Eric Dumazet Cc: Rafael J. Wysocki Cc: Michael Chan Cc: Matt Carlson Signed-off-by: David S. Miller commit a4f740cf33f7f6c164bbde3c0cdbcc77b0c4997c Author: Grant Likely Date: Sat Oct 30 11:49:09 2010 -0400 of/flattree: Add of_flat_dt_match() helper function This patch adds of_flat_dt_match() which tests a node for compatibility with a list of values and converts the relevant powerpc platform code to use it. This approach simplifies the board support code a bit. Signed-off-by: Grant Likely Reviewed-by: Stephen Neuendorffer commit 47a44d27ca246b815de2b4223daf86070315fb8d Author: Ben Skeggs Date: Sat Jan 1 12:26:23 2011 +1000 drm/nvc0/pgraph: fix 0x406028/0x405870 init Signed-off-by: Ben Skeggs commit 77e58efd134b553d723fd963f436920a6aaaa6df Author: Justin P. Mattock Date: Fri Dec 31 09:50:31 2010 -0800 spi/topcliff: Typo fix threhold to threshold Signed-off-by: Justin P. Mattock Signed-off-by: Grant Likely commit 7dbf6acdbad2fbc6eea72b58404461dcb7c6d9d2 Author: stephen hemminger Date: Thu Dec 30 08:52:29 2010 +0000 skge: Do not use legacy PCI power management The skge driver used the legacy PCI power management, and did its own PCI callbacks. Use the same code model as Rafael's changes to sky2. Let the PCI subsystem take care of all the PCI-specific aspects of device handling during system power transitions. Compile tested only (so far). Signed-off-by: Stephen Hemminger Acked-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit 18c8d82ae5b802c5d82e0dfbcc08b1b568955f46 Author: Eric Dumazet Date: Fri Dec 31 12:48:55 2010 -0800 sfq: fix slot_dequeue_head() slot_dequeue_head() should make sure slot skb chain is correct in both ways, or we can crash if all possible flows are in use. Jarek pointed out slot_queue_init() can now be done in sfq_init() once, instead each time a flow is setup. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit eeaeb068f1393b4db4861481bf594bcd1c3eda7a Author: Eric Dumazet Date: Tue Dec 28 21:53:33 2010 +0000 sch_sfq: allow big packets and be fair SFQ is currently 'limited' to small packets, because it uses a 15bit allotment number per flow. Introduce a scale by 8, so that we can handle full size TSO/GRO packets. Use appropriate handling to make sure allot is positive before a new packet is dequeued, so that fairness is respected. Signed-off-by: Eric Dumazet Acked-by: Jarek Poplawski Cc: Patrick McHardy Signed-off-by: David S. Miller commit 0f333d10e3f689640b229c8cf00b16ea51ce4951 Author: Rafael J. Wysocki Date: Sun Dec 26 08:44:32 2010 +0000 sky2: Do not use legacy PCI power management The sky2 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. Moreover, it uses device_set_wakeup_enable() incorrectly (that function should be used when the WoL setting is changed rather than during suspend). Convert sky2 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 on a desktop machine with a Marvell 88E8056 PCI-E adapter. Signed-off-by: Rafael J. Wysocki Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit c866b7eac073198cef03ea6bac2dc978635a9f5c Author: Rafael J. Wysocki Date: Sat Dec 25 12:56:23 2010 +0000 tg3: Do not use legacy PCI power management The tg3 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. Convert tg3 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 on HP nx6325 with a NetXtreme BCM5788 adapter. Signed-off-by: Rafael J. Wysocki Signed-off-by: David S. Miller commit f5260f02e7903bb10e45b1bf3500eab6425edf5c Author: Dan Carpenter Date: Sat Dec 25 12:23:42 2010 +0000 USB: cdc_ether: remove unneeded check We already verified that "dev->udev->actconfig->extralen" was non-zero so "len" is non-zero here as well. Signed-off-by: Dan Carpenter Acked-by: Oliver Neukum Signed-off-by: David S. Miller commit 0268102d53c872b42e214f95492065c8058b042e Author: Michael Chan Date: Fri Dec 31 11:04:02 2010 -0800 bnx2: Update firmware and version Update MIPS firmware to 6.2.1, with improved small packet performance in RSS mode, and iSCSI CID allocation bug fix on 5708. Update driver version to 2.0.21. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a29ba9d2d84889686a3af1c5a6023f28be75ccba Author: Michael Chan Date: Fri Dec 31 11:03:14 2010 -0800 bnx2: Free IRQ before freeing status block memory When changing ring size, we free all memory including status block memory. If we're in INTA mode and sharing IRQ, the IRQ handler can be called and it will reference the NULL status block pointer. Because of the lockless design of the IRQ handler, there is no simple way to synchronize and prevent this. So we avoid this problem by freeing the IRQ handler before freeing the status block memory. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 0438a1b24437cf007ed0e0f5f6b414d5b49468dc Author: Amit Kumar Salecha Date: Fri Dec 31 10:55:38 2010 -0800 netxen: update module description This driver supports only Intelligent Ethernet Adapters. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7c14c3f10e6dcd7f70e49f77b6e1ae605c4861e6 Author: Shmulik Ravid Date: Thu Dec 30 06:27:10 2010 +0000 dcbnl: cleanup A couple of small cleanups for patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 785b9b1aebcb748fb7627ad4c12dffb7f4f91b55 Author: Shmulik Ravid Date: Thu Dec 30 06:27:03 2010 +0000 bnx2x: adding dcbnl support Adding dcbnl implementation to bnx2x allowing users to manage the embedded DCBX engine. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ea45fe4e176a42d2396878f530cfdc8265bef37b Author: Shmulik Ravid Date: Thu Dec 30 06:26:55 2010 +0000 dcbnl: adding DCBX feature flags get-set Adding a pair of set-get routines to dcbnl for setting the negotiation flags of the various DCB features. Conforms to the CEE flavor of DCBX The user sets these flags (enable, advertise, willing) for each feature to be used by the DCBX engine. The 'get' routine returns which of the features is enabled after the negotiation. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 6241b6259b16aa390ff4bf50f520685b3801200b Author: Shmulik Ravid Date: Thu Dec 30 06:26:48 2010 +0000 dcbnl: adding DCBX engine capability Adding an optional DCBX capability and a pair for get-set routines for setting the device DCBX mode. The DCBX capability is a bit field of supported attributes. The user is expected to set the DCBX mode with a subset of the advertised attributes. This patch is dependent on the following patches: [net-next-2.6 PATCH 1/3] dcbnl: add support for ieee8021Qaz attributes [net-next-2.6 PATCH 2/3] dcbnl: add appliction tlv handlers [net-next-2.6 PATCH 3/3] net_dcb: add application notifiers Signed-off-by: Shmulik Ravid Acked-by: John Fastabend Signed-off-by: David S. Miller commit 96b99684e365f28d49bdb1221ca022b75cb91a98 Author: John Fastabend Date: Thu Dec 30 09:26:37 2010 +0000 net_dcb: add application notifiers DCBx applications priorities can be changed dynamically. If application stacks are expected to keep the skb priority consistent with the dcbx priority the stack will need to be notified when these changes occur. This patch adds application notifiers for the stack to register with. Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 9ab933ab2cc80f04690d6aa385b1110075c5e507 Author: John Fastabend Date: Thu Dec 30 09:26:31 2010 +0000 dcbnl: add appliction tlv handlers This patch adds application tlv handlers. Networking stacks may use the application priority to set the skb priority of their stack using the negoatiated dcbx priority. This patch provides the dcb_{get|set}app() routines for the stack to query these parameters. Notice lower layer drivers can use the dcbnl_ops routines if additional handling is needed. Perhaps in the firmware case for example Signed-off-by: John Fastabend Signed-off-by: Shmulik Ravid Signed-off-by: David S. Miller commit 3e29027af43728c2a91fe3f735ab2822edaf54a8 Author: John Fastabend Date: Thu Dec 30 09:25:46 2010 +0000 dcbnl: add support for ieee8021Qaz attributes The IEEE8021Qaz is the IEEE standard version of CEE. The standard has had enough significant changes from the CEE version that many of the CEE attributes have no meaning in the new spec or do not easily map to IEEE standards. Rather then attempt to create a complicated mapping between CEE and IEEE standards this patch adds a nested IEEE attribute to the list of DCB attributes. The policy is, [DCB_ATTR_IFNAME] [DCB_ATTR_STATE] ... [DCB_ATTR_IEEE] [DCB_ATTR_IEEE_ETS] [DCB_ATTR_IEEE_PFC] [DCB_ATTR_IEEE_APP_TABLE] [DCB_ATTR_IEEE_APP] ... The following dcbnl_rtnl_ops routines were added to handle the IEEE standard, int (*ieee_getets) (struct net_device *, struct ieee_ets *); int (*ieee_setets) (struct net_device *, struct ieee_ets *); int (*ieee_getpfc) (struct net_device *, struct ieee_pfc *); int (*ieee_setpfc) (struct net_device *, struct ieee_pfc *); int (*ieee_getapp) (struct net_device *, struct dcb_app *); int (*ieee_setapp) (struct net_device *, struct dcb_app *); Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit bfcf72e4426da2fd8f8081a641385ffc3ccc2282 Author: Mike Christie Date: Fri Dec 31 02:22:22 2010 -0600 [SCSI] libiscsi: use bh locking instead of irq with session lock The session lock is taken in threads, timers, and bottom halves like softirqs and tasklets. All the code but iscsi_conn/session_failure take the session lock with the spin_lock_bh call. This was done because I thought some offload drivers would be calling these functions from a irq. They never did, so this patch has iscsi_conn/session_failure use the bh locking. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit f41d472179a0d7c8e8160c85180ab1124947068e Author: Mike Christie Date: Fri Dec 31 02:22:21 2010 -0600 [SCSI] libiscsi: do not take host lock in queuecommand iscsi_tcp, ib_iser, cxgb*, be2iscsi and bnx2i do not use the host lock and do not take the session lock against a irq, so this patch drops the DEF_SCSI_QCMD use. Instead we just take the session lock and disable bhs. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1227633a441363642cdbaf38c4241d071e917095 Author: Mike Christie Date: Fri Dec 31 02:22:20 2010 -0600 [SCSI] be2iscsi: fix null ptr when accessing task hdr If alloc_pdu fails then the task->hdr pointer may not be set. This adds a check for this case in the cleanup callback. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit bc7accec8788ada4f459461194c2b8fad94ed239 Author: Mike Christie Date: Fri Dec 31 02:22:19 2010 -0600 [SCSI] be2iscsi: fix gfp use in alloc_pdu The pdu allication callout is called from a spin lock and in the IO path so we cannot use GFP_KERNEL. This has the driver use GFP_ATOMIC. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit df4da5cdfca05b37b366b9c69925b68586969c1c Author: Mike Christie Date: Fri Dec 31 02:22:18 2010 -0600 [SCSI] libiscsi: add more informative failure message during iscsi scsi eh This adds a more informative error code and message for the iscsi scsi eh session drop paths. This allows you to distinguish if the session was dropped due to a connection failure vs the iscsi layer dropping the session due to scsi eh failure processing. Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 5c10007560589a2335a77cbc92347b1474518296 Author: Julia Lawall Date: Wed Dec 29 15:57:54 2010 +0100 [SCSI] gdth: Add missing call to gdth_ioctl_free Add missing call to gdth_ioctl_free before aborting. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression buf,ha,len,addr,E; @@ buf = gdth_ioctl_alloc(ha, len, FALSE, &addr) ... when != false buf != NULL when != true buf == NULL when != \(E = buf\|buf = E\) when != gdth_ioctl_free(ha, len, buf, addr) *return ...; // Signed-off-by: Julia Lawall Signed-off-by: James Bottomley commit 9d1da730ee17e712c25c0b1e51653048f92d2385 Author: David Henningsson Date: Sun Dec 26 10:23:58 2010 -0300 [media] DVB: IR support for TechnoTrend CT-3650 Based on Waling Dijkstra's discovery that the IR works the same as on the TT-1500, this patch has been rewritten to fit with the rc_core infrastructure. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit ebce9a3331f4dd1f39856dc4b79f539eb25f7f64 Author: Igor M. Liplianin Date: Fri Dec 31 02:04:38 2010 -0300 [media] cx23885, cimax2.c: Fix case of two CAM insertion irq For example boot up with two CAM inserted. Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit 21d33014108671cc6b02feda088f32bf26ce532d Author: Mariusz Białończyk Date: Wed Dec 29 19:48:43 2010 -0300 [media] ir-nec-decoder: fix repeat key issue Fixing the problem with NEC protocol and repeating keys under the following circumstances. The problem occurs when there is a repeat code without properly decoded scancode. This leads to repeat the wrong (last decoded) scancode. An example from real life: I am pressing volume down, then several minutes later i am pressing volume up, but the real scancode is wrongly decoded and only a repeat event is emitted, so as a result volume is going down while i am holding volume up button. The patch fixes above problem using rc_keyup timeout (as pointed by Mauro). It just prevents key repeats if they appear after rc_keyup. Signed-off-by: Mariusz Białończyk Signed-off-by: Mauro Carvalho Chehab commit 8f4bfadd200477acb6dcf41a45919dd37d01a6db Author: Jing Huang Date: Sun Dec 26 21:50:10 2010 -0800 [SCSI] bfa: remove unused defintions and misc cleanups This patch removes unused functions, data strucutres, and definitions. It also includes misc comment and formatting cleanups. Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 2f2f40a45845e52fbbe07bcd3e09ccff44feb01b Author: Jing Huang Date: Sun Dec 26 21:48:53 2010 -0800 [SCSI] bfa: remove inactive functions This patch removes some inactive functions and macros. Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit d4b671c58ebeb56dfc8fe8bcca25e0a06bc9359a Author: Jing Huang Date: Sun Dec 26 21:46:35 2010 -0800 [SCSI] bfa: replace bfa_assert with WARN_ON Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 2f263d9d4f0432e4f7a708c95fab82f83ec14947 Author: Justin P. Mattock Date: Thu Dec 30 15:07:51 2010 -0800 spi/dw_spi Typo change diable to disable. Signed-off-by: Justin P. Mattock Signed-off-by: Grant Likely commit 680a48720f55d2f21cbf45c1f7ca38d6b73471dc Author: Ben Skeggs Date: Fri Dec 31 12:21:56 2010 +1000 drm/nvc0/pgraph: more unit names Signed-off-by: Ben Skeggs commit ec9c0883ea3aa90d6c6d6b16a64d0986f40baff0 Author: Ben Skeggs Date: Fri Dec 31 12:10:49 2010 +1000 drm/nvc0/pfifo: support for chipsets with only one PSUBFIFO (0xc1) Signed-off-by: Ben Skeggs commit 285dee7ff4fb4b32838694d4378f4aa938cf5b43 Merge: 0ae9a22 fa353e9 Author: Kukjin Kim Date: Fri Dec 31 10:52:05 2010 +0900 Merge branch 'next-s5pv310' into for-next Conflicts: arch/arm/mach-s5pv310/Kconfig arch/arm/mach-s5pv310/Makefile arch/arm/mach-s5pv310/mach-smdkc210.c arch/arm/mach-s5pv310/mach-smdkv310.c arch/arm/plat-samsung/include/plat/devs.h commit ef98a2c0f2856f6b2aa87fd32d5b192afaeae518 Author: Randy Dunlap Date: Thu Dec 30 15:23:41 2010 -0300 [media] staging: se401 depends on USB Fix build errors by adding "depends on USB": ERROR: "usb_register_driver" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_control_msg" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_kill_urb" [drivers/staging/se401/se401.ko] undefined! ERROR: "usb_deregister" [drivers/staging/se401/se401.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 798cf3144f8b7466533cf738740478e472677a01 Author: Randy Dunlap Date: Thu Dec 30 15:23:38 2010 -0300 [media] staging: usbvideo/vicam depends on USB Fix build errors by adding "depends on USB": ERROR: "usb_register_driver" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_bulk_msg" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_control_msg" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_deregister" [drivers/staging/usbvideo/vicam.ko] undefined! ERROR: "usb_get_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_put_dev" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_free_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_submit_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_set_interface" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_kill_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_register_driver" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_deregister" [drivers/staging/usbvideo/usbvideo.ko] undefined! ERROR: "usb_alloc_urb" [drivers/staging/usbvideo/usbvideo.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 96e442c1b2ef2ba9476e5da2607ba666ce09664d Author: Alberto Panizzo Date: Thu Dec 2 07:43:37 2010 -0300 [media] soc_camera: Add the ability to bind regulators to soc_camedra devices In certain machines, camera devices are supplied directly by a number of regulators. This patch add the ability to drive these regulators directly by the soc_camera driver. Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 3153ac9c6208892ee237caccdbe2290f8247e236 Author: Alberto Panizzo Date: Thu Dec 2 11:53:28 2010 -0300 [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor Signed-off-by: Alberto Panizzo Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit b6a633c18ba83c0c8e96759a31d356bfb77e2b5f Author: Guennadi Liakhovetski Date: Sat Dec 25 17:40:26 2010 -0300 [media] v4l: soc-camera: switch to .unlocked_ioctl Use the V4L mutex infrastructure in soc-camera core and drivers and switch to .unlocked_ioctl. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c85bb69af09988f728aca825c11267c9d06ba32e Author: Guennadi Liakhovetski Date: Thu Dec 30 08:37:06 2010 -0300 [media] v4l: ov772x: simplify pointer dereference Use a more direct way to obtain a pointer to struct ov772x_priv, where the subdevice is available. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 63c9718c1a4595d51f5b70ed4aed6cee5aea875b Author: David Cohen Date: Wed Dec 8 09:13:59 2010 -0300 [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving OmniVision OV9640 driver wasn't requesting properly its private data on I2C remove and video_probe functions. It was retrieving the V4L2 subdev struct address instead of priv struct's one. This patch fixes such problem. Signed-off-by: David Cohen Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit f7b74f76a3a5bcad4d2e8db76834253a63977545 Author: David Cohen Date: Wed Dec 8 09:13:58 2010 -0300 [media] ov9640: use macro to request OmniVision OV9640 sensor private data This cleanup patch creates macro to request OmniVision OV9640 private data, which increases readability. Signed-off-by: David Cohen Signed-off-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit fa353e9f409340cefc7650854065cbcea85c347d Merge: a8928ce 85140ad Author: Kukjin Kim Date: Fri Dec 31 08:01:08 2010 +0900 Merge branch 'dev/s5pv310-irq' into next-s5pv310 commit 9804ed9e840c461f88b290dea43173e3eed37102 Author: Mauro Carvalho Chehab Date: Thu Dec 30 11:58:37 2010 -0300 [media] ivtv-i2c: Fix two warnings Fix two gcc warnings: drivers/media/video/ivtv/ivtv-i2c.c:170: warning: cast from pointer to integer of different size drivers/media/video/ivtv/ivtv-i2c.c:171: warning: cast from pointer to integer of different size $ gcc --version gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-48) They seem bogus, but, as the original code also has problems with LE/BE, just change its implementation to be clear. Signed-off-by: Mauro Carvalho Chehab commit abfd013b665d21f57bc4b2e455b23c4cece0df9f Author: Mauro Carvalho Chehab Date: Thu Dec 30 09:51:19 2010 -0300 [media] staging/lirc: Update lirc TODO files Signed-off-by: Mauro Carvalho Chehab commit 6a23a520c07ba556ea2317b1f72f3d2eb002f991 Author: Mauro Carvalho Chehab Date: Thu Dec 30 09:05:12 2010 -0300 [media] cx88: Remove the obsolete i2c_adapter.id field Signed-off-by: Mauro Carvalho Chehab commit d7c7235695ef9cbbdc20bdeb8554dbf10f576ca1 Author: Andy Walls Date: Tue Dec 28 22:49:50 2010 -0300 [media] lirc_zilog: Remove use of deprecated struct i2c_adapter.id field Remove use of deprecated struct i2c_adapter.id field. In the process, perform different detection of the HD PVR's Z8 IR microcontroller versus the other Hauppauge cards with the Z8 IR microcontroller. Also added a comment about probe() function behavior that needs to be fixed. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit a9cd591e29b6b50e1212de7b7a86ccd270f5c2a6 Author: Andy Walls Date: Tue Dec 28 22:47:46 2010 -0300 [media] ir-kbd-i2c: Add HD PVR IR Rx support to ir-kbd-i2c Add HD PVR IR Rx support to ir-kbd-i2c Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit ea6c06033f01216df504b0f337a350778a3bc80e Author: Andy Walls Date: Tue Dec 28 22:46:13 2010 -0300 [media] hdpvr: Add I2C and ir-kdb-i2c registration of the Zilog Z8 IR chip Adds I2C registration of the Zilog Z8F0811 IR microcontroller for either lirc_zilog or ir-kbd-i2c to use. This is a required step in removing lirc_zilog's use of the deprecated struct i2c_adapter.id field. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 41ca2b1ac269e2ed64e2562b91fa61cab0b19e7a Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:37:33 2010 -0300 [media] Remove staging/lirc/lirc_i2c driver This driver duplicates the same functionality found at ir-kbd-i2c. There were a few missing key parsers that were added by the previous patches. The only thing left on lirc_i2c driver is the IR parsing for Asus TV-Box and Creative/VisionTek BreakOut-Box. Those devices use pcf8574 chip for IR. They are old video adapters with TV tuners. Their code were never merged upstream, and they are not chipped anymore. So, it is very unlikely that someone would have interests on porting them to the Linux Kernel. Due to that, let's remove lirc_i2c, as all the remaining functionality are already mapped via ir-kbd-i2c. Signed-off-by: Mauro Carvalho Chehab commit 8a6334fc91de3f58bbd3051d6f088e7f71a3becd Author: Mauro Carvalho Chehab Date: Thu Dec 30 10:25:12 2010 -0300 [media] ivtv-i2c: Don't use IR legacy mode for Zilog IR The Zilog IR entries are already handled by IR new code. So, remove its usage from the legacy IR support. Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit e1e2c57565635310209566a31a300e593f74cc22 Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:31:10 2010 -0300 [media] ivtv: Add Adaptec Remote Controller lirc-i2c implements a get key logic for the Adaptec Remote Controller, at address 0x6b. The only driver that seems to have an Adaptec device is ivtv: $ git grep -i adaptec drivers/media drivers/media/video/cs53l32a.c: * cs53l32a (Adaptec AVC-2010 and AVC-2410) i2c ivtv driver. drivers/media/video/cs53l32a.c: * Audio source switching for Adaptec AVC-2410 added by Trev Jackson drivers/media/video/cs53l32a.c: /* Set cs53l32a internal register for Adaptec 2010/2410 setup */ drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2410 card */ drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0093 }, drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2410", drivers/media/video/ivtv/ivtv-cards.c:/* Adaptec VideOh! AVC-2010 card */ drivers/media/video/ivtv/ivtv-cards.c: { PCI_DEVICE_ID_IVTV16, IVTV_PCI_ID_ADAPTEC, 0x0092 }, drivers/media/video/ivtv/ivtv-cards.c: .name = "Adaptec VideOh! AVC-2010", drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2410 7 /* Adaptec AVC-2410 */ drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_CARD_AVC2010 8 /* Adaptec AVD-2010 (No Tuner) */ drivers/media/video/ivtv/ivtv-cards.h:#define IVTV_PCI_ID_ADAPTEC 0x9005 drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 8 = Adaptec AVC-2410\n" drivers/media/video/ivtv/ivtv-driver.c: "\t\t\t 9 = Adaptec AVC-2010\n" drivers/media/video/ivtv/ivtv-i2c.c: 0x6b, /* Adaptec IR */ There are two Adaptec cards defined there, but AVC-2010 doesn't have a remote controller. So, the logic at lirc_i2c seems to be for Adaptec AVC-2410. As we'll remove lirc_i2c from kernel, move the getkey code to ivtv driver, and use it for AVC-2410. Reviewed-by: Andy Walls Acked-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 1c0eb0ffb0d541bf05a4b422a629fa5986799313 Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:02:51 2010 -0300 [media] cx88: Add RC logic for Leadtek PVR 2000 Currently, lirc-i2c has a decoding logic for Leadtek Remote Control. Move it to cx88, as we intend to remove lirc-i2c. For now, initialize LIRC remote keytable with RC_MAP_EMPTY, as we don't know its keymap yet. It would be nice to later check if is there any file on LIRC userspace with that keytable. Signed-off-by: Mauro Carvalho Chehab commit b22374544b981b82f7319a02e6b718fc796e9cfa Author: Mauro Carvalho Chehab Date: Thu Dec 30 08:01:01 2010 -0300 [media] bttv-input: Add a note about PV951 RC When comparing lirc-i2c and ir-kbd-i2c/bttv-input logic, a difference was noticed. As lirc-i2c will be removed soon, store the difference on a comment inside ir-kbd-i2c, in order to preserve the knowledge we have about that remote controller. Signed-off-by: Mauro Carvalho Chehab commit 8c11a94d86eb5489dc665bc566bf624e329d89fa Author: Russell King Date: Tue Dec 28 19:40:40 2010 +0000 ARM: mmci: Clean up MMCI announcement printk Make the MMCI 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 c1955b5f3a95717ce1f5235f6e9968da068e3183 Author: Tejun Heo Date: Sat Dec 18 16:30:48 2010 +0100 x86: Use this_cpu_inc_return for nmi counter this_cpu_inc_return() saves us a memory access there. Reviewed-by: Pekka Enberg Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Acked-by: Tejun Heo Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 7b543a5334ff4ea2e3ad3b777fc23cdb8072a988 Author: Tejun Heo Date: Sat Dec 18 16:30:05 2010 +0100 x86: Replace uses of current_cpu_data with this_cpu ops Replace all uses of current_cpu_data with this_cpu operations on the per cpu structure cpu_info. The scala accesses are replaced with the matching this_cpu ops which results in smaller and more efficient code. In the long run, it might be a good idea to remove cpu_data() macro too and use per_cpu macro directly. tj: updated description Cc: Yinghai Lu Cc: Ingo Molnar Acked-by: H. Peter Anvin Acked-by: Tejun Heo Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 0a3aee0da4402aa19b66e458038533c896fb80c6 Author: Tejun Heo Date: Sat Dec 18 16:28:55 2010 +0100 x86: Use this_cpu_ops to optimize code Go through x86 code and replace __get_cpu_var and get_cpu_var instances that refer to a scalar and are not used for address determinations. Cc: Yinghai Lu Cc: Ingo Molnar Acked-by: Tejun Heo Acked-by: "H. Peter Anvin" Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 56f4c400349157289b474a3fd49ee96acab0a4d7 Merge: 32ae2ad da169f5 Author: Ingo Molnar Date: Thu Dec 30 11:26:45 2010 +0100 Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core commit 61ea3aa5bf309333c6655ccef825b4a765bff219 Author: Hans Verkuil Date: Wed Dec 29 14:38:44 2010 -0300 [media] timblogiw: fix compile warning Fix 64-bit compile warning: drivers/media/video/timblogiw.c: In function ‘timblogiw_dma_filter_fn’: drivers/media/video/timblogiw.c:151: warning: cast from pointer to integer of different size drivers/media/video/timblogiw.c: In function ‘timblogiw_open’: drivers/media/video/timblogiw.c:670: warning: cast to pointer from integer of different size Signed-off-by: Hans Verkuil Cc: Richard Rojförs Signed-off-by: Mauro Carvalho Chehab commit 657f2271050beabe725ba101c1d840f51a41f33d Author: Hans Verkuil Date: Wed Dec 29 14:29:55 2010 -0300 [media] v4l: fix handling of v4l2_input.capabilities The v4l core sets the v4l2_input.capabilities field based on the supplied v4l2_ioctl_ops. However, several drivers do a memset or memcpy of the v4l2_input struct, thus overwriting that field incorrectly. Either remove the memset (which is already done by the v4l core), or add the proper capabilities field in case of a memcpy. The same is also true for v4l2_output, but that only affected the ivtv driver. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3ea2b673a55cee528f83653e711d09425ed4d8b6 Author: Hans Verkuil Date: Wed Dec 29 14:28:13 2010 -0300 [media] em28xx: fix incorrect s_ctrl error code and wrong call to res_free Calling subdevs to handle s_ctrl returned a non-zero return code even if everything went fine. Calling STREAMOFF if no STREAMON happened earlier would hit a BUG_ON in res_free. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 02ac04805e6a753610d7dd1716181ccbd8e366af Author: Hans Verkuil Date: Wed Dec 29 14:27:05 2010 -0300 [media] v4l2-ctrls: only check def for menu, integer and boolean controls The 'def' field is only valid for menus, integers and booleans. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 513521eaee4375a1a0da0b73c7131a165a9fe4d9 Author: Hans Verkuil Date: Wed Dec 29 14:25:52 2010 -0300 [media] v4l2-ctrls: use const char * const * for the menu arrays This prevents checkpatch warnings generated when defining 'static const char *foo[]' arrays. It makes sense to use const char * const * anyway since the pointers in the array are indeed const. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6d6a48e51fd3bcb40c5b88d0f9690ba960eedfd2 Author: Hans Verkuil Date: Wed Dec 29 13:53:21 2010 -0300 [media] usbvision: coding style Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 52cb0bf275debe4ec8950157f11b9d9f14447a88 Author: Hans Verkuil Date: Sun Dec 19 20:33:51 2010 -0300 [media] usbvision: convert // to /* */ Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5490a7cbe65d63c6ec45f1013287af1e390c95d7 Author: Hans Verkuil Date: Sun Dec 19 20:21:36 2010 -0300 [media] usbvision: get rid of camelCase Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c627b9d1f580f26fe99a8045d37a57f91e9aef66 Author: Hans Verkuil Date: Sat Dec 18 11:06:09 2010 -0300 [media] usbvision: convert to unlocked_ioctl Convert driver to use core-assisted locking. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a6d38f889750ed6290728a19d9dad577b147c6d0 Author: Ping Cheng Date: Fri Dec 24 13:16:53 2010 -0800 Input: wacom_w8001 - support pen or touch only devices Not all penabled devices support touch. The same holds true for touch devices, so we should be setting up devices according to the results returned when we query the hardware. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 477ca3ad6ac5cdbd5bd40941fc22c6eedc9aa90d Author: Mingkai Hu Date: Wed Dec 1 17:29:18 2010 +0800 spi/fsl_espi: change the read behaviour of the SPIRF The user must read N bytes of SPIRF (1 <= N <= 4) that do not exceed the amount of data in the receive FIFO, so read the SPIRF byte by byte when the data in receive FIFO is less than 4 bytes. On Simics, when read N bytes that exceed the amout of data in receive FIFO, we can't read the data out, that is we can't clear the rx FIFO, then the CPU will loop on the espi rx interrupt. Signed-off-by: Mingkai Hu Signed-off-by: Grant Likely commit c9de9333f5a860cab82052bce6ac28bcac9b2c26 Author: Ilya Yanok Date: Wed Oct 27 01:53:00 2010 +0200 powerpc/83xx: add mpc8308_p1m DMA controller device-tree node MPC8308 has DMA controller compatible with mpc512x_dma driver. This patch adds device-tree node to support DMA controller on MPC8308 P1M board. Signed-off-by: Ilya Yanok Acked-by: Wolfgang Denk Signed-off-by: Grant Likely commit 9d6599441837fc375ce768160e3c6f2f74eb5348 Author: Ilya Yanok Date: Wed Oct 27 01:52:59 2010 +0200 powerpc/83xx: add DMA controller to mpc8308 device-tree node MPC8308 has DMA controller compatible with mpc512x_dma driver. This patch adds device-tree node to support DMA controller on MPC8308RDB board. Signed-off-by: Ilya Yanok Acked-by: Wolfgang Denk Signed-off-by: Grant Likely commit a276991357c63bfb8d3ffdf5800054dba4f8d558 Author: Ilya Yanok Date: Wed Oct 27 01:52:58 2010 +0200 powerpc/512x: try to free dma descriptors in case of allocation failure Currently completed descriptors are processed in the tasklet. This can lead to dead lock in case of CONFIG_NET_DMA enabled (new requests are submitted from softirq context and dma_memcpy_to_iovec() busy loops until the requests is submitted). To prevent this we should process completed descriptors from the allocation failure path in prepare_memcpy too. Signed-off-by: Ilya Yanok Cc: Piotr Ziecik Signed-off-by: Grant Likely commit ba2eea251f815b3674cde13ecdba4772332bf56e Author: Ilya Yanok Date: Wed Oct 27 01:52:57 2010 +0200 powerpc/512x: add MPC8308 dma support MPC8308 has pretty much the same DMA controller as MPC5121 and this patch adds support for MPC8308 to the mpc512x_dma driver. Signed-off-by: Ilya Yanok Acked-by: Wolfgang Denk Signed-off-by: Grant Likely commit 2862559e8a1e7c47bb3003f0edbc9db9009dc32b Author: Ilya Yanok Date: Wed Oct 27 01:52:56 2010 +0200 powerpc/512x: fix the hanged dma transfer issue Current code clears interrupt active status _after_ submitting new transfers. This leaves a possibility of clearing the interrupt for this new transfer (if it is triggered fast enough) and thus lose this interrupt. We want to clear interrupt active status _before_ new transfers is submitted and for current channel only. Signed-off-by: Ilya Yanok Acked-by: Wolfgang Denk Signed-off-by: Grant Likely commit 6504cf3412373f42b53a675363c056901c1596cf Author: Ilya Yanok Date: Wed Oct 27 01:52:55 2010 +0200 powerpc/512x: scatter/gather dma fix While testing mpc512x-dma driver with dmatest module I've found that I can hang the mpc512x-dma issuing request from multiple threads to the single channel. insmod dmatest.ko max_channels=1 threads_per_chan=16 After investigating this case I've managed to find that this happens if and only if we have more than one queued requests. In this case the driver tries to make use of hardware scatter/gather functionality. I've found two problems with scatter/gather: 1. When TCD is copied form RAM to the TCD register space with memcpy_io() e_sg bit eventually gets cleared. This results in only first TCD being executed. I've added setting of e_sg bit explicitly in the TCD registers. BTW, what is the correct way to do this? (How can I use setbits with bitfield structure?) After that hardware loads consecutive TCDs and we hit the second issue. 2. Existing code clears int_maj bit in the last TCD so we never get an interrupt on transfer completion. With these fixes my tests with many threads of single channel succeed but tests that use many channels simultaneously still don't work reliable. Signed-off-by: Ilya Yanok Acked-by: Wolfgang Denk Signed-off-by: Grant Likely commit d392da5207352f09030e95d9ea335a4225667ec0 Merge: e39d5ef 387c31c Author: Grant Likely Date: Wed Dec 29 22:20:30 2010 -0700 Merge v2.6.37-rc8 into powerpc/next commit 2a55c9a7ff2a863f05a9b9c8519ef81737d4a3ef Author: Ben Skeggs Date: Thu Dec 30 11:53:48 2010 +1000 drm/nvc0: reserve only subc 0 for kernel use Current 3D driver expects this behaviour. While this could be changed, there's no compelling reason to reserve more than one subchannel for the DRM. If we ever need to use an object other then M2MF, we can just re-bind subchannel 0 as required. Signed-off-by: Ben Skeggs commit 0ae9a22b45b9e9d0f6058e5257b2daf48036dd35 Merge: 5ed76f3 8f49720 Author: Kukjin Kim Date: Thu Dec 30 10:52:32 2010 +0900 Merge branch 'next-s5pv210' into for-next-new Conflicts: arch/arm/mach-s5pv210/mach-smdkv210.c commit 6effe39364f1212aa57e1b5f0bd0f388ebfe9b24 Author: Ben Skeggs Date: Thu Dec 30 11:48:03 2010 +1000 drm/nv50: sync up gr data error names with rnn, use for nvc0 also Signed-off-by: Ben Skeggs commit 5ed76f3d98ffb6ebd754fc7c4cae547d6ffed5ff Merge: 724c35c 9af7d94 Author: Kukjin Kim Date: Thu Dec 30 10:44:53 2010 +0900 Merge branch 'next-s5p64x0' into for-next-new commit 724c35cf530651f68f5958dc02e0b49ac6661226 Merge: 57ca515 3bbef1b Author: Kukjin Kim Date: Thu Dec 30 10:44:13 2010 +0900 Merge branch 'next-s5p' into for-next-new commit 57ca51514905b7aea532977e4e87e989d33bfcbb Merge: e641d15 d930596 Author: Kukjin Kim Date: Thu Dec 30 10:43:56 2010 +0900 Merge branch 'next-samsung' into for-next-new commit e641d15869473d238d4beb0d79dd97a0f7d14e73 Merge: 387c31c d8a2d39 Author: Kukjin Kim Date: Thu Dec 30 10:42:24 2010 +0900 Merge branch 'next-samsung-asoc2' into for-next-new commit eae5e7f304222ee795936e9466110a9d5d5ec558 Author: Ben Skeggs Date: Thu Dec 30 11:40:07 2010 +1000 drm/nvc0: parse a couple more PGRAPH_INTR Signed-off-by: Ben Skeggs commit 73930a85cf38d72851305fcf640c07b4c13aa405 Author: Rob Herring Date: Wed Nov 17 17:50:23 2010 -0600 of_serial: explicitly include of_irq.h On PPC, of_irq.h gets implicitly included, but on other platforms it does not. Signed-off-by: Rob Herring Signed-off-by: Grant Likely commit 3bbef1b912df64a86a86e402d7686a8ed38abaf4 Author: Sylwester Nawrocki Date: Fri Dec 17 15:08:07 2010 +0900 ARM: S5P: Add platform support for MIPI CSIS devices There may be up to two MIPI CSI slave interfaces depending on the SoC version. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 7db8cb2ad5042696ccc735b669ca33fa875e2d21 Author: Sylwester Nawrocki Date: Fri Dec 17 15:08:03 2010 +0900 ARM: S5PV310: Add resource definitions for MIPI CSIS Add IRQ and register base address definitions for MIPI CSI slave devices. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 5905bbfa5b47f14c9df5c23edf1ec805ceb0d6fe Author: Sylwester Nawrocki Date: Fri Dec 17 15:08:00 2010 +0900 ARM: S5PV210: Add resource definitions for MIPI CSIS Naming changed for consistency with s5pv310 where there are two instances of the device. Signed-off-by: Sylwester Nawrocki Signed-off-by: Kyungmin Park Signed-off-by: Kukjin Kim commit 9b580cdb1c0294df2a2cfa845f11d65ee53e27ca Author: Thomas Abraham Date: Thu Dec 2 18:16:20 2010 +0900 ARM: S5PV210: Add DM9000 support on SMDKV210 This patch adds DM9000 Ethernet Controller device support for SMDKV210. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit 81f9becd6a9e0f7a77e27e459e99cc74594bd205 Author: Thomas Abraham Date: Wed Dec 1 18:12:48 2010 +0530 ARM: S5PV210: Add SROM controller clock This patch adds the SROM controller clock to the list of clocks to be enabled at boot time. It is required to be enabled at boot time since the modules connected over the SROM interface such as the Ethernet controller need an operational SROM. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit be297f0374d8609ccb8be805bd6de7adc90abea5 Author: Thomas Abraham Date: Thu Dec 2 18:06:50 2010 +0900 ARM: S5P: Move SROM controller IO mapping to plat-s5p for S5P SoCs This patch modifies the following. 1. Moves the SROM controller mapping from S5PV210 specific code to S5P common code. The SROM controller mapping can be used for all S5P SoCs. 2. Define the SROM controller physical address for S5P64X0, S5P6442, S5PC100, S5PV210 and S5PV310. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit 8233ab6aecf8c103504c3c3b1b055b2d9806fa3e Author: Thomas Abraham Date: Wed Dec 1 18:02:30 2010 +0530 ARM: S5P: Add SROM bank 4 and 5 register offsets Some of the S5P platforms like S5PC100 and S5PV210 include SROM banks 4 and 5 in addition to SROM banks 0 to 3. This patch adds register offsets for SROM bank 4 and 5. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit abc6c3602200a3b9268c9edece6ba2e85be7b2c4 Author: Thomas Abraham Date: Mon Nov 15 09:24:49 2010 +0900 ARM: S5P: Add SROM control register shift macros for other banks. This patch adds shift macros for the SROM Bus width and control register to represent the shift count for the 5th and 6th SROM banks. Some of the S5P SOCs have them. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim commit 8cf460a5d7c12e16ba29d0e4940df4657a7439cc Author: Kukjin Kim Date: Mon Nov 15 09:18:57 2010 +0900 ARM: S5P: Move the SROM register definitions to plat-s5p The SROM register difinitions of S5PV310/S5PC210 (mach/regs-srom.h) can be used to other S5P SoCs such as S5PV210/S5PC110. So moved into plat/regs-srom.h of plat-s5p directory. Signed-off-by: Kukjin Kim commit 9af7d94f2966895b37b8ef1e0d88bd4d9e317e74 Author: Abhilash Kesavan Date: Wed Dec 22 13:31:49 2010 +0900 ARM: S5P6440: Change the name for MMC Special Clock Change the name of mmc spcial clock from mmc_bus to sclk_mmc to be in line with the naming across the S5P SoCs Signed-off-by: Abhilash Kesavan Signed-off-by: Sangbeom Kim [kgene.kim@samsung.com: minor edit of title] Signed-off-by: Kukjin Kim commit f85cbea94c81cda931642c5db34b780de417981d Author: Abhilash Kesavan Date: Fri Dec 3 20:45:48 2010 +0900 ARM: S5P64X0: Change GPIOlib initialization to core_initcall This patch changes the gpiolib initialization from arch_initcall to core_initcall will allow us to make use of gpio functions in smdk64x0_machine_init function. Signed-off-by: Abhilash Kesavan Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 232d10061c05a7d6c1ef8a0754fd45656db93118 Author: Atul Dahiya Date: Thu Dec 2 13:36:12 2010 +0900 ARM: S5P64X0: Add clock support for RTC This patch adds RTC clock for S5P6450. Signed-off-by: Atul Dahiya Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 5b1bab2e9ee619599ae78fed1a6e300db84adfcf Author: Kukjin Kim Date: Thu Nov 25 14:21:48 2010 +0900 ARM: S5P64X0: Rename GPIOlib file to gpiolib.c This patch renames S5P64X0 GPIOlib file according to other S5P SoCs. Signed-off-by: Kukjin Kim commit bb1d7002bbfd1471368e1c830a1e6ddcfdff1767 Author: Kukjin Kim Date: Wed Nov 24 11:00:16 2010 +0900 ARM: S5P64X0: Cleanup S5P64X0 GPIOlib adding 2bit chips This patch changes S5P6440 and S5P6450 GPIOlib adding 2bit chips. Signed-off-by: Kukjin Kim commit 4603089d7c5186d255c4718171187d00ee4d3452 Author: Kukjin Kim Date: Wed Nov 24 10:59:57 2010 +0900 ARM: SAMSUNG: Cleanup GPIOlib adding 2bit chips This patch adds samsung_gpiolib_add_2bit_chips() for cleanup regarding GPIOlib adding 2bit chips. Signed-off-by: Kukjin Kim commit f50266d3139a0e8a26f6f387c91816ab60dac0b4 Author: Kukjin Kim Date: Thu Nov 25 14:17:01 2010 +0900 ARM: S5P64X0: Add GPIOlib support for S5P6450 Already can support S5P6440 GPIOlib but S5P6450. This patch changes regarding S5P6440 GPIO definitions so that can be used it from S5P6450 and adds S5P6450 GPIO chips. Tested-by: Atul Dahiya Signed-off-by: Kukjin Kim commit 8f49720d5afb42dc7c0ced2cd94d561fbe9560d9 Author: Thomas Abraham Date: Fri Nov 26 13:19:49 2010 +0900 ARM: S5PV210: Add frame buffer display support for SMDKV210 Enable frame buffer display support for SMDKV210 board. Signed-off-by: Thomas Abraham Reviewed-by: Jonghun Han Signed-off-by: Kukjin Kim commit a8928ce7e09eed34b59525779cb833f8438d0733 Author: Kyungmin Park Date: Wed Dec 22 13:34:23 2010 +0900 ARM: S5PV310: Universal SDHCI devices support Universal (C210) board has 3 SDHCI devices. Signed-off-by: Kyungmin Park [kgene.kim@samsung.com: minor edit of title] Signed-off-by: Kukjin Kim commit d6d8b481999507a20012b7ee924bdaf5bfb52a05 Author: Changhwan Youn Date: Fri Dec 3 17:15:40 2010 +0900 ARM: S5PV310: Add support Power Domain This patch adds support Power Domain for S5PV310 and S5PC210. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit a50eb1c7680973f5441ca20ac4da0af2055d0d87 Author: Changhwan Youn Date: Fri Nov 26 13:21:53 2010 +0900 ARM: S5PV310: Set bit 22 in the PL310 (cache controller) AuxCtlr register This patch is applied according to the commit 1a8e41cd672f894bbd74874eac601e6cedf838fb (ARM: 6395/1: VExpress: Set bit 22 in the PL310 (cache controller) AuxCtlr register). Actually, S5PV310 has same cache controller(PL310). Following is from Catalin Marinas' commit. Clearing bit 22 in the PL310 Auxiliary Control register (shared attribute override enable) has the side effect of transforming Normal Shared Non-cacheable reads into Cacheable no-allocate reads. Coherent DMA buffers in Linux always have a Cacheable alias via the kernel linear mapping and the processor can speculatively load cache lines into the PL310 controller. With bit 22 cleared, Non-cacheable reads would unexpectedly hit such cache lines leading to buffer corruption. Signed-off-by: Changhwan Youn Cc: Cc: Catalin Marinas Cc: Russell King Signed-off-by: Kukjin Kim commit d930596a3c093bf3f4fbf24f10ad0d8372d6ac21 Author: Changhwan Youn Date: Fri Dec 3 17:14:57 2010 +0900 ARM: SAMSUNG: Add support for Power Domain control This patch implements Power Domain control based on Runtime PM framework. Each Power Domain is represented by a Power Domain device and the devices belong to these Power Domains should be set as a child device of the Power Domain devices. The corresponding drivers of the devices should implement Runtime PM to control the Power Domains. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit df3d02962bc39155c8b4214ce6f0e84750c7921f Author: Mark Brown Date: Fri Dec 3 20:28:21 2010 +0900 ARM: SAMSUNG: Convert irq-vic-timer to irq_ functions Conver the VIC timer interrupts to use the irq_ versions of the IRQ operatiosn introduced in 2.6.37, storing the mask for the timer interrupt in the chip_data of the irq_data in order to save having to do a substraction and a shift on every operation. Signed-off-by: Mark Brown Signed-off-by: Kukjin Kim commit 27b31e56239b44608cad176c36c384c0265f8da5 Author: Mark Brown Date: Fri Dec 3 20:28:21 2010 +0900 ARM: SAMSUNG: Convert irq-uart to use new irq_ functions Convert to the new irq_ versions of the IRQ operations. As well as the textual substituion of irq_data for the raw IRQ number we also convert the register base lookup to in s3c_irq_uart_base() to pick the irq_data up directly. Signed-off-by: Mark Brown Signed-off-by: Kukjin Kim commit 3c9169753b42c34c9c5ed96a0e55f417a2f65d77 Author: Mark Brown Date: Thu Dec 2 14:35:38 2010 +0900 ARM: S3C64XX: Use chip_data to store the shift for EINTs This makes all the functions that use the shift slightly smaller, one instruction in most cases but more for ack() and maskack(). Signed-off-by: Mark Brown Cc: Ben Dooks Signed-off-by: Kukjin Kim commit c35cd6ec36a619dfd72d95d719ac926511d3f0e4 Author: Mark Brown Date: Thu Dec 2 14:35:38 2010 +0900 ARM: S3C64XX: Convert S3C64xx irq-eint to use new irq_ methods Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Conver S3C64xx irq-eint to use this with a simple textual substitution. Signed-off-by: Mark Brown Cc: Ben Dooks Signed-off-by: Kukjin Kim commit f5aeffb784f35f82b048969a4d7bcca42c783c84 Author: Mark Brown Date: Thu Dec 2 14:35:38 2010 +0900 ARM: SAMSUNG: Convert s3c_irqext_wake() to new irq_ interrupt methods Kernel 2.6.37 adds new interrupt methods which take a struct irq_data rather than an irq number. Begin converting Samsung platforms over to these methods by converting s3c_irqext_wake() with a simple textual substitution. Signed-off-by: Mark Brown Cc: Ben Dooks Signed-off-by: Kukjin Kim commit fe14042358fac0673d4b6362a73796fd64379938 Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:02 2010 -0800 of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree unflatten_device_tree has two dependencies on things that happen during boot time. Firstly, it references the initial device tree directly. Secondly, it allocates memory using the early boot allocator. This patch factors out these dependencies and uses the new __unflatten_device_tree function to implement a driver-visible fdt_unflatten_tree function, which can be used to unflatten a blob after boot time. V2: - remove extra __va() call - make dt_alloc functions return void *. This doesn't fix the general strangeness in this code that constantly casts back and forth between unsigned long and __be32 * Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit 57d00ecf90cc9854973da2960012b734acc26e51 Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:01 2010 -0800 of/flattree: Reorder unflatten_dt_node Move unflatten_dt_node to be grouped with non-__init functions. Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit a40d6c4cf12d87980c10b230df435d0f56adc40b Author: Stephen Neuendorffer Date: Thu Nov 18 15:55:00 2010 -0800 of/flattree: Refactor unflatten_dt_node unflatten_dt_node is a helper function that does most of the work to convert a device tree blob into tree of device nodes. This code now uses a passed-in blob instead of using the single boot-time blob, allowing it to be called in more contexts. Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit 9706a36e35c4ce04f28a62cfe1205b4e3b0dd13c Author: Stephen Neuendorffer Date: Thu Nov 18 15:54:59 2010 -0800 of/flattree: Add non-boottime device tree functions In preparation for providing run-time handling of device trees, factor out some of the basic functions so that they take an arbitrary blob, rather than relying on the single boot-time tree. V2: - functions have of_fdt_* names - removed find_flat_dt_string - blob argument is first Signed-off-by: Stephen Neuendorffer Signed-off-by: Grant Likely commit d8a2d39d9e1d023b7eb4ea559d2baa668d3eb6c7 Author: Jassi Brar Date: Tue Dec 21 09:59:57 2010 +0900 ARM: S5PV310: Enable I2S device on SMDKC210 Enable I2S_0 device on the SMDKC210. Also, add the dependency I2C_1 device. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit 6f5c11c5a5ec9aef67b433906c712608ef7b9b97 Author: Jassi Brar Date: Tue Dec 21 09:59:05 2010 +0900 ARM: S5PV310: Enable I2S device on SMDKV310 Enable I2S_0 device on the SMDKV310. Also, add the dependency I2C_1 device. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit 906b9826b81d07701b96621a14d7cf255c6e1712 Author: Jassi Brar Date: Tue Dec 21 09:57:46 2010 +0900 ARM: S5PV310: Add AC97 support for SMDK Enable AC97 audio device on SMDKV310 and SMDKC210. Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit 2d27043f7b7692252cc76aa13a95b4ff88558977 Author: Jassi Brar Date: Tue Dec 21 09:57:03 2010 +0900 ARM: S5PV310: Define I2S clocks Define missing controller clocks for the I2S-0, 1 and 2 blocks. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: Added description] Signed-off-by: Kukjin Kim commit aa227557dde1d8de2eba19655320d4af360054fd Author: Jassi Brar Date: Tue Dec 21 09:54:57 2010 +0900 ARM: S5PV310: Add AC97 clock Define clock for the AC97 controller. Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit 3055c6dad620af9e2c5432feb5ec7d5ac46d54b0 Author: Jassi Brar Date: Tue Dec 21 09:54:35 2010 +0900 ARM: S5PV310: Add PDMA clocks Define PDMA clocks for the controller 0 and 1. Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit f5cc4354907dccd6bb343cca18074c751a94f913 Author: Jassi Brar Date: Tue Dec 21 09:52:14 2010 +0900 ARM: S5PV310: Enable I2C1 device Enable the I2C1 device on SMDKV310 and SMDKC210. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit d8710bc8de918059efaadd126320c2b34c514548 Author: Jassi Brar Date: Tue Dec 21 09:48:37 2010 +0900 ARM: S5PV210: Enable I2S device to work on SMDKV210 Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDKV210. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit 0031e9d91e45d1ddf17702c1f105096b8740d456 Author: Jassi Brar Date: Tue Dec 21 09:48:35 2010 +0900 ARM: S5PV210: Enable I2S device to work on SMDKC110 Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDKC110. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit fcf8897d038b819267cae2c661438331785c2979 Author: Jassi Brar Date: Tue Dec 21 09:48:32 2010 +0900 ARM: S5P6450: Enable I2S device to work on SMDK6450 Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK6450. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit 149bb5bcc3b1c5f4044e0ad088afdc8a12b51c64 Author: Jassi Brar Date: Tue Dec 21 09:46:29 2010 +0900 ARM: S5P6440: Enable I2S device to work on SMDK6440 Add missing virtual ASoC DMA device and WM8580 as I2C slave, so that the I2S can work on SMDK6440. [kgene.kim@samsung.com: removed virtual ASoC DMA device to avoid build error and it will be added next time] Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title] Signed-off-by: Kukjin Kim commit e0b9c88b12dd190591eb5903cd0572a97d2a6bf1 Author: Rajeshwari Shinde Date: Tue Dec 21 09:44:42 2010 +0900 ARM: S5P64X0: Segregate audio devices Segregate I2S devices for S5P6440 and S5P6450. Signed-off-by: Rajeshwari Shinde Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit cf57b1a7f288829547b03385bf22124a96c82a4e Author: Jassi Brar Date: Tue Dec 21 09:44:39 2010 +0900 ARM: S5P6450: Define base addresses for I2S Define the base address of I2S-1 and 2 for S5P6450. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: Added description] Signed-off-by: Kukjin Kim commit 6cb26da8205a47cab75118af8849766a10d098db Author: Jassi Brar Date: Tue Dec 21 09:44:36 2010 +0900 ARM: S5P6450: Define clocks for I2S Define missing controller clocks for the I2S-0,1 blocks. Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit c204fb151781dedef364ded77324b5c77a5b83a9 Author: Jassi Brar Date: Tue Dec 21 09:44:30 2010 +0900 ARM: S5P6442: Enable I2C0 device on SMDK6442 This patch enables I2C0 device for WM8580 on SMDK6442. Signed-off-by: Jassi Brar Acked-by: Mark Brown [kgene.kim@samsung.com: minor changed title and description] Signed-off-by: Kukjin Kim commit 85e0dbf94eb369882d5ad768e3687a4af6f36dbe Author: Jassi Brar Date: Tue Dec 21 09:44:28 2010 +0900 ARM: S5P6442: Implement i2c-gpio config Signed-off-by: Jassi Brar Acked-by: Mark Brown Signed-off-by: Kukjin Kim commit e6ce1324e4f08b0d984340201a125806dae0e9a6 Author: Stephen Neuendorffer Date: Thu Nov 18 15:54:56 2010 -0800 of/flattree: Add Kconfig for EARLY_FLATTREE The device tree code is now in two pieces: some which can be used generically on any platform which selects CONFIG_OF_FLATTREE, and some early which is used at boot time on only a few architectures. This patch segregates the early code so that only those architectures which care about it need compile it. This also means that some of the requirements in the early code (such as a cmd_line variable) that most architectures (e.g. X86) don't provide can be ignored. Signed-off-by: Stephen Neuendorffer [grant.likely@secretlab.ca: remove extra blank line addition] [grant.likely@secretlab.ca: fixed incorrect #ifdef CONFIG_EARLY_FLATTREE check] [grant.likely@secretlab.ca: Made OF_EARLY_FLATTREE select instead of depend on OF_FLATTREE] Signed-off-by: Grant Likely commit 60ebe1568fd15b7ffa101acc645069e27d546ed6 Author: Sundar Iyer Date: Fri Dec 3 20:35:50 2010 +0530 ux500: add TC35893 keypad platform data Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 09c730a488c32c2cadb31cdb8dcc4df528441197 Author: Sundar Iyer Date: Tue Dec 21 15:53:31 2010 +0530 input/tc3589x: add tc3589x keypad support Add support for the keypad controller module found on the TC3589X devices. This driver default adds the support for TC35893 device. Signed-off-by: Sundar Iyer Acked-by: Dmitry Torokhov [Some minor fixups for compilation] Signed-off-by: Linus Walleij commit d50e8fc7e38d88909448a723cb1f825bb3af30e2 Merge: a387e95 0aa002f Author: H. Peter Anvin Date: Wed Dec 29 11:36:26 2010 -0800 Merge branch 'x86/apic-cleanups' into x86/numa commit 22b6dee842c6341b49bc09cc5728eb2f8f2b3766 Author: Mi Jinlong Date: Mon Dec 27 14:29:57 2010 +0800 nfsd4: fix oops on secinfo_no_name result encoding The secinfo_no_name code oopses on encoding with BUG: unable to handle kernel NULL pointer dereference at 00000044 IP: [] nfsd4_encode_secinfo+0x1c/0x1c1 [nfsd] We should implement a nfsd4_encode_secinfo_no_name() instead using nfsd4_encode_secinfo(). Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit 96aebafa63418f447ddc823e40da341cc40553dd Author: Jesper Juhl Date: Fri Dec 24 21:28:56 2010 +0100 gen_init_cpio: Avoid race between call to stat() and call to open() In usr/gen_init_cpio.c::cpio_mkfile() a call to stat() is made based on pathname, subsequently the file is open()'ed and then the value of the initial stat() call is used to allocate a buffer. This is not safe since the file may change between the call to stat() and the call to open(). Safer to just open() the file and then do fstat() using the filedescriptor returned by open. Signed-off-by: Jesper Juhl Acked-by: Jeff Garzik Signed-off-by: Michal Marek commit 644a98453d5764f467b73f2e02df0d2688da1873 Author: Kuninori Morimoto Date: Mon Dec 27 13:42:20 2010 +0900 fbdev: sh_mobile_hdmi: fixup compile error Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown commit 7116f452c8e3e38f99ab3231a758eb366dacfe4a Author: Mark Brown Date: Wed Dec 29 13:05:21 2010 +0000 ASoC: Yet more x86 tracepoint workarounds Signed-off-by: Mark Brown commit cd8d60a20a4516016c117ac0f1ac7b06ff606f7e Author: Theodore Ts'o Date: Fri Dec 24 09:42:10 2010 -0500 kbuild: create linux-headers package in deb-pkg Create a linux-headers-$KVER.deb package which can be used to build external modules without having the source tree around. Signed-off-by: "Theodore Ts'o" Signed-off-by: Michal Marek commit 6c39d116ba308ccf9007773a090ca6d20eb68459 Author: Dmitry Kasatkin Date: Wed Dec 29 21:52:04 2010 +1100 crypto: omap-sham - backlog handling fix Previous commit "removed redundant locking" introduced a bug in handling backlog. In certain cases, when async request complete callback will call complete() on -EINPROGRESS code, it will cause uncompleted requests. It does not happen in implementation similar to crypto test manager, but it will happen in implementation similar to dm-crypt. Backlog needs to be checked before dequeuing next request. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 427aacfe1d0c540bf80e5243d18ba1272f9b756f Author: Dmitri Belimov Date: Tue Dec 28 21:49:07 2010 -0300 [media] tm6000: Fix mutex unbalance Hi Fix never unlocked mutex. No more crash after removing USB stick. With my best regards, Dmitry. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit aa777a88b2d73f710b86b955e0c738af91e9e452 Author: Jean-François Moine Date: Tue Dec 28 07:39:13 2010 -0300 [media] gspca - sonixj: Bad clock for om6802 in 640x480 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 71e84ea7f082eb02df6ef40f55d2c4a998f6e1df Author: Jean-François Moine Date: Tue Dec 28 07:35:27 2010 -0300 [media] gspca - stv06xx/st6422: Use the new video control mechanism Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7e5f9059a807ce9b7a12b2402f5aeae9557c8049 Author: Jean-François Moine Date: Tue Dec 28 07:24:18 2010 -0300 [media] gspca - vc032x: Cleanup source Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7fbee99aa2c73bdf47add9de58f646fa7713e7e5 Author: Jean-François Moine Date: Tue Dec 28 07:17:40 2010 -0300 [media] gspca - zc3xx: The sensor of the VF0250 is a GC0303 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 49fb5e60f7e907126aac10af6577fac6fde684f6 Author: Jean-François Moine Date: Tue Dec 28 07:09:34 2010 -0300 [media] gspca - zc3xx: Use the new video control mechanism Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7d55a84b0af47b2ec55e16c6dbc8df62a72ac749 Author: Jean-François Moine Date: Tue Dec 28 07:02:32 2010 -0300 [media] gspca - zc3xx: Keep sorted the device table Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 2bbf53bd176e36d1574eeec53bf710d94703535e Author: Jean-François Moine Date: Tue Dec 28 07:01:04 2010 -0300 [media] gspca: Bad comment Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0aeb5ec74b0a95f1699040f0262a6fd5507d6e8f Author: Jean-François Moine Date: Tue Dec 28 06:59:04 2010 -0300 [media] gspca - pac7302/pac7311: Fix some warnings Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d85185902fb669a92d4934b926f8016368e1ad06 Author: Jean-François Moine Date: Tue Dec 28 06:55:01 2010 -0300 [media] gspca - main: Fix some warnings Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 66832aef0694807f487a8ccc8871cea4e80d78c5 Author: Hans Verkuil Date: Mon Dec 27 12:27:50 2010 -0300 [media] bt819: the ioctls in the header are internal to the kernel Remove bt819.h from ioctl-number.txt and make a note in the header that these ioctls are for internal use only. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b9218f2f15cdff8991ba041993bf40962c49fdd0 Author: Hans Verkuil Date: Mon Dec 27 12:22:46 2010 -0300 [media] saa6588: rename rds.h to saa6588.h The naming of the media/rds.h header suggested that it was a generic RDS header, when in fact it is just a saa6588 module API that is internal to the kernel. Rename the header and the struct and defines in it to make this clear. Also removed the header include in radio-si470x.h (not used anymore) and from ioctl-number.txt (it's internal to the kernel and never called from userspace). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit a519d70e0cf346e946202ffcbeaf57a1748d0c03 Author: Vasiliy Kulikov Date: Fri Nov 19 15:41:49 2010 -0300 [media] media: video: pvrusb2: fix memory leak Use put_device() instead of kfree() because of device name leak. Signed-off-by: Vasiliy Kulikov Acked-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 9028f58f5d7e810a0e88b508ebe6a69daf7e3273 Author: Alexey Chernov <4ernov@gmail.com> Date: Mon Dec 6 17:09:53 2010 -0300 [media] support of GoTView PCI-E X5 3D Hybrid in cx23885 Some comments: 1. Everything initialize properly except radio. 2. All analog inputs (TV, composite, S-Video) are tested by myself in several TV norms (SECAM-D, PAL, NTSC), everything work fine. So the patch adds general support/detection of the card with working analog part, DVB part is not supported for now. Signed-off-by: Alexey Chernov <4ernov@gmail.com> Reviewed-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 5f63306d82131371f464c0e5b7ebe6a23a84c768 Author: Dan Carpenter Date: Mon Dec 27 21:04:58 2010 -0300 [media] cx231xx: use bitwise negate instead of logical Bitwise negate was intended here. INPUT_SEL_MASK is 0x30. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 Author: Mauro Carvalho Chehab Date: Mon Oct 25 17:51:15 2010 -0300 [media] em28xx: Fix audio input for Terratec Grabby The audio input line was wrong. Fix it. Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit b5fff5445a077af897e670e98ea54b9b440f8b63 Author: Mauro Carvalho Chehab Date: Tue Dec 28 08:13:50 2010 -0300 [media] cardlist: Update lists for em28xx and saa7134 PS.: The cardlists are auto-generated via scripts. Signed-off-by: Mauro Carvalho Chehab commit b7a0f2e793a52b306e682a0e2e9a0b6f0f0a730e Author: Ramiro Morales Date: Sun Dec 26 18:13:30 2010 -0300 [media] saa7134: Add support for Compro VideoMate Vista M1F Signed-off-by: Pavel Osnova Signed-off-by: Ramiro Morales Signed-off-by: Mauro Carvalho Chehab commit 44c6e2a7c2ec76dd495a0f330f9beac572a2fdd7 Author: Ang Way Chuang Date: Fri Dec 24 02:40:46 2010 -0300 [media] cx88-dvb.c: DVB net latency using Hauppauge HVR4000 A Hauppauge HVR 4000 is used on a School On Internet Asia (SOI Asia) project in order to carry IP traffic over ULE. However, there is an issue with high latency jitter. My boss, Husni, identified the problem and provided a patch for it. The default buffer size of 32 TS frames on cx88 causes the high latency, so our deployment changes that to 6 TS frames. This patch made the buffer size tunable, while keeping the default buffer size of 32 TS frames unchanged. Signed-off-by: Achmad Husni Thamrin Signed-off-by: Mauro Carvalho Chehab commit fe04164647588ec55937e6d696da1ebeca04d000 Author: Dan Carpenter Date: Thu Dec 23 16:38:53 2010 -0300 [media] cx231xxx: fix typo in saddr_len check The original code compared "saddr_len" with zero twice in a nonsensical way. I asked the list, and Andy Walls and Sri Deevi say that the second check should be if "saddr_len == 1". Signed-off-by: Dan Carpenter Signed-off-by: Srinivasa Deevi Signed-off-by: Mauro Carvalho Chehab commit 50155c25bf346b65fec8e215131df397b0a5ee6e Author: Anatolij Gustschin Date: Wed Dec 22 17:31:59 2010 -0300 [media] fsl_viu: add VIDIOC_QUERYSTD and VIDIOC_G_STD support VIDIOC_QUERYSTD and VIDIOC_G_STD ioctls are currently not supported in the FSL VIU driver. The decoder subdevice driver saa7115 extended by previous patch supports QUERYSTD for saa711x, so we add the appropriate ioctls to the VIU driver to be able to determine the video input's standard. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit f9d7d787842e92bc768d282f37fc3056c5441ddb Author: Anatolij Gustschin Date: Wed Dec 22 17:31:58 2010 -0300 [media] saa7115: allow input standard autodetection for more chips Autodetect input's standard using field frequency detection feature (FIDT in status byte at 0x1F) of the chips saa7111/ saa7111a/saa7113/saa7114/saa7118. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit 641d21167f66ef4c574ef4f586fec0ae32179acd Author: Dmitri Belimov Date: Wed Dec 22 05:57:46 2010 -0300 [media] tm6000: rework and fix IR Hi This patch didn't kill Stefan's remotes and just for upload my good part of code. 1. Add some code for show IR activity 2. Add filter for IR remotes 3. Split remotes to different types. 4. Fix stop interrupt pipe when isoc pipe started. When we decide general way of IR I'll add support our remotes. For our customers I'll made custom temporary patch without this part. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit db9285f79b12286a3b525b41ab275796679c1dfa Author: David Henningsson Date: Mon Dec 27 15:45:19 2010 -0300 [media] MEDIA: RC: Provide full scancodes for TT-1500 remote control Add 0x15 prefix to scancodes for TT-1500 remote control. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit 730726a6f90740a5954ca2fb1c74fad6f44a2c42 Author: David Henningsson Date: Mon Dec 27 15:41:58 2010 -0300 [media] DVB: Set scanmask for Budget/SAA7146 cards These devices do not return the full command+address, so set scanmask accordingly. Signed-off-by: David Henningsson Signed-off-by: Mauro Carvalho Chehab commit 2d5ca76f2b39a31313d7e54224c78b7b311e7dce Author: Mauro Carvalho Chehab Date: Mon Dec 27 18:17:12 2010 -0300 [media] dabusb: Move it to staging to be deprecated dabusb driver were conceived as an experimental driver for a test device. The driver never supported any shipped product, and, while there were some updates on 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, better to remove it, on .39. If later needed, we may rescue it from git logs. For now, let's move it to staging. Acked-by: Deti Fliegl Cc: Deti Fliegl Signed-off-by: Mauro Carvalho Chehab commit 0170f6bcb243cb9e86c953652f8e62fccb8108f1 Author: Mauro Carvalho Chehab Date: Mon Dec 27 13:00:04 2010 -0300 [media] streamzap: Fix a compilation warning when compiled builtin drivers/media/rc/streamzap.c: In function ‘streamzap_probe’: drivers/media/rc/streamzap.c:460:2: warning: statement with no effect Cc: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 465a9e3a2f494b0887db63b7b10bb9370145d9bc Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:58:02 2010 -0300 [media] af9013: Fix a compilation warning drivers/media/dvb/frontends/af9013.c: In function ‘af9013_update_signal_strength.clone.0’: drivers/media/dvb/frontends/af9013.c:967:6: warning: ‘ret’ may be used uninitialized in this function Cc: Antti Palosaari Signed-off-by: Mauro Carvalho Chehab commit 187e7d3b9b4e0b6b1c171846592e679e58a84cd2 Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:16:47 2010 -0300 [media] stv090x: Fix some compilation warnings A few typos at the driver are causing the following warnings: drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_start_search’: drivers/media/dvb/frontends/stv090x.c:1486:27: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’ drivers/media/dvb/frontends/stv090x.c:1487:24: warning: comparison between ‘enum stv090x_search’ and ‘enum stv090x_delsys’ drivers/media/dvb/frontends/stv090x.c: In function ‘stv090x_optimize_track’: drivers/media/dvb/frontends/stv090x.c:2943:2: warning: case value ‘4’ not in enumerated type ‘enum stv090x_delsys’ The first two are due to the lack of using the delsys types STV090x_DVBS1/STV090x_DSS instead of STV090x_SEARCH_DVBS1/STV090x_SEARCH_DSS The second one is due to the usage of STV090x_UNKNOWN (enum stv090x_modulation) instead of STV090x_ERROR (enum stv090x_delsys). Cc: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 95f18be2e4f74255b46fcc23a9718cca9c7375c9 Author: Mauro Carvalho Chehab Date: Mon Dec 27 12:00:03 2010 -0300 [media] gspca: Fix a warning for using len before filling it The check for status errors is now before the check for len. That's ok. However, the error printk's for the status error prints the URB length. This generates this error: drivers/media/video/gspca/gspca.c: In function ‘fill_frame’: drivers/media/video/gspca/gspca.c:305:9: warning: ‘len’ may be used uninitialized in this function The fix is as simple as moving the len init to happen before the checks. Cc: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 2e94b53c55d00b4d4d4b9e65007566f7fbffab7a Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:55:07 2010 -0300 [media] dib7000m/dib7000p: Add support for TRANSMISSION_MODE_4K Fixes several warnings: drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_set_channel’: drivers/media/dvb/frontends/dib7000m.c:808:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:869:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c: In function ‘dib7000m_tune’: drivers/media/dvb/frontends/dib7000m.c:1023:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:1033:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000m.c:1043:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_set_channel’: drivers/media/dvb/frontends/dib7000p.c:720:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:773:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c: In function ‘dib7000p_tune’: drivers/media/dvb/frontends/dib7000p.c:997:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:1007:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ drivers/media/dvb/frontends/dib7000p.c:1017:3: warning: case value ‘255’ not in enumerated type ‘fe_transmit_mode_t’ The drivers were prepared to support 4K carriers, but as the define were added later, they were using a "magic" value of 255. Cc: Patrick Boettcher Signed-off-by: Mauro Carvalho Chehab commit d78aa7292ad38b22ccb9cdba99293cedb52fb342 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:47:17 2010 -0300 [media] lirc_zilog: Fix a warning drivers/staging/lirc/lirc_zilog.c: In function ‘send_code’: drivers/staging/lirc/lirc_zilog.c:886:1: warning: label ‘done’ defined but not used Signed-off-by: Mauro Carvalho Chehab commit fce50ac80e38b1d205939ff7d4777536701263a6 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:44:50 2010 -0300 [media] radio-wl1273: Fix two warnings drivers/media/radio/radio-wl1273.c: In function ‘wl1273_fm_upload_firmware_patch’: drivers/media/radio/radio-wl1273.c:675:2: warning: ‘n’ may be used uninitialized in this function drivers/media/radio/radio-wl1273.c:675:2: warning: ‘i’ may be used uninitialized in this function Those vars are never initialized, and the debug message makes no sense, as it will show just two random values. Cc: Matti J. Aaltonen Signed-off-by: Mauro Carvalho Chehab commit 9ae2ae35f8a8a13997b9ec719ae7c151a2182e80 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:41:14 2010 -0300 [media] dmxdev: Fix a compilation warning due to a bad type drivers/media/dvb/dvb-core/dmxdev.c: In function ‘dvb_dmxdev_start_feed’: drivers/media/dvb/dvb-core/dmxdev.c:583:13: warning: comparison between ‘enum dmx_ts_pes’ and ‘enum ’ Signed-off-by: Mauro Carvalho Chehab commit 1035758d5bdcd6c2f7308a35185f1d6f3b6b5443 Author: Mauro Carvalho Chehab Date: Mon Dec 27 11:14:52 2010 -0300 [media] feature_removal_schedule.txt: mark VIDIOC_*_OLD ioctls to die There are some old broken definitions of ioctl's, where the read/write arguments were marked wrong. The last one were added on 2.6.6 kernel. Remove them, in order to cleanup some copy_from_user/copy_to_user logic done inside V4L core. Signed-off-by: Mauro Carvalho Chehab commit 0334c8a52a8578f7aef501a14f78004f931efe20 Author: Mauro Carvalho Chehab Date: Mon Dec 27 09:41:05 2010 -0300 [media] staging/lirc: Fix compilation when LIRC=m drivers/staging/lirc/lirc_bt829.c:141: undefined reference to `lirc_register_driver' drivers/built-in.o:(.rodata+0x20f68): undefined reference to `lirc_dev_fop_read' drivers/built-in.o:(.rodata+0x20f7c): undefined reference to `lirc_dev_fop_poll' drivers/built-in.o:(.rodata+0x20f8c): undefined reference to `lirc_dev_fop_open' drivers/built-in.o:(.rodata+0x20f94): undefined reference to `lirc_dev_fop_close' drivers/built-in.o:(.rodata+0x21030): undefined reference to `lirc_dev_fop_open' drivers/built-in.o:(.rodata+0x21038): undefined reference to `lirc_dev_fop_close' This happens when .config is like: CONFIG_LIRC=m CONFIG_IR_LIRC_CODEC=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=y Don't allow that. Signed-off-by: Mauro Carvalho Chehab commit 22efe507705a8437255114f98d0d514524460be0 Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:30:34 2010 -0300 [media] omap_vout: Remove an obsolete comment This comment mentions a field that doesn't exist, and talks about videodev.h that got removed. So, it doesn't make any sense to keep it. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 55fe25b418640fad04190103274841b2c907bacd Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:27:05 2010 -0300 [media] Remove the old V4L1 v4lgrab.c file This example file uses the old V4L1 API. It also doesn't use libv4l. So, it is completely obsolete. A good example already exists at v4l-utils (v4l2grab.c): http://git.linuxtv.org/v4l-utils.git Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1fb03673b9eddb55a08174d0952c0a1c2438997e Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:24:58 2010 -0300 [media] Fix videodev.h references at the V4L DocBook Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 38af87869e7a255b6ba0f41bf53d2e7b0a54d13b Author: Mauro Carvalho Chehab Date: Mon Dec 27 08:13:12 2010 -0300 [media] Documentation/ioctl/ioctl-number.txt: Remove some now freed ioctl ranges The V4L1 removal patches removed a few ioctls. Update it at the docspace. Signed-off-by: Mauro Carvalho Chehab commit 88ae7624a6fe890e5a8ca57b25420f66e1389f8b Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:47:54 2010 -0300 [media] V4L1 removal: Remove linux/videodev.h There's no sense on keeping it on 2.6.38, as nobody is using it anymore, at the kernel tree, and installing it at the userspace API. As two deprecated drivers still need it, move it to their internal directories. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 58c66df3e38ffb1d59cc5162bb9e07c859288034 Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:38:48 2010 -0300 [media] Remove VIDEO_V4L1 Kconfig option There's no sense on keeping VIDEO_V4L1 Kconfig option just because of two deprecated drivers moved to staging scheduled to die on 2.6.39. Reviewed-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f74e3d0eea5fd766230a0ef0d1c24a7960d6f8c2 Author: Mauro Carvalho Chehab Date: Mon Dec 27 07:33:41 2010 -0300 [media] staging: Add TODO files for se401 and usbvideo/vicam Signed-off-by: Mauro Carvalho Chehab commit ddda424999817fbc17adf9013feb066903382ede Author: Andy Walls Date: Sun Dec 19 21:59:56 2010 -0300 [media] ivtv: Return EFAULT when copy_from_user() fails in ivtv_write_vbi_from_user() If write() on a VBI device node fails due to a bad buffer pointer from userspace, we should notify the application properly with EFAULT, per the V4L2 API spec. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit b0c45686c8e8aecc7b0cd04d9b6af48d74418d53 Author: Andy Walls Date: Sat Dec 18 10:48:17 2010 -0300 [media] ivtv: ivtv_write_vbi() should use copy_from_user() for user data buffers ivtv_write_vbi() is used for both VBI data that came from the driver internally and VBI data that came from the user. However, it did not use copy_from_user() for reading the VBI data from the user buffers. This change adds a new version of the function, ivtv_write_vbi_from_user(), that uses copy_from_user() to read the VBI data provided via user buffers. This should resolve a sparse build warning reported by Dave Gilbert. Reported-by: Dr. David Alan Gilbert Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 754f9969c323559a12bce1475f3c1e6574129856 Author: Andy Walls Date: Sat Dec 11 20:38:20 2010 -0300 [media] cx18: Only allocate a struct cx18_dvb for the DVB TS stream The cx18_stream struct contained a struct cx18_dvb for every stream object, most of which were for analog capture. Now we only allocate the cx18_dvb object for the DTV TS stream. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit fa98447f09641adeeaf02b94133649f03b74d159 Author: Andy Walls Date: Sat Dec 11 12:31:45 2010 -0300 [media] ivtv, cx18: Make ioremap failure messages more useful for users The error messages these drivers emitted for ioremap() failures were misleading and not helpful for users. Reworded those messages to help the user take action to resolve vmalloc address space exhaustion. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 0a58d713062fb49952b9b082514a48a0c83b269d Author: Hans Verkuil Date: Sat Dec 25 08:01:38 2010 -0300 [media] stk-webcam: remove V4L1 compatibility code, replace with V4L2 controls Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 439105b122dfa21fbce7201d0f30b5eeac95c918 Author: Hans Verkuil Date: Sat Dec 25 07:46:56 2010 -0300 [media] feature-removal: update V4L1 removal status While the V4L1 compatibility module has been removed, we still have two V4L1 drivers that prevent full V4L1 removal. Those drivers have been moved to staging and will be removed in 2.6.39, together with the last V4L1 support. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 39c3d488452ae206cfc8afda0db041ee55d01c3c Author: Hans Verkuil Date: Sat Dec 25 07:44:33 2010 -0300 [media] cpia, stradis: remove deprecated V4L1 drivers Nobody stepped in to convert these drivers to V4L2, so they are now removed from the kernel. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 71bb2876a3b2af8e6fd5ac20921ee0de9e07d809 Author: Hans Verkuil Date: Sat Dec 25 07:36:55 2010 -0300 [media] se401: deprecate driver, move to staging The se401 driver is deprecated and is moved to staging. If no one will convert this driver to V4L2, then it will be removed in 2.6.39. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 745da4280f272840976d47afba22ed853f07e1b2 Author: Hans Verkuil Date: Sat Dec 25 07:27:47 2010 -0300 [media] usbvideo: deprecate the vicam driver Move usbvideo to staging and mark it deprecated. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 5772dcaa790851ec068afcd0d1f160d801b1126e Author: Hans Verkuil Date: Sat Dec 25 07:20:34 2010 -0300 [media] usbvideo: remove deprecated drivers Remove ibmcam, konicawc and ultracam drivers. There are replaced by gspca drivers. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e4ea644d3e59436f12e43df5d17fdf4fcf7c5fa7 Author: Hans Verkuil Date: Sat Dec 25 07:15:22 2010 -0300 [media] documentation: update some files to reflect the V4L1 compat removal Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 41d9931c5ae014fbab8bf612c70b8e7ff16f4641 Author: Hans Verkuil Date: Sat Dec 25 07:04:16 2010 -0300 [media] videobuf-dma-sg: remove obsolete comments Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ad1ecf8639e51ab8066cd4f37fd36b6b7cbdd8b3 Author: Hans Verkuil Date: Sat Dec 25 06:58:01 2010 -0300 [media] zoran: remove V4L1 compat code and zoran custom ioctls All the functionality is now handled through V4L2. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 08af245de0cf6ab5f4ed008ee2bb99273774fce0 Author: Hans Verkuil Date: Fri Dec 24 10:33:19 2010 -0300 [media] V4L: remove V4L1 compatibility mode Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit b69a219e0e97441dbeb0262cf85468b61a161399 Author: Jean-François Moine Date: Sat Dec 25 14:01:42 2010 -0300 [media] gspca - ov534_9: Remove an useless instruction Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7a5a414ccb5bfc0fe277ef1a0e9d1e492a6f083c Author: Jean-François Moine Date: Sat Dec 25 13:58:45 2010 -0300 [media] gspca - ov519: Bad detection of some ov7670 sensors Tested-by: jim smyth Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 668f44a603dd4b3468cecd7d8d6dc525207db94e Author: Jean-François Moine Date: Sat Dec 25 13:46:14 2010 -0300 [media] gspca: Use the global error status for get/set streamparm Also, in ov534, don't check the parm type. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 76ebc16b87592350e4ea70681855171adf73f055 Author: Jean-François Moine Date: Sat Dec 25 13:22:21 2010 -0300 [media] gspca - main: Check the isoc packet status before its length When an error is set for an isochronous packet, the length of the packet may be null. In this case, the error was not detected and the image was not discarded as it should be. Reported-by: Franck Bourdonnec Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f2c5d92ecd4c69a4f86e76d19cb7663f2ebf4781 Author: Jean-François Moine Date: Sat Dec 25 13:19:59 2010 -0300 [media] gspca - sq930x: Fix a bad comment Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit efd3769269f2ef9a0ad452ea8298b3edcb2f5a62 Author: Jean-François Moine Date: Sat Dec 25 13:11:54 2010 -0300 [media] gspca - sq930x: Some detected sensors are not handled yet These are OmniVision's OV7660 and OV9630. Don't register the webcam when they are found. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 3ebd17946448df50b9082412d09955c87a112721 Author: Jean-François Moine Date: Sat Dec 25 13:07:57 2010 -0300 [media] gspca - sq930x: Don't register a webcam when there are USB errors Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 634b4770539de63581ccdb554426547ced6ded01 Author: Theodore Kilgore Date: Fri Dec 24 17:06:04 2010 -0300 [media] gspca - sq905c: Adds the Lego Bionicle This patch adds the Vendor:Product number of the Lego Bionicle camera to the existing gspca/sq905c.c and also a line for the camera in gspca.txt. The camera works "out of the box" with these small changes. So this is just in time for Christmas. Think of the children. Signed-off-by: Theodore Kilgore Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a19a5cd7b328ae457f79092e711d4bd888e1ca50 Author: Pete Eberlein Date: Mon Dec 20 19:18:59 2010 -0300 [media] s2255drv: remove BKL Remove BKL ioctl and use unlocked_ioctl with core-assisted locking instead. Signed-off-by: Pete Eberlein Signed-off-by: Mauro Carvalho Chehab commit 07e80305babb27a332ce0f04a3c38ce495cbe711 Author: Marek Szyprowski Date: Mon Dec 20 14:39:25 2010 -0300 [media] v4l: mem2mem_testdev: remove BKL usage Remove usage of BKL by usign per-device mutex. Signed-off-by: Marek Szyprowski CC: Pawel Osciak Signed-off-by: Mauro Carvalho Chehab commit dcd745b723efc875ec5a8f44be028bd0704b12d6 Author: Dan Carpenter Date: Mon Dec 20 09:53:16 2010 -0300 [media] timblogiw: too large value for strncpy() This is a copy and paste error. It should be using sizeof(cap->driver) instead of sizeof(cap->card). Signed-off-by: Dan Carpenter Cc: Richard Rojförs Signed-off-by: Mauro Carvalho Chehab commit ef330dc2e794c932fcbde3f8abd3f12780d78b47 Author: Jesper Juhl Date: Sat Dec 18 19:05:02 2010 -0300 [media] saa7164: Remove pointless conditional and save a few bytes in saa7164_downloadfirmware() Hi, release_firmware() just does nothing if passed a NULL pointer. So there's no reason to test before the call in saa7164-fw.c::saa7164_downloadfirmware(). Removing the pointless conditional also saves a few bytes. before: text data bss dec hex filename 7943 112 2144 10199 27d7 drivers/media/video/saa7164/saa7164-fw.o after: text data bss dec hex filename 7931 112 2136 10179 27c3 drivers/media/video/saa7164/saa7164-fw.o Signed-off-by: Jesper Juhl Cc: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 10304ca65f8871ad9f6725a7480522034184f55f Author: Sam Doshi Date: Sat Dec 18 12:58:54 2010 -0300 [media] drivers:media:dvb: add USB PIDs for Elgato EyeTV Sat Adds USB PIDs for the Elgato EyeTV Sat device. This device is a clone of the Terratec S7. Signed-off-by: Sam Doshi Signed-off-by: Mauro Carvalho Chehab commit c3353330508aee4390442df2d7f6ce0ef5006185 Author: Anatolij Gustschin Date: Fri Dec 17 06:40:50 2010 -0300 [media] media: fsl-viu: fix support for streaming with mmap method Streaming using mmap didn't work in the VIU driver. We need to start/stop DMA in streamon/streamoff and free the buffers on release. Add appropriate driver extension now. Signed-off-by: Anatolij Gustschin Signed-off-by: Mauro Carvalho Chehab commit 2a72b39e516bf772e707d5a080d5d07b1c8ac0c0 Author: Dan Carpenter Date: Fri Dec 10 09:39:34 2010 -0300 [media] zoran: bit-wise vs logical and zr->frame_num is a counter and && was intended here instead of &. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 75aecc3af22ae9063c96457d530f281a1e2d3276 Author: Malcolm Priestley Date: Tue Dec 7 19:49:24 2010 -0300 [media] DM04/QQBOX Frontend attach change On Fri, 2010-12-03 at 09:32 -0200, Mauro Carvalho Chehab wrote: > Em 27-11-2010 11:13, Malcolm Priestley escreveu: > > Driver Version v1.73 - Frontend attach change. > > To stop double rc registration in multi tuner environment or firmware change. > > > > Signed-off-by: Malcolm Priestley > > > > > > +static int lme_name(struct dvb_usb_adapter *adap) > > +{ > > + struct lme2510_state *st = adap->dev->priv; > > + const char *desc = adap->dev->desc->name; > > + char *fe_name[] = {"", " LG TDQY-P001F", " SHARP:BS2F7HZ7395"}; > > + char *name = adap->fe->ops.info.name; > > + > > + strcpy(name, desc); > > + strcat(name, fe_name[st->tuner_config]); > > Please use, instead, strlcpy/strlcat, to avoid writing outside the buffer size. > Driver Version v1.74 Amended patch with change to strlcpy/strlcat. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit c59a9bfabfc2a6359f046652c6bfa0a82fb17a05 Author: Randy Dunlap Date: Tue Dec 7 15:50:09 2010 -0300 [media] media: fix em28xx build, needs hardirq.h Fix em28xx build by adding hardirq.h header file: drivers/media/video/em28xx/em28xx-vbi.c:49: error: implicit declaration of function 'in_interrupt' Reported-by: Zimny Lech Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 4c8b8698053c986f5f5249878eab70cb028a1023 Author: Vasiliy Kulikov Date: Fri Nov 26 14:06:35 2010 -0300 [media] rc: ir-lirc-codec: fix potential integer overflow 'n' may be bigger than MAX_INT*sizeof(int), if so checking of truncated (int)(n/sizeof(int)) for LIRCBUF_SIZE overflow and then using nontruncated 'count' doesn't make sense. Also n may be up to sizeof(int)-1 bytes bigger than expected, so check value of (n % sizeof(int)) too. Signed-off-by: Vasiliy Kulikov Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 87d1a50ce45168cbaec10397e876286a398052c1 Author: Matti Aaltonen Date: Fri Dec 10 11:41:34 2010 -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 383268a8e282fb549dabe3a33ccafc9434ab6006 Author: Matti Aaltonen Date: Fri Dec 10 11:41:33 2010 -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 00765f16f116b45aa67de306ac923ed4ba262bf9 Author: Hans de Goede Date: Sun Dec 12 15:55:03 2010 -0300 [media] gspca_sonixb: Add support for 0c45:602a Add support for cameras with the HV7131D sensor, such as the 0c45:602a Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2b3e284a89dfa53eb42b6470e4c03e5ddfdb24c5 Author: Hans de Goede Date: Sun Dec 12 08:55:04 2010 -0300 [media] gspca_sonixb: Rewrite start of frame detection Our old start of frame detection code wrongly assumes that the sof marker always lives at the beginning of the frame. At least for the 0c45:602a camera this is not the case. This patch also improves the framerate from 28 fps to 30 fps with the 0c45:6005 and 0c45:6007 Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit d6746d55da0819edbe913a1447b1ab0e7b440241 Author: Hans de Goede Date: Fri Dec 10 12:28:15 2010 -0300 [media] gspca_sonixb: Make sonixb handle 0c45:6007 instead of sn9c102 I've a 0c45:6007 camera and it works fine with the gspca_sonixb driver, so make that handle it instead of the deprecated sn9c102 driver. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 788e5d4dc825ffc2eb863272d9a57fb93490dd92 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:47:27 2010 -0300 [media] cx231xx: Fix IR keymap for Pixelview SBTVD Hybrid Signed-off-by: Mauro Carvalho Chehab commit 12007419b766b316998499bd07c6586928230729 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:39:29 2010 -0300 [media] Add a keymap for Pixelview 002-T remote Signed-off-by: Mauro Carvalho Chehab commit e330289ed40f76819d6a13e682203c6fc9a86304 Author: Mauro Carvalho Chehab Date: Fri Dec 17 14:22:09 2010 -0300 [media] cx231xx: Fix inverted bits for RC on PV Hybrid At Pixelview SBTVD Hybrid, the bits sent by the IR are inverted. Due to that, the existing keytables produce wrong codes. Signed-off-by: Mauro Carvalho Chehab commit 49aefd2bcda80d33497f0f26702c67e372cacef3 Author: Stephen Rothwell Date: Mon Nov 22 23:35:17 2010 -0300 [media] timblogiw: const and __devinitdata do not mix This fixes the following error in PowerPC builds: drivers/media/video/timblogiw.c: In function 'timblogiw_probe': drivers/media/video/timblogiw.c:749: error: timblogiw_ioctl_ops causes a section type conflict Signed-off-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab commit d162e7aac24bfd8b96881582368f976e7e464c25 Author: Mauro Carvalho Chehab Date: Tue Dec 7 19:39:33 2010 -0300 [media] gspca/sn9c20x: Fix support for mt9m001 (mi1300) sensor Support for mt9m001 (mi1300) is broken: - Table is incomplete; - Only one resolution is currently supported by the driver; - Resolution is incomplete; - it complains about broken JPEG headers. Use the same init found on em28xx driver, and properly report the output format as 8-bits GRAY. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit d4b416f26279bbbe07faaff1c9cd19d6b3709b2e Author: Mauro Carvalho Chehab Date: Tue Dec 7 17:19:09 2010 -0300 [media] gspca core: Fix regressions gspca breaking devices with audio Changeset 35680ba broke several devices: - Sony Playstation Eye (1415:2000); - Gigaware model 25-234 (0c45:628f); - Logitech Messenger Plus (046d:08f6). Probably more devices were broken by this change. What happens is that several devices don't need to save some bandwidth for audio. Also, as pointed by Hans de Goede , the logic that implements the bandwidth reservation for audio is broken, since it will reduce the alt number twice, on devices with audio. So, let's just revert the broken logic, and think on a better solution for usb 1.1 devices with audio that can't use the maximum packetsize. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit 86701c1d6a3ecae2f0e6771c730364d334d5a142 Author: Mauro Carvalho Chehab Date: Tue Dec 7 14:47:10 2010 -0300 [media] gspca/sn9c20x: Get rid of scale "magic" numbers Use macros for the supported scales, instead of using magic numbers from 0 to 3. Code become cleaner by using macros for it. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit e78567d227ecd40543508342ba39a3dfba5af14f Author: Mauro Carvalho Chehab Date: Mon Dec 6 06:53:05 2010 -0300 [media] gspca/sn9c20x: Test if sensor is a OV sensor Instead of just assuming a ov9650 sensor based on USB ID, double-check it, by reading the sensor ID. Acked-by: Jean-Francois Moine Signed-off-by: Mauro Carvalho Chehab commit dd89aec47325a251eeaf39ee4b84adb521270cba Author: Richard Zidlicky Date: Wed Dec 1 20:52:49 2010 -0300 [media] keycodes for DSR-0112 remote bundled with Haupauge MiniStick Add kycodes for DSR-0112 remote that comes together with Haupauge MiniStick http://lirc.sourceforge.net/remotes/hauppauge/DSR-0112.jpg [mchehab@redhat.com: Fix KEY_PREVIOUS to match the definition for the other model] Signed-off-by: Richard Zidlicky Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 8350e1551c27ee784ded579fd224846972d4b0d3 Author: Joe Perches Date: Tue Nov 30 18:42:07 2010 -0300 [media] media: Remove unnecessary casts of usb_get_intfdata Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 9124544320bd36d5aa21769d17a5781ba729aebf Author: Philippe Bourdin Date: Sun Oct 31 09:57:58 2010 -0300 [media] Terratec Cinergy Hybrid T USB XS I found that the problems people have reported with the USB-TV-stick "Terratec Cinergy Hybrid T USB XS" (USB-ID: 0ccd:0042) are coming from a wrong header file in the v4l-sources. Attached is a diff, which fixes the problem (tested successfully here). Obviously the USB-ID has been associated with a wrong chip: EM2880 instead of EM2882, which would be correct. Reported-by: Philippe Bourdin Signed-off-by: Mauro Carvalho Chehab commit b395cbac36e58a55729fe7e6262a3f0b1691bced Author: Vasiliy Kulikov Date: Fri Nov 26 14:06:41 2010 -0300 [media] media: rc: lirc_dev: check kobject_set_name() result kobject_set_name() may fail with -ENOMEM, check for it. Signed-off-by: Vasiliy Kulikov Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 801c73c04ad57689dc9b47baf62cbb23f954d987 Author: David Härdeman Date: Thu Nov 25 18:36:27 2010 -0300 [media] rc-core: add loopback driver This patch adds a loopback driver to rc-core which I've found useful for running scripted tests of different parts of rc-core without having to fiddle with real hardware. Basically it emulates hardware with a learning and a non-learning receiver and two transmitters (which correspond to the two receivers). TX data that is sent is fed back as input on the corresponding receiver, which allows for debugging of IR decoders, keymaps, etc. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit dea8a39fb569c23084c857ccdbf70a95ea3bf7dc Author: Mauro Carvalho Chehab Date: Mon Nov 29 07:46:13 2010 -0300 [media] rc-core: Initialize return value to zero At ir_setkeycode, if INPUT_KEYMAP_BY_INDEX is used, the routine may return an invalid value if not error. Signed-off-by: Mauro Carvalho Chehab commit b7c7a4bed8d695933ae172031556de9de30ae598 Author: Mauro Carvalho Chehab Date: Sun Nov 28 11:48:26 2010 -0300 [media] bttv: remove custom_irq and gpioq from bttv struct The RC5 old decoder used custom_irq to indicate the need of handling the IRQ on a different way. Instead of doing it, let the core just call the bttv input IRQ handler, and add the code there to call the legacy decoder. While here, remove the gpioq waitqueue, as this is not used anywhere, and add a debug msg to help removing the legacy RC5 code. Signed-off-by: Mauro Carvalho Chehab commit 5ae094cea1b4f3715ee6ea4f49d0b36d564f90e7 Author: Dan Carpenter Date: Thu Nov 18 00:56:37 2010 -0300 [media] cx231xx: stray unlock on error path The lock isn't held here and doesn't need to be unlocked. The code has been like this since the driver was merged. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 5ad1a55542dd69d2c6aa7db5ca79073d693bbfed Author: Paul Bender Date: Wed Nov 17 16:56:17 2010 -0300 [media] rc: fix sysfs entry for mceusb and streamzap When trying to create persistent device names for mceusb and streamzap devices, I noticed that their respective drivers are not creating the rc device as a child of the USB device. Rather it creates it as virtual device. As a result, udev cannot use the USB device information to create persistent device names for event and lirc devices associated with the rc device. Not having persistent device names makes it more difficult to make use of the devices in userspace as their names can change. Forward-ported to media_tree staging/for_v2.6.38 and tested with both streamzap and mceusb devices: $ ll /dev/input/by-id/ ... lrwxrwxrwx. 1 root root 9 Nov 17 17:06 usb-Streamzap__Inc._Streamzap_Remote_Control-event-if00 -> ../event6 lrwxrwxrwx. 1 root root 9 Nov 17 17:05 usb-Topseed_Technology_Corp._eHome_Infrared_Transceiver_TS000BzY-event-if00 -> ../event5 Previously, nada. Signed-off-by: Paul Bender Tested-by: Jarod Wilson Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 5df465df7bd9c352289ca63d4d9f78299be72c7d Author: Nicolas Kaiser Date: Fri Nov 19 17:42:40 2010 -0300 [media] drivers/media: nuvoton: fix chip id probe v2 Make sure we have a matching chip id high and one or the other of the chip id low values. Print the values if the probe fails. Signed-off-by: Nicolas Kaiser Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit ecfc95eb7410c04c23f59b02931e8f8b3aa4a5b3 Author: Joe Perches Date: Mon Nov 15 17:13:54 2010 -0300 [media] ngene-core.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit b1dc614a81258eb7ff482892e7bc894f1089c144 Author: Joe Perches Date: Mon Nov 15 00:04:28 2010 -0300 [media] drivers/media/video: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit a363436396ad68509db4513c886055cc067a184c Author: Alexey Chernov <4ernov@gmail.com> Date: Thu Oct 28 18:12:02 2010 -0300 [media] Patch for cx18 module with added support of GoTView PCI DVD3 Hybrid tuner I've got code which adds support of GoTView PCI DVD3 Hybrid tuner in cx18 module and Andy Walls in ivtv mailing-list gave me some advice on making a patch and sending it here. So here's the patch against staging/2.6.37-rc1 branch (the tutorial recommends to include it as plain text but if it's the case I can surely send as an attachment): Several comments on the patch: 1. Both users on the official Gotview forum and support said that PCI DVD3 is very similar to Yuan MPC718 card so the main part of code is taken from Yuan configuration. Some users reported it to work properly. 2. Everything is being initialized correctly including analog, dvb, radio and alsa parts. Analogue part and alsa virtual card is tested by myself using original Gotview card. [mchehab@redhat.com: Whitespace cleanups] Signed-off-by: Alexey Chernov <4ernov@gmail.com> Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 97108cf682566a79ad49f165435bddbb91844d9a Author: Mauro Carvalho Chehab Date: Mon Nov 22 15:50:51 2010 -0300 [media] Fix parameter description for disable_ir It seems that a wrong cut-and-paste error were done here. Reported-by: Jeremy Kerr Signed-off-by: Mauro Carvalho Chehab commit eac8ae087ac66b21de94fee3e920210b43d43076 Author: Mariusz Białończyk Date: Mon Nov 15 15:50:13 2010 -0300 [media] Fix rc-tbs-nec table after converting the cx88 driver to ir-core The patch fixes the rc-tbs-nec table after converting drivers/media/video/cx88 to ir-core (commit ba7e90c9f878e0ac3c0614a5446fe5c62ccc33ec). It is also adds two missing buttons (10- and 10+) with its definition (KEY_10CHANNELSUP and KEY_10CHANNELSDOWN). [mchehab@redhat.com: move keycode numbers to 0x1b8/0x1b9 as requested by the input Maintainer] Signed-off-by: Mariusz Białończyk Signed-off-by: Mauro Carvalho Chehab commit 0e835087dfe7db19f1f072046f5e116d4ec6662b Author: Dan Carpenter Date: Wed Nov 17 02:13:39 2010 -0300 [media] lirc_dev: add some __user annotations Sparse complains because there are no __user annotations. drivers/media/rc/lirc_dev.c:156:27: warning: incorrect type in initializer (incompatible argument 2 (different address spaces)) drivers/media/rc/lirc_dev.c:156:27: expected int ( *read )( ... ) drivers/media/rc/lirc_dev.c:156:27: got int ( extern [toplevel] * )( ... ) Signed-off-by: Dan Carpenter Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 829ba9fe34246f1f5e813b6bf84171d36e776734 Author: David Härdeman Date: Fri Nov 19 20:43:27 2010 -0300 [media] rc-core: fix some leftovers from the renaming patches Fix some minor comments etc which are leftover from the old naming scheme. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 3938e0cfeb812e7b66f4e1cb6e34eb2e6864c6a2 Author: David Härdeman Date: Fri Nov 19 20:43:17 2010 -0300 [media] bttv: merge ir decoding timers Similarly to saa7134, bttv_ir has two timers, only one of which is used at a time and which serve the same purpose. Merge them. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit edb4c25ca3a7997660500692eca3510eac9726e5 Author: David Härdeman Date: Fri Nov 19 20:43:12 2010 -0300 [media] bttv: rename struct card_ir to bttv_ir bttv_ir is more consistent with all other structs used in the same driver. Also, clean up the struct to remove commented out members and the work_struct which is unused. [mchehab@redhat.com: fix a warning at bttv_rc5_timer_end] Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 7c8352d18ddbe37cff8ad71175a11739662ef899 Author: David Härdeman Date: Fri Nov 19 20:42:57 2010 -0300 [media] saa7134: merge saa7134_card_ir->timer and saa7134_card_ir->timer_end Both timers are used for a similar purpose. Merging them allows for some minor simplifications. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 651c7a5f7f2f7277f8fc4fb38e89c79845ec9bf9 Author: David Härdeman Date: Fri Nov 19 20:42:51 2010 -0300 [media] saa7134: some minor cleanups Mostly using appropriate data types and constants (e.g. int -> bool). Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit b0ddb0f364f926785f50a8cea8a399ba63e3c227 Author: David Härdeman Date: Fri Nov 19 20:42:46 2010 -0300 [media] saa7134: use full keycode for BeholdTV Using the full keycode for BeholdTV hardware makes another module parameter unnecessary. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit a29df8579ab2779605b181a38ac7fb99796666df Author: David Härdeman Date: Fri Nov 19 20:42:41 2010 -0300 [media] saa7134: remove unused module parameter ir_rc5_remote_gap is a leftover from ir-common, remove it. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit 622d9f5d302e99dc7a06cb442e9d9ff2bb0f59b5 Author: Hans de Goede Date: Tue Nov 16 12:32:09 2010 -0300 [media] pwc: failure to submit an urb is a fatal error Failure to submit an urb is a fatal error, make isoc_init return an error when this happens rather then only log it. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit c7d18867c82657a97f0bdb90ba1151b251b6a29b Author: Hans de Goede Date: Tue Nov 16 12:26:00 2010 -0300 [media] pwc: Also set alt setting to alt0 when no error occured isoc_cleanup contains a check to not set the altsetting to alt0 when the device was unplugged, but the check currently is buggy, and causes the alt setting to only be set to 0 if an error occured while streaming. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 3751e288bcf3d77652ef979edc0b3ea8b21d8b97 Author: Hans de Goede Date: Tue Nov 16 11:39:25 2010 -0300 [media] pwc: do not start isoc stream on /dev/video open pwc was starting streaming on /dev/video# open rather then on STREAM_ON. Now that the v4l1 compat code is removed from the pwc driver there is no reason left to do this. So this patch changes the pwc driver to delay starting the isoc stream (and thus using valuable usb bandwidth) until the application does a STREAM_ON Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit a931910d3be6f63464befb2dde94ec58a6eaf5c1 Author: Mauro Carvalho Chehab Date: Mon Nov 22 13:22:37 2010 -0300 [media] stb6100: warning cleanup drivers/media/dvb/frontends/stb6100.c:120: warning: ‘stb6100_normalise_regs’ defined but not used Signed-off-by: Mauro Carvalho Chehab commit 03c9a806e30c3904e5b5702874eebc1a4f2082bd Author: Mauro Carvalho Chehab Date: Wed Nov 17 16:05:05 2010 -0300 [media] rc: Rename IR raw interface to ir-raw.c Signed-off-by: Mauro Carvalho Chehab commit d100e659b61a735c3343b3d82c1c009b04072cdd Author: Mauro Carvalho Chehab Date: Wed Nov 17 15:56:53 2010 -0300 [media] rc: use rc_map_ prefix for all rc map tables Signed-off-by: Mauro Carvalho Chehab commit 2f4f58d689dd71dea67407b74405a3c43e797cb1 Author: Mauro Carvalho Chehab Date: Wed Nov 17 15:46:09 2010 -0300 [media] rc: Name RC keymap tables as rc_map_table Remote keytables had different names all over the place. Part of the fault is due to a bad naming when rc subsystem was created, but there were lots of old names that were still here. Use a common standard for everything. Patch generated by this script: for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode,rc_map_table,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_codes_,rc_map_,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_key_map,rc_map_table,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_map_table_size,rc_map_size,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab commit b088ba658b3438056dab4d744701364db3f08b9a Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:28:27 2010 -0300 [media] rc: Properly name the rc_map struct The struct that describes a rc mapping had an weird and long name. We should properly name it, to make easier for developers to work with it, and to avoid confusion. Basically, generated by this script: for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_scancode_table,rc_map,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,rc_tab,rc_map,g <$i >a && mv a $i; done (and manually fixed where needed) Signed-off-by: Mauro Carvalho Chehab commit 52b661449aecc47e652a164c0d8078b31e10aca0 Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:20:52 2010 -0300 [media] rc: Rename remote controller type to rc_type instead of ir_type for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,IR_TYPE,RC_TYPE,g <$i >a && mv a $i; done for i in `find drivers/staging -type f -name *.[ch]` `find include/media -type f -name *.[ch]` `find drivers/media -type f -name *.[ch]`; do sed s,ir_type,rc_type,g <$i >a && mv a $i; done Signed-off-by: Mauro Carvalho Chehab commit 29e3ec19d5c88d534ced219d3962d67243e4d310 Author: Mauro Carvalho Chehab Date: Wed Nov 17 14:12:46 2010 -0300 [media] cx231xx: Properly name rc_map name rc_map is confusing, as it may be understood as another thing. Properly rename the field to indicate its usage. Signed-off-by: Mauro Carvalho Chehab commit ca86674b8a93ea11c4bb6f4dd0113b1adf1fa841 Author: Mauro Carvalho Chehab Date: Wed Nov 17 13:53:11 2010 -0300 [media] Rename all public generic RC functions from ir_ to rc_ Those functions are not InfraRed specific. So, rename them to properly reflect it. Signed-off-by: Mauro Carvalho Chehab commit 6bda96447cef24fbf97a798b1ea664224d5fdc25 Author: Mauro Carvalho Chehab Date: Wed Nov 17 13:28:38 2010 -0300 [media] rc: rename the remaining things to rc_core The Remote Controller subsystem is meant to be used not only by Infra Red but also for similar types of Remote Controllers. The core is not specific to Infra Red. As such, rename: - ir-core.h to rc-core.h - IR_CORE to RC_CORE - namespace inside rc-core.c/rc-core.h To be consistent with the other changes. No functional change on this patch. Signed-off-by: Mauro Carvalho Chehab commit a6e3b81f6198654207c4e972e7ed91931e53e93c Author: Mauro Carvalho Chehab Date: Wed Nov 17 10:05:29 2010 -0300 [media] rc: Remove ir-common.h Signed-off-by: Mauro Carvalho Chehab commit bce8d0fe4af4b3a1e46e66cd6116d6389ad0cc22 Author: Mauro Carvalho Chehab Date: Wed Nov 17 09:58:09 2010 -0300 [media] rc: remove ir-common module Something weird happened with commit 740069e6e043403199dbe2b42256722fb814f6ae. Instead of dong the right thing, it got somehow corrupted and reverted the rc changes. Thanks to David Härdeman for pointing me about the problem. This patch should be merged with 740069e6e04 before sending upstream. Signed-off-by: Mauro Carvalho Chehab commit 1697c8dfba72fd182d670a68dca157f64dd3b1f2 Author: Manu Abraham Date: Sun Nov 14 16:01:47 2010 -0300 [media] stb0899: fix diseqc messages getting lost - Some badly written applications in conjuction with certain SEC devices do send too many messages causing the DiSEqC bus to get congested. As a result, the end devices do get confused and hence do not respond. The issue was found by Julian Scheel. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit f14bfe94e459cb070a489e1786f26d54e9e7b5de Author: Manu Abraham Date: Sun Nov 14 15:52:10 2010 -0300 [media] stb6100: Improve tuner performance - Reduce the amount of white noise present, which causes the demodulator a significant time to acquire a frontend lock on a whole. Frontend shows a large significant improvement in performance. Thanks to Peter Nayler for helping to identify the potential hotspots and fixing them. Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 3037fd14302d635426996fb7f6fcf7cb98dc15b9 Author: Ben Hutchings Date: Sun Nov 14 14:56:00 2010 -0300 [media] Mantis: Rename gpio_set_bits to mantis_gpio_set_bits This function is declared extern and exported, and should not be given a generic name which may conflict with gpiolib in future. Signed-off-by: Ben Hutchings Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit a22407faba57c3624beea1a9fad7cbdcf5a19a1a Author: Bjørn Mork Date: Sun Nov 14 14:24:36 2010 -0300 [media] Mantis: use dvb_attach to avoid double dereferencing on module removal Convert the driver to use the dvb_attach macro to avoid the hard dependency on the frontend drivers. The hard dependecy will result in loading a number of unused frontends, and unwanted automatic dereferencing. This fixes a bug where unloading the mantis driver will derefence any attached frontend twice, which will cause an oops if the same frontend is used by another driver. Signed-off-by: Bjørn Mork Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 9c81496a88b04206d0607b23b298b6529da1fcb0 Author: Marko Ristola Date: Sun Nov 14 14:09:04 2010 -0300 [media] Mantis: append tasklet maintenance for DVB stream delivery After dvb-core has called mantis-fe->stop_feed(dvbdmxfeed) the last time (count to zero), no data should ever be copied with dvb_dmx_swfilter() by a tasklet: the target structure might be in an unusable state. Caller of mantis_fe->stop_feed() assumes that feeding is stopped after stop_feed() has been called, ie. dvb_dmx_swfilter() isn't running, and won't be called. There is a risk that dvb_dmx_swfilter() references freed resources (memory or spinlocks or ???) causing instabilities. Thus tasklet_disable(&mantis->tasklet) must be called inside of mantis-fe->stop_feed(dvbdmxfeed) when necessary. Signed-off-by: Marko Ristola Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit 116d588ea21cf0278a4de1e3272e9c3220a647e7 Author: Manu Abraham Date: Thu Feb 11 04:11:05 2010 -0300 [media] Mantis, hopper: use MODULE_DEVICE_TABLE use the macro to make modules auto-loadable Thanks to Ozan Çağlayan for pointing it out Signed-off-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab commit e6f199f3e7e10112adfa80700ecc00b056b5a62e Author: Wolfram Sang Date: Wed Nov 10 09:28:19 2010 -0300 [media] i2c: Remove obsolete cleanup for clientdata A few new i2c-drivers came into the kernel which clear the clientdata-pointer on exit. This is obsolete meanwhile, so fix it and hope the word will spread. Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit c0ff9f4c24a2571943c0d0991c2cb9ac90dc1915 Author: Wolfram Sang Date: Wed Nov 10 11:14:13 2010 -0300 [media] media: video: do not clear 'driver' from an i2c_client The i2c-core does this already. Reported-by: Jean Delvare Signed-off-by: Wolfram Sang Acked-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit 9a9dcb4a19c29ec01e7d249e3dae2d589af86480 Author: Jesper Juhl Date: Mon Nov 8 20:08:41 2010 -0300 [media] cx231xx-417: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/media/ Signed-off-by: Jesper Juhl Signed-off-by: Mauro Carvalho Chehab commit 9c0147b6941e082f52dcbb9688d0e6e5f359744f Author: Randy Dunlap Date: Wed Nov 24 16:41:09 2010 -0300 [media] timblogiw: fix kconfig & build error timblogiw uses dma() interfaces and it selects TIMB_DMA for that support. However, drivers/dma/ is not built unless CONFIG_DMA_ENGINE is enabled, so select/enable that symbol also. drivers/built-in.o: In function `timblogiw_close': timblogiw.c:(.text+0x4419fe): undefined reference to `dma_release_channel' drivers/built-in.o: In function `buffer_release': timblogiw.c:(.text+0x441a8d): undefined reference to `dma_sync_wait' drivers/built-in.o: In function `timblogiw_open': timblogiw.c:(.text+0x44212b): undefined reference to `__dma_request_channel' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Mauro Carvalho Chehab commit c091575c8b35b39b8f271e0d4b692329a705240a Author: Richard Röjfors Date: Mon Nov 8 10:45:48 2010 -0300 [media] mfd: Add timberdale video-in driver to timberdale This patch defines platform data for the video-in driver and adds it to all configurations of timberdale. Signed-off-by: Richard Röjfors Acked-by: Samuel Ortiz Signed-off-by: Mauro Carvalho Chehab commit 9eae42e5a216059a146b3fbbe24b4fdc0b10c723 Author: Richard Röjfors Date: Mon Nov 8 10:45:44 2010 -0300 [media] media: Add timberdale video-in driver This patch adds the timberdale video-in driver. The video IP of timberdale delivers the video data via DMA. The driver uses the DMA api to handle DMA transfers, and make use of the V4L2 video buffers to handle buffers against user space. If available the driver uses an encoder to get/set the video standard Signed-off-by: Richard Röjfors Signed-off-by: Mauro Carvalho Chehab commit 36d89f7de4a4937848de86d9b35cb03a9f0357e1 Author: Joe Perches Date: Sun Nov 7 17:48:21 2010 -0300 [media] drivers/staging/cx25821: Use pr_fmt and pr_ Fix several defects with bad line continuation uses that introduce whitespace. Fix several defects with lines missing "\n". Standardize prefixes via pr_fmt. Remove internal cx25821 prefixes. Standardize :%s():" ... __func__ uses. Coalesce long formats. Add KERN_ prefixes via pr_ to printks. Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 13d28e4917fb6cf6898e8998f01ab83b3f468aeb Author: Matthias Schwarzott Date: Sun Nov 7 10:57:13 2010 -0300 [media] IX2505V: i2c transfer error code ignored It seems that ix2505v driver ignores a i2c error in ix2505v_read_status_reg. This looks like a typing error using (ret = 1) instead of correct (ret == 1). Acked-by: Malcolm Priestley Signed-off-by: Matthias Schwarzott Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab commit 62c7cdd8a16025e4d5596b8e61352960745f3707 Author: Jean Delvare Date: Sun Nov 7 12:54:39 2010 -0300 [media] TM6000: Drop unused macro Signed-off-by: Jean Delvare Cc: Michel Ludwig Cc: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 7bd444ede7285cad4ed5047ff954432325fe7f95 Author: Jean Delvare Date: Sun Nov 7 12:53:44 2010 -0300 [media] TM6000: Clean-up i2c initialization Usage of templates for large structures is a bad idea, as it wastes a lot of space. Manually initializing the few fields we need is way more efficient. Also set the algorithm data const, use strlcpy instead of strcpy, fix a small race (device data must always be set before registering said device) and properly return error on adapter registration failure. Signed-off-by: Jean Delvare Cc: Michel Ludwig Cc: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 8ea43d0a2f87b8460f46ddb7b42b5eb17c5385d2 Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:49:10 2010 -0300 [media] rc: Remove ir-common module Now, just one old bttv board uses the old RC5 raw decoding routines. Its conversion to rc-core requires the generation of IRQ data for both positive and negative transitions at the IRQ line. I'm not sure if bttv driver supports it or if the transitions will be reliable enough. So, due to the lack of hardware for testing, the better for now is to just move the legacy routines to bttv driver, and wait for someone with a Nebula Digi could help to port it to use also rc-core raw decoders. Acked-by: Hermann Pitton Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 6c7e653ff668d939174aa7023736f4a40fd2be08 Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:19:54 2010 -0300 [media] saa7134: Remove legacy IR decoding logic inside the module The only IR left still using the old raw decoders on saa7134 is ENCORE FM 5.3. As it is now using the standard rc-core raw decoders, lots of old code can be removed from saa7134. Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 70de39183a8b5ba0a0cd884ff46c1d81dbe939db Author: Mauro Carvalho Chehab Date: Sat Nov 13 16:23:06 2010 -0300 [media] saa7134: use rc-core raw decoders for Encore FM 5.3 Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit c1937f8e3490fedec2c75383df07cd8a7154c545 Author: Stefan Ringel Date: Tue Nov 9 13:50:28 2010 -0300 [media] tm6000: add revision check adding chip revision check Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 101b25b55ec48354bc40b9102b4f7922c9ad9eae Author: Joe Perches Date: Fri Nov 5 00:07:39 2010 -0300 [media] drivers/media: Use vzalloc Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 42e142f6b72493b5daec9950c4c83d20ccf56a0d Author: Jean-François Moine Date: Sat Nov 13 05:10:27 2010 -0300 [media] gspca - ov519: New sensor ov7660 with bridge ov530 (ov519) [mchehab@redhat.com: Some CodingStyle fixes] Tested-by: Anca Emanuel Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7491f785dd02bc35551e0463d798959b15644c1d Author: Jean-François Moine Date: Sat Nov 13 03:56:41 2010 -0300 [media] gspca - ov519: Re-initialize the webcam at resume time Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit b4e96ea30a211c0979e9e0ea10f39dfa50afb8fa Author: Jean-François Moine Date: Fri Nov 12 16:13:17 2010 -0300 [media] gspca - ov519: Initialize the ov519 snapshot register Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 5927abcb21d0dd10c960517453e37302acf2269e Author: Jean-François Moine Date: Fri Nov 12 15:32:29 2010 -0300 [media] gspca - ov519: Change the ov519 start and stop sequences - start and stop streaming are done via the FRAR - streaming suspend (for control change) is done by video reset Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a23acec4bca79f2168a5aeacc8d85386b70ae522 Author: Jean-François Moine Date: Fri Nov 12 15:07:35 2010 -0300 [media] gspca - ov519: Simplify the LED control functions Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e2817029b3f139bd85360536153467bd8f7f863b Author: Jean-François Moine Date: Fri Nov 12 13:59:48 2010 -0300 [media] gspca - ov519: Check the disabled controls at start time only Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 858ea5e941fad6a2f38d0c9722bbb842d46662fb Author: Jean-François Moine Date: Fri Nov 12 13:53:10 2010 -0300 [media] gspca - ov519: Clearer debug and error messages Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit f8f20188e863dfb43ac53364da0b8865d37c97e2 Author: Jean-François Moine Date: Fri Nov 12 07:54:02 2010 -0300 [media] gspca - ov519: Propagate errors to higher level Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 83db76886c0b0a32a0c8d35b4dc3dc1d8f1287d4 Author: Jean-François Moine Date: Fri Nov 12 07:14:08 2010 -0300 [media] gspca - ov519: Define the disabled controls in a table Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 218678032589895f29f4ee01b9c330caaab44274 Author: Jean-François Moine Date: Fri Nov 12 06:12:09 2010 -0300 [media] gspca - ov519: Set their numbers in the ov519 and ov7670 register names Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 87bae740fd50df49337017b3ccbed9dbaeaad610 Author: Jean-François Moine Date: Fri Nov 12 05:31:34 2010 -0300 [media] gspca - ov519: Cleanup source - move hexadecimal value to lowercase - remove/add empty lines and spaces - comment unused macros - change some comments Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9be1d6cde936dcf9a325eeee01ed64005c98d456 Author: Nicolas Kaiser Date: Fri Nov 12 04:32:35 2010 -0300 [media] gspca - cpia1: Fix error check It looks to me like it was intended to check the return value at this point. Signed-off-by: Nicolas Kaiser Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 7bbe6b8d1f63c2f7482c93d8cd986b1774e6436d Author: Jean-François Moine Date: Thu Nov 11 08:27:24 2010 -0300 [media] gspca - ov519: Define the sensor types in an enum This patch also checks if the sensor is well detected at connection time. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d6fa66384b38165126ce2866b4bdff756c6fc761 Author: Jean-François Moine Date: Thu Nov 11 08:05:50 2010 -0300 [media] gspca - ov519: Reduce the size of some variables Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 9d1593a84c09e57a9565baab931a6cf116120e05 Author: Jean-François Moine Date: Thu Nov 11 08:04:06 2010 -0300 [media] gspca - ov519: Change types '__xx' to 'xx' Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d65174c06f2bf4ff73d1c71960be317b89561c06 Author: Jean-François Moine Date: Thu Nov 11 06:20:42 2010 -0300 [media] gspca - ov519: Don't do USB exchanges after disconnection Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 14653e64e9db48e91cbd00fba335a6a459e66cc9 Author: Jean-François Moine Date: Thu Nov 11 06:17:01 2010 -0300 [media] gspca - ov519: Handle the snapshot on capture stop when CONFIG_INPUT=m Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit c0b33bdc5b8d9c1120dece660480d4dd86b817ee Author: Hans de Goede Date: Wed Oct 27 09:12:30 2010 -0300 [media] gspca-stv06xx: support bandwidth changing stv06xx devices have only one altsetting, but the actual used bandwidth can be programmed through a register. We were already setting this register lower then the max packetsize of the altsetting indicates. This patch makes the gspca-stv06xx update the usb descriptor for the alt setting to reflect the actual packetsize in use, so that the usb subsystem uses the correct information for scheduling usb transfers. This patch also tries to fallback to lower speeds in case a ENOSPC error is received when submitting urbs, but currently this is only supported with stv06xx cams with the pb0100 sensor, as this is the only one for which we know how to change the framerate. This patch is based on an initial incomplete patch by Lee Jones Signed-off-by: Lee Jones Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit bc25068495b110fcdf35a22f43d32637e99fd018 Author: Steven Toth Date: Fri Nov 12 18:32:36 2010 -0300 [media] saa7164: Checkpatch compliance cleanup Checkpatch compliance cleanup across files in the saa7164 driver. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab commit 0e72cc8b8d48ba05e705f432fb99aaa0ea6737c6 Author: Dan Carpenter Date: Tue Nov 2 00:22:23 2010 -0300 [media] saa7164: make buffer smaller This isn't a runtime bug, it's just to make static checkers happy. In vidioc_querycap() we copy a saa7164_dev ->name driver array into a v4l2_capability -> driver array. The ->driver array is only 16 chars long so ->name also can't be more than 16 characters. The ->name gets set in v4l2_capability() and it always is less than 16 characters so we can easily make the buffer smaller. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 76e4a9a7164263d8ffe816920f84a91e7dfee444 Author: Axel Lin Date: Mon Nov 1 06:25:39 2010 -0300 [media] tea6415c: return -EIO if i2c_check_functionality fails If the adapter does not support I2C_FUNC_SMBUS_WRITE_BYTE, return -EIO instead of 0. Signed-off-by: Axel Lin Acked-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 1ce6a1433572c650247480e1bbbca6bd61db7874 Author: Joe Perches Date: Sat Oct 30 18:08:31 2010 -0300 [media] drivers/media/video: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 9e21ccaa69674e1b0aa887722801258f7de842db Author: VDR User Date: Sat Oct 30 15:49:49 2010 -0300 [media] dvb-usb-gp8psk: get firmware and fpga versions This patch adds retrieval of firmware and FPGA versions of Genpix devices. That information is useful for users who experience performance differences with the various firmware versions, and may want to use a specific firmware that best suits their needs. Example dmesg output: gp8psk: FW Version = 2.09.4 (0x20904) Build 2009/04/02 gp8psk: FPGA Version = 1 Signed-off-by: Derek Kelly Signed-off-by: Mauro Carvalho Chehab commit 141bb0dc2d0ad03202aef7c070555cd970ca6bf9 Author: Mauro Carvalho Chehab Date: Thu Nov 11 08:14:16 2010 -0300 [media] cx231xx: Fix i2c support at cx231xx-input There was a bug at cx231xx-input, where it were registering the remote controls twice, one via ir-kbd-i2c and another directly. Also, the patch that added rc_register_device() broke compilation for it. This patch fixes cx231xx-input by fixing the depends on, to point to the new symbol, and initializing the scanmask via platform_data. While here, also fix Kconfig symbol change for IR core dependencies. Signed-off-by: Mauro Carvalho Chehab commit 2eb258327722de3ed4d84ce1b9add2bad21a0ec4 Author: Mauro Carvalho Chehab Date: Fri Nov 12 09:02:40 2010 -0300 [media] ir-kbd-i2c: add rc_dev as a parameter to the driver There are several fields on rc_dev that drivers can benefit. Allow drivers to pass it as a parameter to the driver. For now, the rc_dev parameter is optional. If drivers don't pass it, create them internally. However, the best is to create rc_dev inside the drivers, in order to fill other fields, like open(), close(), driver_name, etc. So, a latter patch making it mandatory and changing the caller drivers is welcome. Signed-off-by: Mauro Carvalho Chehab commit 5b2e303f6df1e0b1a903950c5d613a20c8c71a37 Author: David Härdeman Date: Fri Oct 29 16:08:28 2010 -0300 [media] rc-core: convert winbond-cir Move winbond-cir from drivers/input/misc/ into drivers/media/rc/ and convert it to use rc-core. Signed-off-by: David Härdeman Signed-off-by: Mauro Carvalho Chehab commit d8b4b5822f51e2142b731b42c81e3f03eec475b2 Author: David Härdeman Date: Fri Oct 29 16:08:23 2010 -0300 [media] ir-core: make struct rc_dev the primary interface This patch merges the ir_input_dev and ir_dev_props structs into a single struct called rc_dev. The drivers and various functions in rc-core used by the drivers are also changed to use rc_dev as the primary interface when dealing with rc-core. This means that the input_dev is abstracted away from the drivers which is necessary if we ever want to support multiple input devs per rc device. The new API is similar to what the input subsystem uses, i.e: rc_device_alloc() rc_device_free() rc_device_register() rc_device_unregister() [mchehab@redhat.com: Fix compilation on mceusb and cx231xx, due to merge conflicts] Signed-off-by: David Härdeman Acked-by: Jarod Wilson Tested-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 4c7b355df6e7f05304e05f6b7a286e59a5f1cc54 Author: David Härdeman Date: Wed Nov 10 11:04:19 2010 -0300 [media] rc-core: Code cleanup after merging rc-sysfs and rc-map into rc-main [mchehab@redhat.com: this patch were originally bundled with some renaming stuff and with the file merges, as seen at: https://patchwork.kernel.org/patch/291092/. Instead of using the original approach, I wrote the rename patches and the code merge as separate changes, then applied the difference on this patch. This way, it is easier to see the real changes at the code, and will be easier to merge upstream, especially if some conflict rises on the renaming patches] Signed-off-by: David Härdeman Acked-by: Jarod Wilson Tested-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 631493ecacd81f1af74de459c1d16f7ffa6c82c0 Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:44:27 2010 -0300 [media] rc-core: merge rc-map.c into rc-main.c With this change, all rc-core functions are into just one file, except for the rc-raw specific functions. Signed-off-by: Mauro Carvalho Chehab commit bc2a6c5719efd74ce841ad0f0c9b6ea2590da6da Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:18:24 2010 -0300 [media] rc-core: Merge rc-sysfs.c into rc-main.c Signed-off-by: Mauro Carvalho Chehab commit f62de675f796a992011c598c405a3d6fada9aa20 Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:09:57 2010 -0300 [media] Rename rc-core files from ir- to rc- As protocol decoders are specific to InfraRed, keep their names as-is. Signed-off-by: Mauro Carvalho Chehab commit 32cf86f6d16367db5a10039c1dd938a2427d697c Author: Mauro Carvalho Chehab Date: Tue Nov 9 23:00:14 2010 -0300 [media] rename drivers/media/IR to drives/media/rc Signed-off-by: Mauro Carvalho Chehab commit 3ffea4988be3f3fa65f2104ba31eff2b5e0e82a0 Author: David Härdeman Date: Fri Oct 29 16:08:12 2010 -0300 [media] ir-core: more cleanups of ir-functions.c cx88 only depends on VIDEO_IR because it needs ir_extract_bits(). Move that function to ir-core.h and make it inline. Lots of drivers had dependencies on VIDEO_IR when they really wanted IR_CORE. The only remaining drivers to depend on VIDEO_IR are bt8xx and saa7134 (ir_rc5_timer_end is the only function exported by ir-functions). Rename VIDEO_IR -> IR_LEGACY to give a hint to anyone writing or converting drivers to IR_CORE that they do not want a dependency on IR_LEGACY. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 62c6503125389763a74911408d984c5dd09eeb97 Author: David Härdeman Date: Fri Oct 29 16:08:07 2010 -0300 [media] ir-core: remove remaining users of the ir-functions keyhandlers This patch removes the remaining usages of the ir_input_nokey() and ir_input_keydown() functions provided by drivers/media/IR/ir-functions.c by using the corresponding functionality in ir-core instead. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 2997137be8eba5bf9c07a24d5fda1f4225f9ca7d Author: David Härdeman Date: Fri Oct 29 16:08:02 2010 -0300 [media] ir-core: convert drivers/media/video/cx88 to ir-core This patch converts the cx88 driver (for sampling hw) to use the decoders provided by ir-core instead of the separate ones provided by ir-functions (and gets rid of those). The value for MO_DDS_IO had a comment saying it corresponded to a 4kHz samplerate. That comment was unfortunately misleading. The actual samplerate was something like 3250Hz. The current value has been derived by analyzing the elapsed time between interrupts for different values (knowing that each interrupt corresponds to 32 samples). Thanks to Mariusz Bialonczyk for testing my patches (about one a day for two weeks!) on actual hardware. Signed-off-by: David Härdeman Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 00df055ae315c9c8792dc4d012e6ad9c4d527e87 Author: Jarkko Nikula Date: Fri Oct 29 11:31:39 2010 -0300 [media] radio-si4713: Add regulator framework support Convert the driver to use regulator framework instead of set_power callback. This with gpio_reset platform data provide cleaner way to manage chip VIO, VDD and reset signal inside the driver. Signed-off-by: Jarkko Nikula Cc: Eduardo Valentin Signed-off-by: Mauro Carvalho Chehab commit bf797165f099296b622bcdcea1126a113e0aaac4 Author: Devin Heitmueller Date: Sat Oct 9 15:09:17 2010 -0300 [media] au0828: enable VBI timeout when calling read() without streamon() Because some clients (e.g. tvtime) will just open the filehandle and call read() instead of explicitly calling streamon first, we need to make sure the VBI timeout routine gets enabled in this case. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 78ca500559b5a4f16a95c198b3e7bdfac8455bf8 Author: Devin Heitmueller Date: Sat Oct 9 14:43:53 2010 -0300 [media] au0828: fixes for timeout on no video The first pass of fixes to cause the driver to continue streaming even when there is no video arriving over the ITU656 bus were not adequate. Continue the work from the previous patch. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 6e04b7b95a5bd2da0aa5df05fc09a1f0d6615666 Author: Devin Heitmueller Date: Wed Sep 1 22:03:43 2010 -0300 [media] au0828: continue video streaming even when no ITU-656 coming in We need the au0828 to continue delivering frames even when the device is not delivering video, or else applications such as tvtime will block indefinitely. Unfortunately, the au8522 doesn't have any sort of free-running mode or "blue screen on no video" like some other decoders. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 301c9f26d7ded6e274a99c3a447a9a36790a3f3e Author: Devin Heitmueller Date: Sun Jun 27 18:12:42 2010 -0300 [media] au8522: Handle differences in comb filter config for s-video input Tweak the comb filter config when in s-video mode to match the Hauppauge Windows driver values (based on register dumps). This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit d2c194ce4781d62bf671aa6b65a2fccb39feb50e Author: Devin Heitmueller Date: Sun Jun 27 18:01:40 2010 -0300 [media] au8522: fix clamp control for different video modes Straighten out the clamp control configurations for the various video modes, based off of register diffs done against the Hauppauge Windows driver. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 2428a2ed6a7cbc7be6db5c70c3838a4bf0de9f48 Author: Devin Heitmueller Date: Sun Jun 27 17:40:42 2010 -0300 [media] au8522: cleanup code which disables audio decoder Cleanup the routine which disables the audio decoder. In particular, the i2s output was being shut off but the audio processor itself was not, resulting in more power being consumed than needed. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit bde3bb9a67d2cd260df6be9726c9c360a0e3cee9 Author: Devin Heitmueller Date: Mon Jul 5 13:05:16 2010 -0300 [media] au0828: Fix field alignment for video frames delivered by driver Fix the alignment of fields being delivered by the driver, which was resulting in jerky video when there was horizontal motion (since the bottom field of the frame was being sent with the top field of the previous frame) This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 83f859c5a6d6e01d671f002c0ade3498b4a4b245 Author: Devin Heitmueller Date: Fri Jun 25 01:33:39 2010 -0300 [media] au0828: set max packets per URB to match Windows driver We had the max packets per URB set to an incredibly low "10" as opposed to the Windows driver which has it as 128. Set the value to match the Windows driver, which will reduce interrupts considerably. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 88464106f97fe1c143bda2b4019b07c3069d454c Author: Devin Heitmueller Date: Sun Jun 13 17:31:22 2010 -0300 [media] au8522: Properly set default brightness The chip's default value for the brightness didn't match what we were sending back in the queryctrl ioctl(), so if the application actually set the brightness to the "default", it would actually end up being way too bright. This work was sponsored by GetWellNetwork Inc. Signed-off-by: Devin Heitmueller Signed-off-by: Mauro Carvalho Chehab commit 1d00d6c1ff13607974fcd9469aa9466fcd253c3a Author: Jean-François Moine Date: Fri Oct 29 13:58:22 2010 -0300 [media] gspca: Convert some uppercase hexadecimal values to lowercase Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a79cc7b9182abb2e3936a26064dec414b417f1d1 Author: Jean-François Moine Date: Fri Oct 29 08:10:37 2010 -0300 [media] gspca - sonixj: Simplify and clarify the hv7131r probe function Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit d581bcd78be567af7026e3d13b54ec7df8db8b82 Author: Jean-François Moine Date: Fri Oct 29 08:01:01 2010 -0300 [media] gspca - zc3xx: Bad clocksetting for mt9v111_3 with 640x480 resolution The bad value prevented the autogain to work correctly and some images were truncated. Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit a23c1947f4da31d9aac9bfc05ef22d8148b2f106 Author: Jean-François Moine Date: Fri Oct 29 07:57:03 2010 -0300 [media] gspca - main: Fix a small code error Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 0b8851b6c3934a56eb1a4ff284ab5133065e0cb8 Author: Jean-François Moine Date: Fri Oct 29 07:56:06 2010 -0300 [media] gspca - main: Version change Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 614d06917de2823d598a4b231256d08074044235 Author: Hans de Goede Date: Wed Oct 27 07:42:28 2010 -0300 [media] gspca_ov519: generate release button event on stream stop if needed Generate a release button event when the button is still pressed when the stream stops. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit e0657be5615f666f261206ed62c3f0dc2527956e Author: Hans de Goede Date: Wed Oct 27 06:38:07 2010 -0300 [media] gspca_xirlink_cit: Add support camera button gspca_xirlink_cit: Add support camera button Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2c4e776aa370a7a1619c7ada0604e9003fe1d92a Author: Hans de Goede Date: Tue Oct 26 17:21:33 2010 -0300 [media] gspca_xirlink_cit: Frames have a 4 byte footer At least on the ibm netcam pro frames have a 4 byte footer, take this into account when calculating sizeimage. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit bc46bae6373c87897959c7aa8fb9f6c4218695b8 Author: Hans de Goede Date: Tue Oct 26 11:18:59 2010 -0300 [media] gspca_xirlink_cit: various usb bandwidth allocation improvements / fixes The following usb bandwidth allocation changes were made to the ibm netcam pro code: - Don't restart negotiation at max packet size on stop0, as that gets called by gspca_main during negotiation. Move this to sd_isoc_init. - Don't ask for full bandwidth when running at 160x120, that does not need full bandwidth - Make minimum acceptable bandwidth depend upon resolution [mchehab@redhat.com: Fix CodingStyle problems at switch statements] Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 2661da47daefd4f22f9fdc7e9294a1cb9edf515b Author: Hans de Goede Date: Tue Oct 26 05:16:32 2010 -0300 [media] gspca: only set gspca->int_urb if submitting it succeeds Currently alloc_and_submit_int_urb() is setting gspca->int_urb as soon as the allocation has succeeded, but if the subsequent submit fails, the urb gets destroyed. And then later will get destroyed again in gspca_input_destroy_urb() because gspca->int_urb is set, leading to a double free. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 314b3e0881c6acb4f40e07565ac1a7798c7698a3 Author: Hans de Goede Date: Tue Oct 26 05:15:46 2010 -0300 [media] gspca: submit interrupt urbs *after* isoc urbs Currently gspca supported usb-1.1 webcams for which we support the input button through an interrupt endpoint won't stream (not enough bandwidth error) when used through an USB-2.0 hub. After much debugging I've found out that the cause for this is that the ehci-sched.c schedeling code does not like it when there are already urb's scheduled when (large) isoc urbs are queued. By moving the submission of the interrupt urbs to after submitting the isoc urbs the camera starts working again through usb-2.0 hubs. Note that this does not fix isoc. streaming through a usb-hub while another 1.1 usb device (like the microphone of the same cam) is also active at the same time :( I've spend a long time analyzing the linux kernel ehci scheduler code, resulting in this (long) mail: http://www.spinics.net/lists/linux-usb/msg37982.html The conclusion of the following mail thread is that yes there are several issues when using usb-1.1 devices through a usb-2.0 hub, but these are not easily fixable in the current code. Fixing this in ehci-sched.c requires an almost full rewrite, which is not bound to happen anytime soon. So with this patch gspca driven usb-1.1 webcams will atleast work when connected through an usb-2.0 hub when the microphone is not used. As an added bonus this patch avoids extra destroy/create input urb cycles when we end up falling back to a lower speed alt setting because of bandwidth limitations. Signed-off-by: Hans de Goede Signed-off-by: Mauro Carvalho Chehab commit 25ad9847ca09f744b4cfea362d339c8b5b49765c Author: Malcolm Priestley Date: Thu Nov 4 17:17:51 2010 -0300 [media] lmedm04: change USB Timeouts to avoid troubles DM04/QQBOX USB Timing change. Improved timing to avoid USB corruptions on some systems. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit afcd0806094d9ae0d944f30776edc075e4584b96 Author: Malcolm Priestley Date: Tue Nov 2 18:02:08 2010 -0300 [media] Documentation/lmedm04: Fix firmware extract information Corrected Firmware Information for LG on LME2510. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit f23e6616ac2dc560db0ee8733024ebe90de9161a Author: Malcolm Priestley Date: Wed Oct 27 19:50:36 2010 -0300 [media] lmed04: Improve frontend handling Improved frontend handling. Frontend now remains open at all times, with signal lock, snr & signal level polled from Interupt. Updated driver for DM04/QQBOX USB DVB-S BOXES to version 1.70. Signed-off-by: Malcolm Priestley Signed-off-by: Mauro Carvalho Chehab commit ea7c681e899bda3fceb37815d63d201c3b4be920 Author: Daniel Drake Date: Wed Oct 27 10:55:00 2010 -0300 [media] cafe_ccic: fix colorspace corruption on resume If you suspend and resume during video capture, the video colours are corrupted on resume. This is because the sensor is being unconditionally powered off during the resume path. Only power down during resume if the camera is not in use, and correctly reconfigure the sensor during resume. Fixes http://dev.laptop.org/ticket/10190 Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Mauro Carvalho Chehab commit c429e7b62a54bf34c1995b45faeaeb84104f1705 Author: Joe Perches Date: Mon Oct 25 23:44:25 2010 -0300 [media] drivers/media: Removed unnecessary KERN_s from dprintk uses Converted if (debug >= 2) printk(KERN_DEBUG... to if debug >= 2) dprintk(...) Signed-off-by: Joe Perches Signed-off-by: Mauro Carvalho Chehab commit 1bc25f7d6c0f353d3c73252048fe03a3d8f0e6b8 Author: Mauro Carvalho Chehab Date: Sat Oct 23 13:35:58 2010 -0300 [media] cx231xx: Add IR support for Pixelview Hybrid SBTVD Signed-off-by: Mauro Carvalho Chehab commit 9ab66912e0cd671fbea1b99e8a37d11b14d50baf Author: Mauro Carvalho Chehab Date: Sat Oct 23 13:28:33 2010 -0300 [media] cx231xx: Add a driver for I2C-based IR Although cx231xx has a very good IR support, already supported by mceusb driver, some designs decided to add a separate I2C microcontroller chip in order to handle IR. Due to that, add a glue to ir-kbd-i2c is needed, in order to support those devices. Signed-off-by: Mauro Carvalho Chehab commit f0551efc77b0f34a93a14d2bf96051612e352a39 Author: Mauro Carvalho Chehab Date: Sun Oct 3 07:01:26 2010 -0300 [media] Add DVB support for SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG Signed-off-by: Mauro Carvalho Chehab commit 68541cdaadecbc280cd50122f11fdbb249a2ae29 Author: Mauro Carvalho Chehab Date: Sun Oct 3 05:27:59 2010 -0300 [media] Add support for Kworld SBTVD board Signed-off-by: Mauro Carvalho Chehab commit 7572f9c5575c721f43b575a71fda1ecd896e0327 Author: Mauro Carvalho Chehab Date: Sun Oct 3 16:48:49 2010 -0300 [media] mb86a20s: add support for serial streams By comparing the traffic between Pixelview (cx23102-based and Kworld (saa7134-based), the only difference is at register 0xd5. After some tests, It seems that it is used to change mode between serial and parallel. Signed-off-by: Mauro Carvalho Chehab commit 55fa288deca4b17e539ba49a9b0d0ed474afa6f8 Author: Mauro Carvalho Chehab Date: Wed Sep 29 11:07:08 2010 -0300 [media] cx231xx: use callback to set agc on PixelView Signed-off-by: Mauro Carvalho Chehab commit ede676c72d0b18f1c15300f7874370e771489a1c Author: Mauro Carvalho Chehab Date: Mon Sep 27 23:44:27 2010 -0300 [media] add digital support for PV SBTVD hybrid Signed-off-by: Mauro Carvalho Chehab commit 9417bc6dd9de85944501f8f4ce8dd0e64135ca82 Author: Mauro Carvalho Chehab Date: Sun Sep 26 20:44:31 2010 -0300 [media] Add analog support for Pixelvied Hybrid SBTVD Signed-off-by: Mauro Carvalho Chehab commit b9ede79ada766eec535e1230970bd885489d5990 Author: Mauro Carvalho Chehab Date: Mon Sep 27 20:52:43 2010 -0300 [media] add a driver for mb86a20s This adds the trivial bits to mb86a20s. As the driver won't touch at the channel/layer parameters, this may not be enough for receiving all channels, especially ISDB-Tsb, but the driver worked properly for receiving video channels on my tests. Signed-off-by: Mauro Carvalho Chehab commit ca3dfd6a6f8364c1d51e548adb4564702f1141e9 Author: Mauro Carvalho Chehab Date: Fri Sep 10 17:29:14 2010 -0300 [media] em28xx: Add support for Leadership ISDB-T This device uses an em2874B + Sharp 921 One Seg frontend. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 3a509bb11acded0dfebbfcc740d85e0774b0769a Author: Mauro Carvalho Chehab Date: Fri Sep 10 16:49:47 2010 -0300 [media] Re-write the s921 frontend On our tests with Leadership ISDBT, the s921 frontend were not work. As its design contained some weird things, it ended to be easier to just re-write it, getting another frontend as an example (cx24123). As the old s921 driver weren't used, there's no regression. Some info from the old frontend were used as a way to double check the behavior that were noticed on the USB dumps retrieved from Leadership driver. Signed-off-by: Douglas Schilling Landgraf Signed-off-by: Mauro Carvalho Chehab commit 94a544a4e8d05a027613443c529c399c39cc3371 Merge: 496a2e3 21486af Author: Grant Likely Date: Wed Dec 29 01:05:14 2010 -0700 Merge branch 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next * 'spi' of git://git.linutronix.de/users/bigeasy/soda into spi/next spi/pxa2xx: register driver properly spi/pxa2xx: add support for shared IRQ handler spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers arm/pxa2xx: reorgazine SSP and SPI header files spi/pxa2xx: Add CE4100 support spi/pxa2xx: Consider CE4100's FIFO depth spi/pxa2xx: Add chipselect support for Sodaville spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. spi/pxa2xx: pass of_node to spi device and set a parent device commit 496a2e360a34e1f41c336d23947f800216cb9bdf Merge: 5aa68b8 23ce17a Author: Grant Likely Date: Wed Dec 29 00:47:29 2010 -0700 Merge branch 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next * 'for-grant' of git://arago-project.org/git/projects/linux-davinci into spi/next spi: davinci: fix checkpatch errors spi: davinci: whitespace cleanup spi: davinci: remove unused variable 'pdata' spi: davinci: set chip-select mode in SPIDEF only once spi: davinci: enable both activation and deactivation of chip-selects spi: davinci: remove unnecessary data transmit on CS disable spi: davinci: enable GPIO lines to be used as chip selects spi: davinci: simplify prescalar calculation spi: davinci: remove 'wait_enable' platform data member spi: davinci: make chip-slect specific parameters really chip-select specific spi: davinci: consolidate setup of SPIFMTn in one function spi: davinci: setup chip-select timers values only if timer enabled spi: davinci: add support for wait enable timeouts spi: davinci: remove unused members of davinci_spi_slave spi: davinci: eliminate the single member structure davinci_spi_slave spi: davinci: eliminate unnecessary update of davinci_spi->count spi: davinci: simplify calculation of edma acount value spi: davinci: check for NULL buffer pointer before using it spi: davinci: remove unnecessary disable of SPI spi: davinci: remove unnecessary 'count' variable in driver private data spi: davinci: remove unnecessary completion variable initialization spi: davinci: remove non-useful interrupt mode support spi: davinci: simplify poll mode transfers spi: davinci: add support for interrupt mode spi: davinci: configure the invariable bits in spipc0 only once spi: davinci: remove unnecessary function davinci_spi_bufs_prep() spi: davinci: remove unnecessary call to davinci_spi_setup_transfer() spi: davinci: do not store DMA channel information per chip select spi: davinci: always start transmit DMA spi: davinci: do not use temporary buffer if no transmit data provided spi: davinci: always start receive DMA spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot spi: davinci: fix DMA event generation stoppage spi: davinci: fix EDMA CC errors at end of transfers spi: davinci: handle DMA completion errors correctly spi: davinci: remove usage of additional completion variables for DMA spi: davinci: let DMA operation be specified on per-device basis spi: davinci: remove non-useful "clk_internal" platform data spi: davinci: enable and power-up SPI only when required spi: davinci: setup the driver owner spi: davinci: add additional comments spi: davinci: add EF Johnson Technologies copyright spi: davinci: removed unused #defines spi: davinci: remove unnecessary typecast spi: davinci: do not treat Tx interrupt being set as error spi: davinci: do not allocate DMA channels during SPI device setup spi: davinci: remove unnecessary private data member 'region_size' spi: davinci: shorten variable names spi: davinci: kconfig: add manufacturer name to prompt string commit 93d0cd7b9e4855c12b3bb5c9367872476c78fef9 Author: Ben Skeggs Date: Wed Dec 29 10:41:20 2010 +1000 drm/nvc0: nuke left-over debug messages Signed-off-by: Ben Skeggs commit b1cd916ab96e5fcd16e2009410af2e8edfae2962 Author: Ben Skeggs Date: Fri Dec 24 09:33:33 2010 +1000 drm/nvc0: kill off a couple more magics Signed-off-by: Ben Skeggs commit 22a756ee8951e597c76e5a60f81d40a43054489e Merge: 839d271 776065e Author: Mark Brown Date: Tue Dec 28 23:42:53 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 839d271c509b6ce5c1da8a8e89fad73a1af0ddda Author: Lars-Peter Clausen Date: Tue Dec 28 21:37:55 2010 +0100 ASoC: codecs: Remove unused reg_cache fields from device structs The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but there are quite a few drivers left which now have an unused reg_cache field in their private device struct. This patch removes these unused fields. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown commit e7d282535c94cddc208c03b7cd0815f70d676a0e Author: Joe Perches Date: Thu Dec 9 23:16:55 2010 -0800 [IA64] Remove unlikely from cpu_is_offline cpu_is_offline already uses unlikely internally. Signed-off-by: Joe Perches Signed-off-by: Tony Luck commit 409e590572d980c314e989e94176bcb060130fae Author: Jiri Slaby Date: Mon Nov 22 10:41:19 2010 +0100 [IA64] irq_ia64, use set_irq_chip Don't access desc->chip directly, because them chip member will disappear some time later. Signed-off-by: Jiri Slaby Cc: Thomas Gleixner Signed-off-by: Tony Luck commit e21763dbce76d3a07ead438f8811b3e4bce0825b Author: Jesper Juhl Date: Sat Oct 30 21:35:58 2010 +0200 [IA64] perfmon: Change vmalloc to vzalloc and drop memset. vzalloc() nicely zeroes memory for us, so we don't have to do a vmalloc() and then manually memset() the returned memory when all we want is for it to be zero. Patch changes this for pfm_rvmalloc(). Signed-off-by: Jesper Juhl Signed-off-by: Tony Luck commit 75c1c91cb92806f960fcd6e53d2a0c21f343081c Author: Dimitri Sivanich Date: Tue Dec 28 13:34:42 2010 -0600 [IA64] eliminate race condition in smp_flush_tlb_mm A race condition exists within smp_call_function_many() when called from smp_flush_tlb_mm(). On rare occasions the cpu_vm_mask can be cleared while smp_call_function_many is executing, occasionally resulting in a hung process. Make a copy of the mask prior to calling smp_call_function_many(). Signed-off-by: Dimitri Sivanich Signed-off-by: Tony Luck commit a7dd6027e55992dd7c409a71a4a2b576fda2f7c2 Author: Dan Carpenter Date: Thu Dec 23 20:15:39 2010 +0000 vxge: remove duplicated part of check This is just a cleanup to make the static checkers happy. We don't need to check "own" twice. Signed-off-by: Dan Carpenter Acked-by: Ram Vepa Signed-off-by: David S. Miller commit eface65c336eff420d70beb0fb6787a732e05ffb Author: Tejun Heo Date: Sat Dec 18 18:42:23 2010 +0100 [SCSI] sd: implement sd_check_events() Replace sd_media_change() with sd_check_events(). * Move media removed logic into set_media_not_present() and media_not_present() and set sdev->changed iff an existing media is removed or the device indicates UNIT_ATTENTION. * Make sd_check_events() sets sdev->changed if previously missing media becomes present. * Event is reported only if sdev->changed is set. This makes media presence event reported if scsi_disk->media_present actually changed or the device indicated UNIT_ATTENTION. For backward compatibility, SDEV_EVT_MEDIA_CHANGE is generated each time sd_check_events() detects media change event. [jejb: fix boot failure] Signed-off-by: Tejun Heo Acked-by: Jens Axboe Signed-off-by: James Bottomley commit bb9fb42029abcc90c265dbc40cab106421dd9348 Author: Jiri Kosina Date: Tue Dec 28 14:16:15 2010 +0100 Revert conflicting V4L changes This is a partial revert of b595076a180a56d1bb1 ("tree-wide: fix comment/printk typos"), as it changes the code that no longer exists in linux-next. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina commit 8ad225e8e4f530f500c12ec77fd5a51caf6a2f66 Author: Herbert Xu Date: Tue Dec 28 22:56:26 2010 +1100 crypto: gf128mul - Remove experimental tag This feature no longer needs the experimental tag. Reported-by: Toralf Förster Signed-off-by: Herbert Xu commit 6dc47e97a064c4fc0e324fc4accc90415c1509b2 Author: Mark Brown Date: Tue Dec 28 02:14:25 2010 +0000 ASoC: One more x86 typo fix Signed-off-by: Mark Brown commit 202b6ca149dc90d3d81772413e1e1c0b65e83012 Author: Ping Cheng Date: Fri Dec 24 13:13:25 2010 -0800 Input: wacom_w8001 - use __set_bit to set keybits This makes code safer and easier to read. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 5c461b913a16aed8afa285a1d00414791a9afe33 Merge: ef11e70 4f56ce9 Author: Dmitry Torokhov Date: Mon Dec 27 17:33:20 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next commit ef11e701f32fb0cd5c5f0f6fb9a9e28fab151219 Author: David Sterba Date: Mon Dec 27 17:20:01 2010 -0800 Input: bu21013_ts - fix misuse of logical operation in place of bitop Signed-off-by: David Sterba Acked-by: Linus Walleij Signed-off-by: Dmitry Torokhov commit a06a09c802c869426cfe8c405c381c985c3b25b2 Author: Pali Rohár Date: Mon Dec 27 17:21:45 2010 -0800 Input: i8042 - add Acer Aspire 5100 to the Dritek list This patch adds notebook Acer Aspire 5100 to the list of Dritek HW. Acer Aspire 5100 needs Dritek keyboard extension to support all Fn keys. Signed-off-by: Pali Rohár Tested-by: Pali Rohár Signed-off-by: Dmitry Torokhov commit e7bf068aa3208d73e9dea817f6d975071ddd4336 Author: David Sterba Date: Mon Dec 27 16:51:15 2010 +0100 i7core_edac: fix typos in comments Signed-off-by: Jiri Kosina commit 731ece41fb1047816303295a0cdfed90a528137e Author: Olof Johansson Date: Fri Dec 10 02:09:23 2010 -0600 modpost: Fix address calculation in reloc_location() This patch fixes a segfault in modpost that is observed when the gold linker is used to link the input objects. The problem is that reloc_location (modpost.c) is computing the address of the relocation target incorrectly. Here, elf->hdr points to the beginning of the ELF file in memory, sechdr points to the relocation section header, section is the index of the section being relocated, and sechdrs[section].sh_offset would be the offset of that section, relative to the beginning of the ELF file. Adding elf->hdr + sechdrs[section].sh_offset gives you the address of the beginning of the section, and adding r->r_offset to that gives you the address of the location to be relocated. You do not need to subtract sechdrs[section].sh_addr from that -- the result of this is an address outside the file, and causes the segfault when addend_386_rel tries to dereference it. This bug is not observed when GNU ld is used to link the inputs. The object file ubuntu/omnibook/omnibook.o is the result of an ld -r of several other files. When GNU ld does an ld -r, it sets the vaddr field for each section to 0, but gold lays out the section addresses sequentially instead: Section Headers: [Nr] Name Type Addr Off Size ES Flg Lk Inf Al [ 0] NULL 00000000 000000 000000 00 0 0 0 [ 1] .text PROGBITS 00000000 000034 004794 00 AX 0 0 4 [ 2] .data PROGBITS 0000b9d0 0047c8 0009c0 00 WA 0 0 4 [ 3] .bss NOBITS 000162f8 005188 00013c 00 WA 0 0 4 [ 4] .rodata.str1.1 PROGBITS 00004f2d 0052c4 001b1a 01 AMS 0 0 1 [ 5] .init.text PROGBITS 00004794 006dde 0005fa 00 AX 0 0 1 [ 6] .exit.text PROGBITS 00004d8e 0073d8 00018a 00 AX 0 0 1 ... So the bug in the tool remained undiscovered because the section's vaddr always happened to be 0. Signed-off-by: Raymes Khoury Signed-off-by: Olof Johansson Signed-off-by: Michal Marek commit c8217b8305e5e75c23617f2f4cd262527d952c0a Author: Cliff Wickman Date: Mon Dec 13 10:51:57 2010 -0600 x86, paravirt: Use native_halt on a halt, not native_safe_halt halt() should use native_halt() safe_halt() uses native_safe_halt() If CONFIG_PARAVIRT=y, halt() is defined in arch/x86/include/asm/paravirt.h as static inline void halt(void) { PVOP_VCALL0(pv_irq_ops.safe_halt); } Otherwise (no CONFIG_PARAVIRT) halt() in arch/x86/include/asm/irqflags.h is static inline void halt(void) { native_halt(); } So it looks to me like the CONFIG_PARAVIRT case of using native_safe_halt() for a halt() is an oversight. Am I missing something? It probably hasn't shown up as a problem because the local apic is disabled on a shutdown or restart. But if we disable interrupts and call halt() we shouldn't expect that the halt() will re-enable interrupts. Signed-off-by: Cliff Wickman LKML-Reference: Signed-off-by: H. Peter Anvin commit 32ae2ade462146729580117d9886cc9efd83dfbe Author: Franck Bui-Huu Date: Thu Dec 23 16:04:23 2010 +0100 perf probe: Fix short file name probe location reporting After adding probes, perf-probe(1) reports the probes locations which include filenames for certain cases. But for short file names (whose length < 32), perf-probe didn't display the name correctly. It actually skipped the first character. Here's an example where 'icmp.c' was screwed: $ perf probe -n -a "icmp.c;sk=*" Add new events: probe:icmp_push_reply (on @cmp.c) probe:icmp_reply (on @cmp.c) probe:icmp_reply_1 (on @cmp.c) probe:icmp_send (on @cmp.c) probe:icmp_send_1 (on @cmp.c) probe:icmp_error (on @cmp.c) probe:icmp_error_1 (on @cmp.c) probe:icmp_error_2 (on @cmp.c) probe:icmp_error_3 (on @cmp.c) This patch fixes this bug in synthesize_perf_probe_point(). Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 0597fcd08b858df83b9f20afd6035311d92c48f8 Author: Arnaud Lacombe Date: Thu Dec 23 03:25:16 2010 -0500 kconfig: fix warning In file included from scripts/kconfig/zconf.tab.c:2502: scripts/kconfig/expr.c:1033: warning: no previous prototype for 'expr_simplify_unmet_dep' Reported-by: Stephen Rothwell Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit a164612eb6562d211e7fc67890df42753da7dfa0 Merge: 8b08c0f d089357 Author: Mark Brown Date: Mon Dec 27 17:51:52 2010 +0000 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38 commit 86280a208825d55ba988420b6b0ed2d6b9ec80f8 Author: David Sterba Date: Mon Dec 27 16:27:43 2010 +0100 HID: picolcd: fix misuse of logical operation in place of bitop CC: Bruno Prémont CC: Jiri Kosina Signed-off-by: David Sterba Signed-off-by: Jiri Kosina commit 8b08c0fe95060bba87e98ae6308b90441698a878 Author: Mark Brown Date: Fri Dec 24 16:59:36 2010 +0000 ASoC: Fix double comment start Signed-off-by: Mark Brown commit 3f1c63261b7ff81bffd7d4ac6b933c9d0e4c4f94 Author: Mark Brown Date: Mon Dec 27 15:30:45 2010 +0000 ASoC: Fix typo in x86 workaround Signed-off-by: Mark Brown commit 23a0790af27b08daddf1334388c48d0d4ccf2374 Author: Figo.zhang Date: Mon Dec 27 15:14:06 2010 +0100 mm/rmap.c: fix comment clean up comment. Signed-off-by: Figo.zhang Acked-by: Rik van Riel Signed-off-by: Jiri Kosina commit c521dde6a690721a1db17924ef5683864ff58fdb Author: Jesper Juhl Date: Mon Dec 27 15:09:53 2010 +0100 sound, ca0106: Fix assignment to 'channel'. The assignment to the local variable 'channel' in snd_ca0106_pcm_pointer_capture() is a little crazy. Order of assignment is undefined. This fixes it. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 17f7f4d9fcce8f1b75b5f735569309dee7665968 Merge: 041110a d7c1255 Author: David S. Miller Date: Sun Dec 26 22:37:05 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: net/ipv4/fib_frontend.c commit 8e91182bbdb8591be4835907d825a5b9a80495a9 Author: Michel Hermier Date: Sat Dec 25 16:58:56 2010 +0100 drm/nouveau: Validate channel indices passed from userspace. When hacking the libdrm for improvements, I triggered a kernel crash related to the fact that the NOUVEAU_NOTIFIEROBJ_ALLOC ioctl calls nouveau_channel_get with an unchecked channel index. The patch ensures that the channel index is an unsigned and validates its value in nouveau_channel_get. Signed-off-by: Michel Hermier Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit c42988012ad9c1807b7c7a5ff855cd630094989b Author: Ben Hutchings Date: Sat Dec 25 16:17:32 2010 +0000 drm/nouveau: Only select ACPI_VIDEO if its dependencies are met CONFIG_ACPI_VIDEO depends on more than just CONFIG_ACPI, so add those dependencies to the Kconfig select condition. The case where some dependencies fail to be satisfied should be handled correctly, because in that case the ACPI_VIDEO symbols we use are converted into static-inline stubs. Signed-off-by: Ben Hutchings Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 003ea98195eebdfcf476317b517e8c29a25b9d10 Author: Wey-Yi Guy Date: Wed Dec 15 08:06:23 2010 -0800 iwlwifi: remove reference to Gen2 The correct name should be used for the newer devices, remove reference to Gen2 Signed-off-by: Wey-Yi Guy commit bdb84fec61aab7047b1b108b6b6824c003bc4d11 Author: Johannes Berg Date: Wed Dec 15 06:07:56 2010 -0800 iwlagn: fix FH error # iw wlan0 interface add moni0 type monitor flags control # ip link set moni0 up causes a continuous spew of FH_ERROR from the device. Fix this by not setting the CTL2HOST filter by itself -- CTL + promisc works fine. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit e88735d711948a580741fd337afd4ec11c395174 Author: Wey-Yi Guy Date: Sat Dec 11 08:46:56 2010 -0800 iwlwifi: remove extra string For "led_mode" module parameters, string "led_mode" is duplicated twice, remove one. Signed-off-by: Wey-Yi Guy commit 041110a439e21cd40709ead4ffbfa8034619ad77 Merge: a1a5da5 2316aa2 Author: David S. Miller Date: Sat Dec 25 19:20:38 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit a1a5da57d0884017b8c3a011a28d4f5e08a2ea4f Author: Rasesh Mody Date: Thu Dec 23 21:45:10 2010 +0000 bna: Update the driver version to 2.3.2.3 Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 1d32f7696286eef9e5644eb57e79a36756274357 Author: Rasesh Mody Date: Thu Dec 23 21:45:09 2010 +0000 bna: IOC failure auto recovery fix Change Details: - Made IOC auto_recovery synchronized and not timer based. - Only one PCI function will attempt to recover and reinitialize the ASIC on a failure, that too after all the active PCI functions acknowledge the IOC failure. Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit aad75b66f1d3784514351f06bc589c55d5325bc8 Author: Rasesh Mody Date: Thu Dec 23 21:45:08 2010 +0000 bna: Restore VLAN filter table Change Details: - Retrieve the VLAN configuration from the networking stack and apply it to the base interface during ifconfig up Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit ce9b9f383775e6de74ca4c93d5c643dc3d76dd3c Author: Rasesh Mody Date: Thu Dec 23 21:45:07 2010 +0000 bna: Removed unused code Change Details: - Remove unused APIs and code cleanup Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 2c7d38210ff8e65f8961699bce92c273c77d113c Author: Rasesh Mody Date: Thu Dec 23 21:45:06 2010 +0000 bna: IOC uninit check and misc cleanup Change Details: - Added a check in ioc firmware lock function to see if IOC is in BFI_IOC_UNINIT state or not. If it is not in UNINIT state and the last IOC boot was not done by OS driver, force IOC state to BFI_IOC_UNINIT - Unused macro and API cleanup Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit f7c0fa4cd5dcf58dd95b216d2c33444a3b4a44e0 Author: Rasesh Mody Date: Thu Dec 23 21:45:05 2010 +0000 bna: Fix for TX queue Change Details: - Call netif_wake_queue() if we have freed up sufficient elements at the end of completion processing - Add netif_queue_stopped counter back to bnad_drv_stats {} - Get netif_queue_stopped value from stack - Remove BUG_ON() on value returned by pci_unmap_addr() Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 886f7fedb0cee56acca7620d89186669273d3d56 Author: Rasesh Mody Date: Thu Dec 23 21:45:04 2010 +0000 bna: Enable pure priority tagged packet reception and rxf uninit cleanup fix Change Details: - Enable reception of pure priority tagged packets by default by turning on VLAN Id = 0 - Clear the promiscuous mode, all multicast mode flags when bna_rxf_uninit is called Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 815f41e74031d6dc6d6dd988f58c03a1d72d02b9 Author: Rasesh Mody Date: Thu Dec 23 21:45:03 2010 +0000 bna: Fix ethtool register dump and reordered an API Change Details: - Removed semaphore register dump from ethtool - Moved netif_carrier_off() call to before calling bna_init() Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit 0613ecfc94b13e86c9ff1252fd63e35a94475cd6 Author: Rasesh Mody Date: Thu Dec 23 21:45:02 2010 +0000 bna: Port enable disable sync and txq priority fix Change Details: - Fixed port enable/disable sync through a change in LL port state machine - Change txq->priority masking to 0x7 (3 bits) from 0x3 (2 bits) Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit be7fa3263a15d3f278c3bfbf606ec169aaa3a920 Author: Rasesh Mody Date: Thu Dec 23 21:45:01 2010 +0000 bna: TxRx and datapath fix Change Details: - Check HW ready condition before accessing h/w register in data-path - Postpone clean-up of data buffers to the data-path restart path and wait in the cleanup routines for in-flight DMA to complete - Separate out Tx completion processing from Rx poll routine Signed-off-by: Debashis Dutt Signed-off-by: Rasesh Mody Signed-off-by: David S. Miller commit ce0ac9e1851364fa67c991659ce1db05ab82c6ae Author: Arnaldo Carvalho de Melo Date: Sat Dec 25 18:33:12 2010 -0200 perf script: Fix event ordering settings to work with older kernels If we don't use .ordering_requires_timestamps we'll end up trying to order events with no timestamps when running on older kernels. Problem introduced in eac23d1c. After the last three fixes, perf scripting is back working, tested with new perf userspace on old and new (with sample_id_all) kernels. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 3ae22e8c8ac39daf88ae32f047fb23825be7c646 Author: Mark Brown Date: Sat Dec 25 15:32:27 2010 +0100 spi / PM: Support dev_pm_ops Allow SPI drivers to use runtime PM and other dev_pm_ops features by implementing dev_pm_ops for the bus. The existing bus specific suspend and resume functions will be called if a driver does not provide dev_pm_ops allowing for transition to the new model. Signed-off-by: Mark Brown Acked-by: Grant Likely Signed-off-by: Rafael J. Wysocki commit a43d3f08c64125edbdfdc3d3aa512d3e37321f37 Author: Arnaldo Carvalho de Melo Date: Sat Dec 25 12:12:25 2010 -0200 perf record: Fix use of sample_id_all userspace with !sample_id_all kernels Check if parse_single_tracepoint_event has already asked for PERF_SAMPLE_TIME. This is kludgy but short term fix for problems introduced by eac23d1c that broke 'perf script' by having different sample_types when using multiple tracepoint events when we use a perf binary that tries to use sample_id_all on an older kernel. We need to move counter creation to perf_session, support different sample_types, etc. Ongoing work on the perf test infrastructure needs this so that we can create counters to monitor threads generating specific events, etc. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin Cc: Ian Munsie LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 765532c8aaac624b5f8687af6d319c6a1138a257 Author: Arnaldo Carvalho de Melo Date: Thu Dec 23 13:10:22 2010 -0200 perf script: Finish the rename from trace to script The scripts have calls to 'perf trace' that need to be converted to 'perf script', do it. This problem was introduced in 133dc4c. Reported-by: Torok Edwin Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi Cc: Torok Edwin LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 2316aa2aee254c126e688b53a3a105b82bc3f368 Author: Greg Rose Date: Thu Dec 2 07:12:26 2010 +0000 ixgbevf: Add X540 VF device support to the ixgbevf driver The X540 introduces a new Virtual Function device ID so that the X540 VF device can be distinguished from the 82599 VF device. The X540 VF device will have additional capability over the 82599 VF device so it is necessary to be able to discern the difference. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit a985b6c31ff230a1246d921afbfc0f6a1386be83 Author: Greg Rose Date: Thu Nov 18 03:02:52 2010 +0000 ixgbe: Add anti-spoofing feature support Add support for the anti-spoofing feature in the HW. Packets from VF devices with spoofed MAC addresses or VLAN tags will be blocked and a counter incremented. During the watchdog timer the spoofed packet dropped counter is read and if it is non-zero then a warning message is displayed on the host VMM's console. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 3377eba79e15671799876f82d30446e656aac5ad Author: Greg Rose Date: Tue Dec 7 08:16:45 2010 +0000 ixgbe: Add SR-IOV feature support to X540 Add X540 specific feature support to X540 Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit d3306c2974481ff9c539de22a37bb667e8694be2 Author: Greg Rose Date: Thu Nov 18 03:03:23 2010 +0000 ixgbe: Warn on VF attempt to override Administratively set MAC/VLAN Print warnings to the system log when the VF attempts to override MAC/VLAN settings that were configured by the VMM Host administrator using the ip link set commands. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 031d7952ee63e1aa679f7e87700e3281f4de4ba2 Author: Williams, Mitch A Date: Thu Dec 9 03:23:56 2010 +0000 igbvf: add support for i350 VF device Add support to igbvf for the new i350 virtual function device. Signed-off-by: Mitch Williams Signed-off-by: Jeff Kirsher commit 0e512bfc2c0cd6072387092f8d1ac8e1a758965b Author: Alexander Duyck Date: Thu Nov 18 03:12:30 2010 +0000 igbvf: force link checking when mailbox timeout has occurred This change forces the link down when a mailbox timeout has occurred. Previously it was possible for a mailbox timeout to occur but for the interface to stay up. The problem with this was that it became possible for an interface to stay up and miss multiple requests resulting in a possible issue since the interface will be running in an unknown state. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher commit 13800469d40bf4dc9fbed17f4692b2ebe94d4526 Author: Greg Rose Date: Sat Nov 6 02:08:26 2010 +0000 igb: Add Anti-spoofing feature support Add support for the anti-spoofing feature in the HW. Packets from VF devices with spoofed MAC addresses or VLAN tags will be blocked and an event generated. When the watchdog task runs it will call a function to check if any spoof events occurred. If an event was detected then a warning message is dumped to the system log. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 1b5dda331ff8646a70d247cace45a60035937a9b Author: Gasparakis, Joseph Date: Thu Dec 9 01:41:01 2010 +0000 igb: Some fine tuning This patch does the following: 1. Changes the existing supported device id's so now DH89xxCC is not supported when EEPROM is not read. 2. Adds two more device ids for DH89xxCC in backplane mode and SFP. 3. Driver now initializes previously possibly uninitialized value in igb_reset_mdicnfg_82580(). Signed-off-by: Joseph Gasparakis Signed-off-by: Jeff Kirsher commit a6b5ea353845b3f3d9ac4317c0b3be9cc37c259b Author: Greg Rose Date: Sat Nov 6 05:42:59 2010 +0000 igb: Warn on attempt to override administratively set MAC/VLAN Print a warning message to the system log when the VF attempts to override administratively set MAC/VLAN configuration. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit 8fa7e0f739b70db14e788efba4960bfc1873d550 Author: Greg Rose Date: Sat Nov 6 05:43:21 2010 +0000 igb: Fix overwrite of the VF's flags The vf flags were being overwritten causing the flag that indicates that the PF has set the VF MAC address to get cleared. This would allow the VF to override the MAC address assigned by the Host VMM using the ip link set command. Signed-off-by: Greg Rose Signed-off-by: Jeff Kirsher commit b1cdfead0e532d7614b5d5b97044df94cc8945ae Author: Bruce Allan Date: Sat Dec 11 05:53:47 2010 +0000 e1000e: checkpatch warnings - braces WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 6480641eb741cabbba8e196d4f17db7fb80d101c Author: Bruce Allan Date: Sat Dec 11 05:53:42 2010 +0000 e1000e: checkpatch error - open braces ERROR: that open brace { should be on the previous line Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 184125a389cf2c81980de5d5f365c786cc76d229 Author: Bruce Allan Date: Sat Dec 11 05:53:37 2010 +0000 e1000e: checkpatch error - trailing statements ERROR: trailing statements should be on next line Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit f0f1a172b2a9e26319b9aa95fa6c322ebb01089d Author: Bruce Allan Date: Sat Dec 11 05:53:32 2010 +0000 e1000e: checkpatch error - macro panethesis ERROR: Macros with complex values should be enclosed in parenthesis Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 68f20d948c86bd6bbc075052f6b6c45b8f56957e Author: Jeff Kirsher Date: Fri Dec 17 12:14:34 2010 +0000 Documentation/networking: Update Intel Wired LAN docs - Update the Intel Wired LAN documentation with the latest URL for ethtool. - replace "Ethtool" with "ethtool" Signed-off-by: Jeff Kirsher Tested-by: Emil Tantilov commit 5aa68b85951aec91d6a955d1de861325fc9a3ba1 Author: Wolfram Sang Date: Fri Dec 17 15:44:00 2010 +0100 spi/mpc52xx-psc-spi: move probe/remove to proper sections Probe/remove should be in __devinit/__devexit. Found by a section-mismatch warning. Also, copy do_remove() over to remove(). Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit dc69d1af9e8d9cbbabff88bb35a6782187a22229 Author: Ben Gamari Date: Fri Dec 24 02:48:09 2010 +0000 omap2: Make OMAP2PLUS select OMAP_DM_TIMER It appears that arch/arm/mach-omap2/timer-gp.o is needed by OMAP2PLUS. Since timer-gp.o has direct dependencies on omap_dm_timer_*, it seems correct for the architecture to depend upon OMAP_DM_TIMER, otherwise unsuspecting integrators will be faced with a whole bunch of linker errors at the end of their kernel build: arch/arm/mach-omap2/built-in.o: In function `omap2_gp_timer_set_mode': /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:84: undefined reference to `omap_dm_timer_stop' /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:88: undefined reference to `omap_dm_timer_get_fclk' /home/bgamari/trees/linux-2.6/arch/arm/mach-omap2/timer-gp.c:90: undefined reference to `omap_dm_timer_set_load_start' ... Signed-off-by: Ben Gamari Signed-off-by: Tony Lindgren commit fe13471c4b546e07ddbaf5fb2209b50c14b99b20 Author: Benoit Cousson Date: Thu Dec 23 22:30:32 2010 +0000 OMAP4: hwmod data: Fix alignment and end of line in structurefields In order to be fully aligned with the Python generator output, change a couple of fields. - Add tab in class structures to align attributes - Add a comma at the end of the following line to simplify the generation by having always the same eol: ".pre_shutdown = &omap2_wd_timer_disable," - Add a blank line before the first entry of the omap44xx_hwmods array. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit d7cf5f33fc68573d7bb9d4fc244ea1a3ed0b011b Author: Benoit Cousson Date: Thu Dec 23 22:30:31 2010 +0000 OMAP4: hwmod data: Move the DMA structures The merge of the DMA series on top of the already modified omap_hwmod_data_44xx.c put the dma_system structures at the wrong position in the file. Re-order it properly. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 1f6a717f1c000bb6184fe09c5ae99bad5965cadf Author: Benoit Cousson Date: Thu Dec 23 22:30:30 2010 +0000 OMAP4: hwmod data: Move the smartreflex structures The merge of the SR series on top of the already modified omap_hwmod_data_44xx.c moved the smartreflex structures at the wrong position in the file. - Re-order the structures properly. Signed-off-by: Benoit Cousson Cc: Thara Gopinath Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 4d218826ad9ba5ab0b2d7e0a2b14f2a1e48a5e0b Author: Benoit Cousson Date: Thu Dec 23 22:30:29 2010 +0000 OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc Add the missing SIDLE_SMART_WKUP flag in idlemodes field of the smartreflex sysconfig structure. Signed-off-by: Benoit Cousson Cc: Paul Walmsley Cc: Thara Gopinath Tested-by: G, Manjunath Kondaiah Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 569ff2de2e1c8ac67c8df3a7367d46d0d9460a35 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 usb: don't use flush_scheduled_work() flush_scheduled_work() is being deprecated. Directly flush or cancel work items instead. * u_ether, isp1301_omap, speedtch conversions are straight-forward. * ochi-hcd should only flush when quirk_nec() is true as otherwise the work wouldn't have been initialized. * In oti6858, cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). Signed-off-by: Tejun Heo Acked-by: Greg Kroah-Hartman Cc: David Brownell Cc: Duncan Sands Cc: linux-usb@vger.kernel.org commit 37c95bfe944babae817bfcf02c996729c9a3335d Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 speedtch: don't abuse struct delayed_work speedtch directly uses the internal timer and work members of a struct delayed_work. Use a separate work item and timer instead. * Nicolas Kaiser discovered that timer init was missing. Fixed. Signed-off-by: Tejun Heo Acked-by: Greg Kroah-Hartman Tested-by: Nicolas Kaiser Cc: Duncan Sands Cc: linux-usb@vger.kernel.org commit 8c71778cbf2c8beaefaa2dee5478aa0622d96682 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 media/video: don't use flush_scheduled_work() This patch converts the remaining users of flush_scheduled_work() in media/video. * bttv-input.c and cx23885-input.c don't use workqueue at all. No need to flush. * Make omap24xxcam.c and saa7134-empress.c flush the used work directly. * In fd_defio.c, replace cancel_delayed_work() + flush_scheduled_work() with cancel_delayed_work_sync(). While at it, replace the deprecated cancel_rearming_delayed_work() with cancel_delayed_work_sync(). Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab commit 707bcf326bd50c875d82bd2e7c31dcfb92b7e813 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 media/video: explicitly flush request_module work Video drivers request submodules using a work during probe and calls flush_scheduled_work() on exit to make sure the work is complete before being unloaded. This patch makes these drivers flush the work directly instead of using flush_scheduled_work(). While at it, relocate request_submodules() call in saa7134_initdev() right right before successful return as in other drivers to avoid failing after the work is scheduled and returning failure without the work still active. This is in preparation for the deprecation of flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab commit 883624a08cb4144343e7362d9fff0e2c69613ebf Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 ioc4: use static work_struct for ioc4_load_modules() There is no reason to dynamically allocate work_struct for ioc4_load_modules(). It makes the code more complex and makes it impossible to flush the work directly. Use static work ioc4_load_modules_work instead and flush it directly on exit. This removes the use of flush_scheduled_work() which is being deprecated. Signed-off-by: Tejun Heo Cc: Brent Casavant commit ee4569a3a75e1a5ed53b0c4ff4d9fc456aa98ef1 Author: Tejun Heo Date: Fri Dec 24 16:14:20 2010 +0100 init: don't call flush_scheduled_work() from do_initcalls() The call to flush_scheduled_work() in do_initcalls() is there to make sure all works queued to system_wq by initcalls finish before the init sections are dropped. However, the call doesn't make much sense at this point - there already are multiple different workqueues and different subsystems are free to create and use their own. Ordering requirements are and should be expressed explicitly. Drop the call to prepare for the deprecation and removal of flush_scheduled_work(). Andrew suggested adding sanity check where the workqueue code checks whether any pending or running work has the work function in the init text section. However, checking this for running works requires the worker to keep track of the current function being executed, and checking only the pending works will miss most cases. As a violation will almost always be caught by the usual page fault mechanism, I don't think it would be worthwhile to make the workqueue code track extra state just for this. Signed-off-by: Tejun Heo Cc: Andrew Morton commit 6dca467a76bb0ed71d65143b235e0ef80e44436f Author: Tejun Heo Date: Fri Dec 24 16:00:18 2010 +0100 s390: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * tape_3590: Create and use tape_3590_wq instead of the system_wq. * tape_block: Directly flush requeue_task on cleanup instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: linux390@de.ibm.com Cc: linux-s390@vger.kernel.org commit 9db8995be5e1869b5effa117909bc285e06fc09b Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 rtc: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. On removal, directly cancel the work, and flush the uie_task in rtc-dev.c::clear_uie(). Signed-off-by: Tejun Heo Cc: Alessandro Zummo Cc: rtc-linux@googlegroups.com commit 0d9ee5b2e9aac981fa063339daf04320eac610d1 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 mmc: update workqueue usages Workqueue creation API has been updated and flush_scheduled_work() is deprecated and scheduled to be removed. * core/core.c: Use alloc_ordered_workqueue() instead of create_singlethread_workqueue(). This removes an unnecessary rescuer. * host/omap.c: Create, use and flush mmc_omap_wq instead of the system_wq. * Flush host->mmc_carddetect_work directly on removal instead of using flush_scheduled_work(). Signed-off-by: Tejun Heo Cc: Chris Ball Cc: linux-mmc@vger.kernel.org commit afdb32f2e463a195c104555ac9a8cdd39a2b6561 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 mfd: update workqueue usages flush_scheduled_work() is deprecated and scheduled to be removed. * In menelaus, flush menelaus->work directly on probe failure. Also, make sure the work isn't running on removal. * In tps65010, cancel_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). While at it, remove unnecessary (void) casts on return value, and use schedule_delayed_work() and to_delayed_work() instead of using delayed_work's internal work field. Signed-off-by: Tejun Heo Cc: Samuel Ortiz commit 0d9c76aedbac3ad8ac4e99a2b441bc3f91dd6679 Author: Tejun Heo Date: Fri Dec 24 16:00:17 2010 +0100 dvb: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * Flush the used works directly. * Replace the deprecated cancel_rearming_delayed_work() + flush_scheduled_work() -> cancel_delayed_work_sync(). * Make sure mantis->uart_work isn't running on exit. Signed-off-by: Tejun Heo Cc: Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org commit 99ef21216b4f85c56392ed41500d2f07f58cc360 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 leds-wm8350: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush led->work on removal instead. Signed-off-by: Tejun Heo Cc: Richard Purdie commit 0d26aa704e5bbca5a1ee9fdf0d02277ceb507eee Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 mISDN: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ch->workq when freeing channel and cancel it on release. Signed-off-by: Tejun Heo Cc: Karsten Keil Cc: netdev@vger.kernel.org commit d9c612eb6e9ccb8192e6c4d609dbbf178020c672 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 macintosh/ams: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush ams_info.worker on detach instead. Signed-off-by: Tejun Heo commit a6665944ef83b6a2db8fc5b323c9fca92375a643 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 vmwgfx: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush info->deferred_work on removal instead. Signed-off-by: Tejun Heo Cc: Thomas Hellstrom commit 2e5c44c92046c41607794666ffc0d6945945acb0 Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 tpm: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush chip->work instead. Signed-off-by: Tejun Heo Cc: Debora Velarde Cc: Rajiv Andrade commit 3514870f06a7907bc46361aebc3daf5ea4e97eeb Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 sonypi: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush sonypi_device.input_work on removal instead. Signed-off-by: Tejun Heo Cc: Mattia Dongili commit 42565999d1e0b8a0c5b4a0d475c26cf3d567e85e Author: Tejun Heo Date: Fri Dec 24 15:59:07 2010 +0100 hvsi: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly cancel hp->writer and flush hp->handshaker instead. Signed-off-by: Tejun Heo Cc: Benjamin Herrenschmidt Cc: Paul Mackerras commit 30d65030fd14fd3696d927c5e452bee84c589b09 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 xen: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush info->work instead. Signed-off-by: Tejun Heo Cc: Jeremy Fitzhardinge Cc: Konrad Rzeszutek Wilk commit 0ead5c86ac4c9903da93c76716135bc29d9cd83b Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 gdrom: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush work on removal instead. Signed-off-by: Tejun Heo Cc: Jens Axboe commit 8aa0f413848708bca329c52358ae7a1a0e395b4e Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 floppy: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush floppy_work instead. Signed-off-by: Tejun Heo Cc: Jens Axboe commit 539253f6e13feedfa7bb6a3112c6707ebdf11e74 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 sh: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush psw->work on removal instead. Signed-off-by: Tejun Heo Cc: Paul Mundt Cc: linux-sh@vger.kernel.org commit fe413ec322e26179c788c678f24434b94cca34f0 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 arm/sharpsl: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush toggle_charger and sharpsl_bat works on suspend instead. Signed-off-by: Tejun Heo Cc: Russell King commit 5d8e4bddc635dd61ab8b3bcb75c59934e9c1e19f Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 ncpfs: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush the used works on stop instead. Signed-off-by: Tejun Heo Cc: Petr Vandrovec commit f094cfc6c382cec7b2c77dd7798576684153acbb Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 drm/ttm: use cancel_delayed_work_sync() in ttm_bo Make ttm_bo::ttm_bo_device_release call cancel_delayed_work_sync() instead of calling cancel_delayed_work() followed by flush_scheduled_work(). This is to prepare for the deprecation and removal of flush_scheduled_work(). Signed-off-by: Tejun Heo Cc:: Thomas Hellstrom Cc:: Dave Airlie commit 404437efc713b6c6fc8e2dc02978624bf4586e2d Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 pcmcia/ipwireless: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush the used works instead. Signed-off-by: Tejun Heo Acked-by: Jiri Kosina Acked-by: David Sterba commit 9b00a8182987e8b7028d97c2bee3319ef383b57a Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 ocfs2: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * cancel_delayed_work() + flush_schedule_work() -> cancel_delayed_work_sync(). * flush qs->qs_work directly on exit instead. Signed-off-by: Tejun Heo Acked-by: Joel Becker Cc: Mark Fasheh commit 7f6b0db9f63ba423d989e29f6318fe7e68760421 Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 net/dsa: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush dst->link_poll_work on remove instead. Signed-off-by: Tejun Heo Acked-by: Lennert Buytenhek commit 158fa67753e1eb3edfa5a2d1868666d89d1cf09f Author: Tejun Heo Date: Fri Dec 24 15:59:06 2010 +0100 isdn/capi: make kcapi use a separate workqueue flush_scheduled_work() is deprecated and will be removed. Because kcapi uses fire-and-forget type works, it's impossible to flush each work explicitly. Create and use a dedicated workqueue instead. Please note that with recent workqueue changes, each workqueue doesn't reserve a lot of resources and using it as a flush domain is fine. Signed-off-by: Tejun Heo Acked-by: Jan Kiszka commit 7fa5e85a0ab9ed5d2d8b77eec7976c88a5911bda Author: Tejun Heo Date: Fri Dec 24 15:59:05 2010 +0100 isdn/capi: unregister capictr notifier after init failure capidrv_init() could leave capictr notifier dangling after init failure. Fix it. Signed-off-by: Tejun Heo Acked-by: Jan Kiszka commit 62bcb91573425975d6ad2389d7ab1d8feca88ab4 Author: Mark Brown Date: Fri Dec 24 15:04:41 2010 +0100 PM: Prototype the pm_generic_ operations The pm_generic_ operations are all exported but are not prototyped in any header file for direct use. Do so. [rjw: Added extern.] Signed-off-by: Mark Brown Signed-off-by: Rafael J. Wysocki commit 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641 Author: Rafael J. Wysocki Date: Fri Dec 24 15:04:06 2010 +0100 PM / Runtime: Generic resume shouldn't set RPM_ACTIVE unconditionally The __pm_generic_resume() function changes the given device's runtime PM status to RPM_ACTIVE if its driver's callback returns 0, but it only should do that if the rumtime PM is enabled for the device. Signed-off-by: Rafael J. Wysocki commit 5c1a07ab3e78ef68fc9ccf419c969e8ed88d7cb6 Author: Rafael J. Wysocki Date: Fri Dec 24 15:03:34 2010 +0100 PM: Use dev_name() in core device suspend and resume routines Use dev_name() wherever applicable in drivers/base/power/main.c. Signed-off-by: Rafael J. Wysocki commit b64959e6158d6dcb640fc22d7f43b94ad1c91135 Author: Rafael J. Wysocki Date: Thu Dec 16 17:11:45 2010 +0100 PM: Permit registration of parentless devices during system suspend The registration of a new parentless device during system suspend will not lead to any complications affecting the PM core (the device will be effectively seen after the subsequent resume has completed), so remove the code used for detection of such events. Signed-off-by: Rafael J. Wysocki commit b8c76f6aed0ab7df73a6410f3f82de2c831bb144 Author: Rafael J. Wysocki Date: Thu Dec 16 00:51:21 2010 +0100 PM: Replace the device power.status field with a bit field The device power.status field is too complicated for its purpose (storing the information about whether or not the device is in the "active" state from the PM core's point of view), so replace it with a bit field and modify all of its users accordingly. Signed-off-by: Rafael J. Wysocki commit 5b219a51fdceaf76e0e18da57c7efb9e5586e567 Author: Rafael J. Wysocki Date: Thu Dec 16 00:51:08 2010 +0100 PM: Remove redundant checks from core device resume routines Since a separate list of devices is used to link devices that have completed each stage of suspend (or resume), it is not necessary to check dev->power.status in the core device resume routines any more. Signed-off-by: Rafael J. Wysocki commit 8a43a9ab7b329aa8590f8a064df9bf8c80987507 Author: Rafael J. Wysocki Date: Thu Dec 16 00:50:30 2010 +0100 PM: Use a different list of devices for each stage of device suspend Instead of keeping all devices in the same list during system suspend and resume, regardless of what suspend-resume callbacks have been executed for them already, use separate lists of devices that have had their ->prepare(), ->suspend() and ->suspend_noirq() callbacks executed. This will allow us to simplify the core device suspend and resume routines. Signed-off-by: Rafael J. Wysocki commit 2cbb3ce1ad19e66858a4284dd6c4bb958162c483 Author: Rafael J. Wysocki Date: Wed Dec 15 00:17:29 2010 +0100 PM: Avoid compiler warning in pm_noirq_op() The compiler complains that calltime may be uninitialized in pm_noirq_op(), so add extra initialization for that variable to avoid the warning. Signed-off-by: Rafael J. Wysocki commit d83f905e126f8cbc5e4addc5d1a64aea785b732e Author: Rafael J. Wysocki Date: Fri Dec 3 23:14:26 2010 +0100 PM: Use pm_wakeup_pending() in __device_suspend() Before starting to suspend a device in __device_suspend() check if there's a request to abort the power transition and return -EBUSY in that case. Signed-off-by: Rafael J. Wysocki commit a2867e08c8e3bdbc00caf56bc3bdde19ccc058e3 Author: Rafael J. Wysocki Date: Fri Dec 3 22:58:31 2010 +0100 PM / Wakeup: Replace pm_check_wakeup_events() with pm_wakeup_pending() To avoid confusion with the meaning and return value of pm_check_wakeup_events() replace it with pm_wakeup_pending() that will work the other way around (ie. return true when system-wide power transition should be aborted). Signed-off-by: Rafael J. Wysocki commit 1e75227ef0571031cd18536ab768ee35667ec5b9 Author: Rafael J. Wysocki Date: Fri Dec 3 22:58:05 2010 +0100 PM: Prevent dpm_prepare() from returning errors unnecessarily Currently dpm_prepare() returns error code if it finds that a device being suspended has a pending runtime resume request. However, it should not do that if the checking for wakeup events is not enabled. On the other hand, if the checking for wakeup events is enabled, it can return error when a wakeup event is detected, regardless of its source. Signed-off-by: Rafael J. Wysocki commit 7ac4dcabdb482d4e74c9d36782d00bc6c4c01619 Author: Jon Mason Date: Wed Dec 1 00:14:55 2010 +0100 PM: Fix references to basic-pm-debugging.txt in drivers-testing.txt basic-pm-debugging.txt is located in Documentation/power/ not Documents/power/. Change the references in Documentation/power/drivers-testing.txt to reflect the location. Signed-off-by: Jon Mason Signed-off-by: Rafael J. Wysocki commit c7b61de5b7b17f0df34dc7d2f8b9576f8bd36fce Author: Alan Stern Date: Wed Dec 1 00:14:42 2010 +0100 PM / Runtime: Add synchronous runtime interface for interrupt handlers (v3) This patch (as1431c) makes the synchronous runtime-PM interface suitable for use in interrupt handlers. Subsystems can call the new pm_runtime_irq_safe() function to tell the PM core that a device's runtime_suspend and runtime_resume callbacks should be invoked with interrupts disabled and the spinlock held. This permits the pm_runtime_get_sync() and the new pm_runtime_put_sync_suspend() routines to be called from within interrupt handlers. When a device is declared irq-safe in this way, the PM core increments the parent's usage count, so the parent will never be runtime suspended. This prevents difficult situations in which an irq-safe device can't resume because it is forced to wait for its non-irq-safe parent. Signed-off-by: Alan Stern Signed-off-by: Rafael J. Wysocki commit 5262a47502adcfc3a64403120768f528418a3b79 Author: MyungJoo Ham Date: Fri Nov 26 23:07:56 2010 +0100 PM / Hibernate: When failed, in_suspend should be reset When hibernation failed due to an error in swsusp_write() called by hibernate(), it skips calling "power_down()" and returns. When hibernate() is called again (probably after fixing up so that swsusp_write() wouldn't fail again), before "in_suspend = 1" of create_image is called, in_suspend should be 0. However, because hibernate() did not reset "in_suspend" after a failure, it's already 1. This patch fixes such inconsistency of "in_suspend" value. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Signed-off-by: Rafael J. Wysocki commit 5729c63a51f0f8a351e0f1dc7b3250ebac12c309 Author: MyungJoo Ham Date: Fri Nov 26 23:07:48 2010 +0100 PM / Hibernate: hibernation_ops->leave should be checked too Because hibernate calls hibernation_ops->leave() without checking whether hibernation_ops->leave is NULL or not, hiberantion_set_ops should WARN_ON if hibernation_ops->leave is NULL. This patch added one more condition to check hibernation_ops->leave. Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park Acked-by: Pavel Machek Signed-off-by: Rafael J. Wysocki commit 8cfe400ca54fd1ed96f962bea5f7e20b09b6d69f Author: Tejun Heo Date: Fri Nov 26 23:07:27 2010 +0100 Freezer: Fix a race during freezing of TASK_STOPPED tasks After calling freeze_task(), try_to_freeze_tasks() see whether the task is stopped or traced and if so, considers it to be frozen; however, nothing guarantees that either the task being frozen sees TIF_FREEZE or the freezer sees TASK_STOPPED -> TASK_RUNNING transition. The task being frozen may wake up and not see TIF_FREEZE while the freezer fails to notice the transition and believes the task is still stopped. This patch fixes the race by making freeze_task() always go through fake_signal_wake_up() for applicable tasks. The function goes through the target task's scheduler lock and thus guarantees that either the target sees TIF_FREEZE or try_to_freeze_task() sees TASK_RUNNING. Signed-off-by: Tejun Heo Signed-off-by: Rafael J. Wysocki commit 133f1128b2bf178a1976b17c54bd14ce6feb90bf Author: Tracey Dent Date: Thu Nov 25 23:41:29 2010 +0100 PM: Use proper ccflag flag in kernel/power/Makefile Use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Rafael J. Wysocki commit 6675bc056790b403d198a173498d377187754142 Author: Aaro Koskinen Date: Thu Nov 25 23:41:19 2010 +0100 PM / Runtime: Fix comments to match runtime callback code Commit 05aa55dddb9ee4045c320661068bea78dad6a6e5 changed routines to succeed if the driver handler is not defined. Comments were not updated. Signed-off-by: Aaro Koskinen Signed-off-by: Rafael J. Wysocki commit 617eecdb3d51624afca3be546b72fe80d8708370 Author: Mark Brown Date: Thu Dec 23 12:03:07 2010 +0000 ASoC: Remove WM8995 write sequencer bitfield definitions They're very verbose and extremely repetitive so bulk up the kernel more than is ideal. If required we can readd with WRITE_SEQUENCER_n type definitions that cover the entire register bank in a few defines. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 524d7692bcdbec9027bfdc001a8aeb6eb6837117 Author: Mark Brown Date: Thu Dec 23 11:17:24 2010 +0000 ASoC: Remove incorrect WM8903 erratum workaround Due to a typographical error in the erratum workaround it was never functional so just remove it. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1dee92bba36b491dbcc15e2cba40501403237f96 Author: Paul Mundt Date: Fri Dec 24 19:19:23 2010 +0900 sh: Tidy up SH-4A unaligned load support. The current implementation was rather tied to the packed_struct.h definitions, which immediately began to clash when the packed_struct.h types changed and drivers began to include packed_struct.h directly. In order to support this sort of use it's necessary to get out of the way with regards to namespace collisions, and at the same time we can also kill off some duplicate code now that the unaligned headers are a bit more broken out. Signed-off-by: Paul Mundt commit 3d29005ab8d828e36108ecc2338612ce3acdd86f Author: Shiraz Hashim Date: Thu Dec 23 11:32:41 2010 +0100 ARM: 6541/1: move sev definition to common system.h include file sev is used to send wakeup event to other cores in ARMv6K and above. This has been moved from platform specific part to standard common ARM header file (asm/system.h). Also introduced wfi() and wfe(). Signed-off-by: Shiraz Hashim Signed-off-by: Russell King commit 78368c79944b12f91bcacb0b0b030c36016264e8 Author: Srinidhi Kasagar Date: Wed Dec 22 13:18:58 2010 +0100 ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup Signed-off-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Russell King commit 67cfa23ac9df810d1fbf3a06b7f408243350ecfe Author: Russell King Date: Tue Dec 21 10:42:20 2010 +0000 Revert "ARM: relax ioremap prohibition (309caa9) for -final and -stable" This reverts commit 06c1088, as promised in the warning message. commit dec12e62c03d26bbc7a142f067215a3a43cce7d0 Author: Russell King Date: Thu Dec 16 13:49:34 2010 +0000 ARM: provide an early platform initialization hook This allows platforms to hook into the initialization early to setup things like scheduler clocks, etc. Signed-off-by: Russell King commit 8ff1443c5439ecee7472b80cf12ecfc337e6ee98 Author: Russell King Date: Mon Dec 20 10:18:36 2010 +0000 ARM: simplify early machine init hooks Rather than storing each machine init hook separately, store a pointer to the machine description record and dereference this instead. This pointer is only available while the init sections are present, which is not a problem as we only use it from init code. Signed-off-by: Russell King commit cd544ce754ac2432ffcc0626ea802d2b30876b50 Author: Magnus Damm Date: Wed Dec 22 13:20:08 2010 +0100 ARM: 6538/1: Subarch IRQ handler macros V3 Per subarch interrupt handler macros V3. This patch breaks out code from the irq_handler macro into arch_irq_handler and arch_irq_handler_default. The macros are put in the header file "entry-macro-multi.S" The arch_irq_handler_default macro is designed to be used by irq_handler in entry-armv.S while arch_irq_handler is suitable for per-subarch use. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 521086412ee423fbdfc7da81f257239c43f707b4 Author: eric miao Date: Mon Dec 13 09:42:34 2010 +0100 ARM: 6532/1: Allow machine to specify it's own IRQ handlers at run-time Normally different ARM platform has different way to decode the IRQ hardware status and demultiplex to the corresponding IRQ handler. This is highly optimized by macro irq_handler in entry-armv.S, and each machine defines their own macro to decode the IRQ number. However, this prevents multiple machine classes to be built into a single kernel. By allowing each machine to specify thier own handler, and making function pointer 'handle_arch_irq' to point to it at run time, this can be solved. And introduce CONFIG_MULTI_IRQ_HANDLER to allow both solutions to work. Comparing with the highly optimized macro of irq_handler, the new function must be written with care not to lose too much performance. And the IPI stuff on SMP is expected to move to the provided arch IRQ handler as well. The assembly code to invoke handle_arch_irq is optimized by Russell King. Signed-off-by: Eric Miao Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 206323c181371f3d5fab36c6d33e1fac09b61082 Merge: 25cf039 28bd2c3 Author: Russell King Date: Fri Dec 24 09:36:37 2010 +0000 Merge branch 'davinci-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci into devel-stable commit 55271024a735d0c3234e6ca7e0914b05aab7fbac Author: Wolfram Sang Date: Wed Nov 17 13:00:50 2010 +0100 powerpc/pcm{030,032}: add pagesize to dts Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 45efe847971e6274a04eea75a0745d8015b54d37 Author: Wolfram Sang Date: Wed Nov 17 13:00:49 2010 +0100 misc/at24: add more sanity checks for parameters Side-effects happen when passing 0 to either io_limit or page_size. Give an error in case of this misconfiguration. Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 9ed030d728f3bd03b6e869357da02725afda19a7 Author: Wolfram Sang Date: Wed Nov 17 13:00:48 2010 +0100 misc/at24: parse device tree data Information about the pagesize and read-only-status may also come from the devicetree. Parse this data, too, and act accordingly. While we are here, change the initialization printout a bit. write_max is useful to know to detect performance bottlenecks, the rest is superfluous. Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit 194588604765ac803f98fb9d19a36f6b835f4620 Author: David Daney Date: Wed Oct 27 18:03:47 2010 -0700 of/mdio: Fix some endianness problems. In of_mdiobus_register(), the __be32 *addr variable is dereferenced. This will not work on little-endian targets. Also since it is unsigned, checking for less than zero is redundant. Fix these two issues. Signed-off-by: David Daney [grant.likely@secretlab.ca: removed goto] Signed-off-by: Grant Likely commit 7063c0d942a1af2993531fbe52b4c74c1db818c4 Author: Feng Tang Date: Fri Dec 24 13:59:11 2010 +0800 spi/dw_spi: add DMA support dw_spi driver in upstream only supports PIO mode, and this patch will support it to cowork with the Designware dma controller used on Intel Moorestown platform, at the same time it provides a general framework to support dw_spi core to cowork with dma controllers on other platforms It has been tested with a Option GTM501L 3G modem and Infenion 60x60 modem. To use DMA mode, DMA controller 2 of Moorestown has to be enabled Also change the dma interface suggested by Linus Walleij. Acked-by: Linus Walleij Signed-off-by: Feng Tang [Typo fix and renames to match intel_mid_dma renaming] Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Grant Likely commit 79290a2aa2fd1c179a285218472092475630dc0e Author: Feng Tang Date: Fri Dec 24 13:59:10 2010 +0800 spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit ebf45b7d029eb065819bfede8b30455630d76c68 Author: Feng Tang Date: Fri Dec 24 13:59:09 2010 +0800 spi/dw_spi: Fix too short timeout in spi polling loop The SPI polling loop timeout only works with HZ=100 as the loop was actually too short. Also add appropriate cpu_relax() in the busy wait loops... Signed-off-by: Arjan van de Ven Signed-off-by: Alan Cox Signed-off-by: Feng Tang Signed-off-by: Grant Likely commit 5e8b821de333f472d33e3052a8dd1c43bf3ce433 Author: Linus Walleij Date: Wed Dec 22 23:13:59 2010 +0100 spi/pl022: convert running variable This variable is a bool but defined an int and defined completely backwards. This makes the code more readable. Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit dec5a581eb5b7d1abc90885d897d2468f1e60b21 Author: Linus Walleij Date: Wed Dec 22 23:13:48 2010 +0100 spi/pl022: convert busy flag to a bool Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 082086f2ce53c69260396e977d29972128def1d7 Author: Linus Walleij Date: Wed Dec 22 23:13:37 2010 +0100 spi/pl022: pass the returned sglen to the DMA engine The sglen return by the dma_map_sg() should be passed to the DMA engine, not the one passed in. If we one day have a DMA mapper that can coalesce entries, this will bug due to a too large number of entries being passed in. Reported-by: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit b729889686afb7d4366e07fe9c2f7a2737166462 Author: Linus Walleij Date: Wed Dec 22 23:13:07 2010 +0100 spi/pl022: map the buffers on the DMA engine The struct device for the DMA engine is the apropriate one to use when mapping/unmapping buffers. This is because the memory which is addressable by DMA is determined by the DMA engine rather than the device. Reported-by: Russell King Signed-off-by: Linus Walleij Signed-off-by: Grant Likely commit 9d32af66aa3a0e28d95fc607e208795ef6cc993a Author: Tomoya MORINAGA Date: Fri Dec 24 11:40:50 2010 +0900 spi/topcliff_pch: Fix data transfer issue It seems spi_topcliff_pch of linux-2.6.37-rc6 degraded by previous patch. In fact, data transfer fails on evaluation board testing. I found like the following register miss-setting line. Using this patch, I have confirmed data transfer can work well. Signed-off-by: Tomoya MORINAGA Signed-off-by: Grant Likely commit 893421745a052100b981401b7c5c6dc8708fb8a0 Author: Uwe Kleine-König Date: Wed Nov 24 10:05:46 2010 +0100 spi/imx: remove autodetection There are no machines in-tree that still use the driver name as device name. So save a few bytes and remove it. Signed-off-by: Uwe Kleine-König Acked-by: Jason Wang Signed-off-by: Grant Likely commit a387e95a49743cf9835c5299ca549232618d8249 Author: David Rientjes Date: Wed Dec 22 17:23:56 2010 -0800 x86, numa: Fix cpu to node mapping for sparse node ids NUMA boot code assumes that physical node ids start at 0, but the DIMMs that the apic id represents may not be reachable. If this is the case, node 0 is never online and cpus never end up getting appropriately assigned to a node. This causes the cpumask of all online nodes to be empty and machines crash with kernel code assuming online nodes have valid cpus. The fix is to appropriately map all the address ranges for physical nodes and ensure the cpu to node mapping function checks all possible nodes (up to MAX_NUMNODES) instead of simply checking nodes 0-N, where N is the number of physical nodes, for valid address ranges. This requires no longer "compressing" the address ranges of nodes in the physical node map from 0-N, but rather leave indices in physnodes[] to represent the actual node id of the physical node. Accordingly, the topology exported by both amd_get_nodes() and acpi_get_nodes() no longer must return the number of nodes to iterate through; all such iterations will now be to MAX_NUMNODES. This change also passes the end address of system RAM (which may be different from normal operation if mem= is specified on the command line) before the physnodes[] array is populated. ACPI parsed nodes are truncated to fit within the address range that respect the mem= boundaries and even some physical nodes may become unreachable in such cases. When NUMA emulation does succeed, any apicid to node mapping that exists for unreachable nodes are given default values so that proximity domains can still be assigned. This is important for node_distance() to function as desired. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit c1c3443c9c5e9be92641029ed229a41563e44506 Author: David Rientjes Date: Wed Dec 22 17:23:54 2010 -0800 x86, numa: Fake node-to-cpumask for NUMA emulation It's necessary to fake the node-to-cpumask mapping so that an emulated node ID returns a cpumask that includes all cpus that have affinity to the memory it represents. This is a little intrusive because it requires knowledge of the physical topology of the system. setup_physnodes() gives us that information, but since NUMA emulation ends up altering the physnodes array, it's necessary to reset it before cpus are brought online. Accordingly, the physnodes array is moved out of init.data and into cpuinit.data since it will be needed on cpuup callbacks. This works regardless of whether numa=fake is used on the command line, or the setup of the fake node succeeds or fails. The physnodes array always contains the physical topology of the machine if CONFIG_NUMA_EMU is enabled and can be used to setup the correct node-to-cpumask mappings in all cases since setup_physnodes() is called whenever the array needs to be repopulated with the correct data. To fake the actual mappings, numa_add_cpu() and numa_remove_cpu() are rewritten for CONFIG_NUMA_EMU so that we first find the physical node to which each cpu has local affinity, then iterate through all online nodes to find the emulated nodes that have local affinity to that physical node, and then finally map the cpu to each of those emulated nodes. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit f51bf3073a145a5b3263fd882c52d6ec04b687da Author: David Rientjes Date: Wed Dec 22 17:23:51 2010 -0800 x86, numa: Fake apicid and pxm mappings for NUMA emulation This patch adds the equivalent of acpi_fake_nodes() for AMD Northbridge platforms. The goal is to fake the apicid-to-node mappings for NUMA emulation so the physical topology of the machine is correctly maintained within the kernel. This change also fakes proximity domains for both ACPI and k8 code so the physical distance between emulated nodes is maintained via node_distance(). This exports the correct distances via /sys/devices/system/node/.../distance based on the underlying topology. A new helper function, fake_physnodes(), is introduced to correctly invoke the correct NUMA code to fake these two mappings based on the system type. If there is no underlying NUMA configuration, all cpus are mapped to node 0 for local distance. Since acpi_fake_nodes() is no longer called with CONFIG_ACPI_NUMA, it's prototype can be removed from the header file for such a configuration. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 4e76f4e67a106ed827ca721b4c8b622047cd2f6d Author: David Rientjes Date: Wed Dec 22 17:23:47 2010 -0800 x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU Both acpi_get_nodes() and amd_get_nodes() are only necessary when CONFIG_NUMA_EMU is enabled, so avoid compiling them when the option is disabled. Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 34dc9e74968ef4b582c3815b0124d88a68dfabef Author: David Rientjes Date: Wed Dec 22 17:23:40 2010 -0800 x86, numa: Reduce minimum fake node size to 32M This patch changes the minimum fake node size from 64MB to 32MB so it is possible to test NUMA code at a greater scale on smaller machines (64 nodes on a 2G machine, 1024 nodes on 32G machine with CONFIG_NODES_SHIFT=10). Signed-off-by: David Rientjes LKML-Reference: Signed-off-by: H. Peter Anvin commit 0131d8973c8b9bd9d40fee8fae24eab24821efdb Author: Sebastian Andrzej Siewior Date: Wed Dec 1 10:54:46 2010 +0100 of/address: use proper endianess in get_flags This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and such. Those variables are pointing to the device tree which contains integers in big endian format. Most functions are doing it right because of_read_number() is doing the right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and of_bus_isa_map() were accessing the data directly and were doing it wrong. Signed-off-by: Sebastian Andrzej Siewior Acked-by: Benjamin Herrenschmidt Signed-off-by: Grant Likely commit aa5cbf8a70f57c5360ce1bfef692b357c866ae7f Author: Giridhar Malavali Date: Tue Dec 21 16:00:27 2010 -0800 [SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 900a36e3277ac9109fe364a6a1420c71265f9377 Author: Giridhar Malavali Date: Tue Dec 21 16:00:26 2010 -0800 [SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 0ce87911491d4167198b863c102c7e4d09202561 Author: Giridhar Malavali Date: Tue Dec 21 16:00:25 2010 -0800 [SCSI] qla2xxx: Remove code to not reset ISP82xx on failure. Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit bc5c2aad17b045ea28ab69e6149c8130ab20731e Author: Andrew Vasquez Date: Tue Dec 21 16:00:24 2010 -0800 [SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 7a44b86e777fc5d7a267df984d12b05fca59f487 Author: Andrew Vasquez Date: Tue Dec 21 16:00:23 2010 -0800 [SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs. The semantics we employ now in the driver, performing a BIG_HAMMER in the event of Get-ID (0x20) mailbox command failing, should only be done for FC. On FC configurations, it makes sense since advertising is only really performed once, so a BIG_HAMMER to reinitiate the process is needed to restart. Under FCoE, this is not needed, as there's a continous stream of advertisements/ACks at the protocol layer to initiate a relogin/reinitialization process. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit f2019cb117f29ffaff961b5f6d5b3148d473de1d Author: Joe Carnuccio Date: Tue Dec 21 16:00:22 2010 -0800 [SCSI] qla2xxx: Remove redundant module parameter permission bits For driver module parameters that have permission bits set to (S_IRUGO|S_IRUSR), remove the second term since it is already included in the first term. S_IRUGO comes defined as (S_IRUSR|S_IRGRP|S_IROTH). Signed-off-by: Joe Carnuccio Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 794a5691147652387f4a2ffa890c5c1983e38849 Author: Andrew Vasquez Date: Tue Dec 21 16:00:21 2010 -0800 [SCSI] qla2xxx: Add sysfs node for displaying board temperature. Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 10fbb7dd36eb3014fe4b928e596d89e036ee6210 Author: Giridhar Malavali Date: Tue Dec 21 16:00:20 2010 -0800 [SCSI] qla2xxx: Code cleanup to remove unwanted comments and code. Signed-off-by: Giridhar Malavali Signed-off-by: Lalit Chandivade Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 710fc04da1abe48a33d54afb1ba33dbeceafb6e1 Author: Dirk Brandewie Date: Wed Dec 22 11:57:29 2010 -0800 microblaze/of: Use generic rule to build dtb's Modify arch/powerpc/boot/Makefile to use dtc command in scripts/Makefile.lib Signed-off-by: Dirk Brandewie Signed-off-by: Grant Likely commit 63849340621f7f5f963e4a9b9ba76add3ad54612 Author: Dirk Brandewie Date: Wed Dec 22 11:57:28 2010 -0800 of/powerpc: Use generic rule to build dtb's Modify arch/powerpc/boot/Makefile to use dtc command in scripts/Makefile.lib Signed-off-by: Dirk Brandewie Signed-off-by: Grant Likely commit c9e8fd5cfb7de50139a8aa0f70f9fe03311cdd01 Author: Madhuranath Iyengar Date: Tue Dec 21 16:00:19 2010 -0800 [SCSI] qla2xxx: Fix for memory wedge on fw halt for ISP82XX Signed-off-by: Swapnil Nagle Signed-off-by: Karen Higgins Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 21090cbe95189d4ce6135fc8fec2f416b3eb227f Author: Madhuranath Iyengar Date: Tue Dec 21 16:00:18 2010 -0800 [SCSI] qla2xxx: Update FCP priority information to firmware before sending IOs The FCP priority info was not being updated properly in certain situations. Here are the changes that needs to be done to take care of this issue: 1. No need to check fcport->state for FCS_UNCONFIGURED in qla24xx_update_fcport_fcp_prio(), since an invalid loop id check is already performed which is sufficient. 2. Add the missing qla24xx_update_fcport_fcp_prio() function call within qla2x00_update_fcport() function, so that the priority info is updated on every port addition or change. 3. Perform proper adapter types checking. 4. Other changes, associated with DEBUG/printk's and parameter passing. Signed-off-by: Saurav Kashyap Signed-off-by: Andrew Vasquez Signed-off-by: Giridhar Malavali Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 4052bd57234f119cef13b8997fcc852e2b2ce992 Author: Joe Carnuccio Date: Tue Dec 21 16:00:17 2010 -0800 [SCSI] qla2xxx: Fixed zero test on new_config in qla2x00_process_loopback(). Fixed the incorrect zero test on array new_config[]. Signed-off-by: Joe Carnuccio Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit ff8073fffc708a4959c2dd159c834f2516ce9703 Author: Andrew Vasquez Date: Tue Dec 21 16:00:16 2010 -0800 [SCSI] qla2xxx: Populate FCP_PRIO location for no *FLT* case Signed-off-by: Andrew Vasquez Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit 8ae598d02517af967685a671303c4ed10cded3c4 Author: Dan Carpenter Date: Tue Dec 21 16:00:15 2010 -0800 [SCSI] qla2xxx: list cursors are not null This is just a cleanup. The unneeded NULL check annoys static checkers because we already derefenced it and the we check it and then (if it's not the _safe() version) we dereference it again without checking. And the static checker is all, "Wah? Is it null or not?" Signed-off-by: Dan Carpenter Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit aab94339cd85d726abeae78fc02351fc1910e6a4 Author: Dirk Brandewie Date: Wed Dec 22 11:57:26 2010 -0800 of: Add support for linking device tree blobs into vmlinux This patch adds support for linking device tree blob(s) into vmlinux. Modifies asm-generic/vmlinux.lds.h to add linking .dtb sections into vmlinux. To maintain compatiblity with the of/fdt driver code platforms MUST copy the blob to a non-init memory location before the kernel frees the .init.* sections in the image. Modifies scripts/Makefile.lib to add a kbuild command to compile DTS files to device tree blobs and a rule to create objects to wrap the blobs for linking. STRUCT_ALIGNMENT is defined in vmlinux.lds.h for use in the rule to create wrapper objects for the dtb in Makefile.lib. The STRUCT_ALIGN() macro in vmlinux.lds.h is modified to use the STRUCT_ALIGNMENT definition. The DTB's are placed on 32 byte boundries to allow parsing the blob with driver/of/fdt.c during early boot without having to copy the blob to get the structure alignment GCC expects. A DTB is linked in by adding the DTB object to the list of objects to be linked into vmlinux in the archtecture specific Makefile using obj-y += foo.dtb.o Signed-off-by: Dirk Brandewie Acked-by: Michal Marek [grant.likely@secretlab.ca: cleaned up whitespace inconsistencies] Signed-off-by: Grant Likely commit 579d12b58abb4bd1161728f0a4a2524258ecf0a3 Author: Saurav Kashyap Date: Tue Dec 21 16:00:14 2010 -0800 [SCSI] qla2xxx: Added support for quiescence mode for ISP82xx. Support is added for quiescence mode. This feature is for P3P adapters. Any of the functions can put the firmware into quiescence state. All the others have to ack that request. During quiescence mode current commands are processed and all the new incoming I/Os are blocked. Loop resync is performed after firmware comes out of quiescence state. Signed-off-by: Saurav Kashyap Signed-off-by: Madhuranath Iyengar Signed-off-by: James Bottomley commit d3bd058826aa8b79590cca6c8e6d1557bf576ada Author: Yinghai Lu Date: Thu Dec 16 19:09:58 2010 -0800 x86, acpi: Parse all SRAT cpu entries even above the cpu number limitation Recent Intel new system have different order in MADT, aka will list all thread0 at first, then all thread1. But SRAT table still old order, it will list cpus in one socket all together. If the user have compiled limited NR_CPUS or boot with nr_cpus=, could have missed to put some cpus apic id to node mapping into apicid_to_node[]. for example for 4 sockets system with 64 cpus with nr_cpus=32 will get crash... [ 9.106288] Total of 32 processors activated (136190.88 BogoMIPS). [ 9.235021] divide error: 0000 [#1] SMP [ 9.235315] last sysfs file: [ 9.235481] CPU 1 [ 9.235592] Modules linked in: [ 9.245398] [ 9.245478] Pid: 2, comm: kthreadd Not tainted 2.6.37-rc1-tip-yh-01782-ge92ef79-dirty #274 /Sun Fire x4800 [ 9.265415] RIP: 0010:[] [] select_task_rq_fair+0x4f0/0x623 ... [ 9.645938] RIP [] select_task_rq_fair+0x4f0/0x623 [ 9.665356] RSP [ 9.665568] ---[ end trace 2296156d35fdfc87 ]--- So let just parse all cpu entries in SRAT. Also add apicid checking with MAX_LOCAL_APIC, in case We could out of boundaries of apicid_to_node[]. it fixes following bug too. https://bugzilla.kernel.org/show_bug.cgi?id=22662 -v2: expand to 32bit according to hpa need to add MAX_LOCAL_APIC for 32bit Reported-and-Tested-by: Wu Fengguang Reported-by: Bjorn Helgaas Tested-by: Myron Stowe Signed-off-by: Yinghai Lu LKML-Reference: <4D0AD486.9020704@kernel.org> Signed-off-by: H. Peter Anvin commit 56d91f132c9be66e98cce1b1e77a28027048bb26 Author: Yinghai Lu Date: Thu Dec 16 19:09:24 2010 -0800 x86, acpi: Add MAX_LOCAL_APIC for 32bit We should use MAX_LOCAL_APIC for max apic ids and MAX_APICS as number of local apics. Also apic_version[] array should use MAX_LOCAL_APICs. Signed-off-by: Yinghai Lu LKML-Reference: <4D0AD464.2020408@kernel.org> Signed-off-by: H. Peter Anvin commit fe31e69740eddc7316071ed5165fed6703c8cd12 Author: Rafael J. Wysocki Date: Sun Dec 19 15:57:16 2010 +0100 PCI/PCIe: Clear Root PME Status bits early during system resume I noticed that PCI Express PMEs don't work on my Toshiba Portege R500 after the system has been woken up from a sleep state by a PME (through Wake-on-LAN). After some investigation it turned out that the BIOS didn't clear the Root PME Status bit in the root port that received the wakeup PME and since the Requester ID was also set in the port's Root Status register, any subsequent PMEs didn't trigger interrupts. This problem can be avoided by clearing the Root PME Status bits in all PCI Express root ports during early resume. For this purpose, add an early resume routine to the PCIe port driver and make this driver be always registered, even if pci_ports_disable is set (in which case the driver's only function is to provide the early resume callback). Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit 99a0fadf561e1f553c08f0a29f8b2578f55dd5f0 Author: Tejun Heo Date: Wed Dec 22 10:06:36 2010 +0100 PCI: pci-stub: ignore zero-length id parameters pci-stub uses strsep() to separate list of ids and generates a warning message when it fails to parse an id. However, not specifying the parameter results in ids set to an empty string. strsep() happily returns the empty string as the first token and thus triggers the warning message spuriously. Make the tokner ignore zero length ids. Reported-by: Chris Wright Reported-by: Prasad Joshi Cc: stable@kernel.org Signed-off-by: Jesse Barnes commit 9b444b36fee16d2aaae9cc91ce594ecb15d922a9 Author: Seth Heasley Date: Wed Nov 17 12:12:08 2010 -0700 x86/PCI: irq and pci_ids patch for Intel Patsburg This patch adds an additional LPC Controller DeviceID for the Intel Patsburg PCH. Signed-off-by: Seth Heasley Signed-off-by: Jesse Barnes commit ee8abf783dd36f65440fd782ad16f9768631d998 Author: Yinghai Lu Date: Wed Nov 17 12:10:40 2010 -0800 PCI: Skip id checking if no id is passed Will get warning when pci stub driver is built-in kenel like: pci-stub: invalid id string "" So stop early if no id is passed. Signed-off-by: Yinghai Lu Signed-off-by: Jesse Barnes commit 23ea3793fd368fd6a1ea20659699e280e2996658 Author: Randy Dunlap Date: Thu Nov 18 15:02:31 2010 -0800 PCI: fix __pci_device_probe kernel-doc warning Fix kernel-doc warning for __pci_device_probe(): Warning(drivers/pci/pci-driver.c:341): missing initial short description on line: * __pci_device_probe() Signed-off-by: Randy Dunlap Signed-off-by: Jesse Barnes commit 1d3c16a818e992c199844954d95c17fd7ce6cbba Author: Jon Mason Date: Tue Nov 30 17:43:26 2010 -0600 PCI: make pci_restore_state return void pci_restore_state only ever returns 0, thus there is no benefit in having it return any value. Also, a large majority of the callers do not check the return code of pci_restore_state. Make the pci_restore_state a void return and avoid the overhead. Acked-by: Mauro Carvalho Chehab Signed-off-by: Jon Mason Signed-off-by: Jesse Barnes commit 2f671e2dbff6eb5ef4e2600adbec550c13b8fe72 Author: Matthew Garrett Date: Mon Dec 6 14:00:56 2010 -0500 PCI: Disable ASPM if BIOS asks us to We currently refuse to touch the ASPM registers if the BIOS tells us that ASPM isn't supported. This can cause problems if the BIOS has (for any reason) enabled ASPM on some devices anyway. Change the code such that we explicitly clear ASPM if the FADT indicates that ASPM isn't supported, and make sure we tidy up appropriately on device removal in order to deal with the hotplug case. If ASPM is disabled because the BIOS doesn't hand over control then we won't touch the registers. Signed-off-by: Matthew Garrett Signed-off-by: Jesse Barnes commit 8d805286968811223cca002134ba3d81244d5313 Author: Sheng Yang Date: Thu Nov 11 15:46:55 2010 +0800 PCI: Add mask bit definition for MSI-X table Then we can use it instead of magic number 1. Reviewed-by: Hidetoshi Seto Cc: Matthew Wilcox Signed-off-by: Sheng Yang Signed-off-by: Jesse Barnes commit 00aaaef9a51a1a25c5d6d52ce510772f149a0eb0 Author: Sheng Yang Date: Thu Nov 11 15:46:54 2010 +0800 PCI: MSI: Move MSI-X entry definition to pci_regs.h Then it can be used by others. Reviewed-by: Hidetoshi Seto Reviewed-by: Matthew Wilcox Signed-off-by: Sheng Yang Signed-off-by: Jesse Barnes commit 6ec1e077e36c5469a6f901ca9abbd9bd5d23e6ae Author: Felipe Balbi Date: Thu Dec 23 12:17:49 2010 -0800 arm: omap: tusb6010: add name for MUSB IRQ commit fcf173e4511193b1efeccb0f22a8c641b464353b (add names for IRQs in structure resource) forgot to take care of tusb6010 making it fail to probe due to a missing resource. Fix it. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 840b929680c0d79f5248724d1b6b6d3f2ca3159e Author: Srinath Date: Thu Dec 23 12:17:48 2010 -0800 arm: omap: craneboard: Add USB EHCI support AM3517/05 Craneboard has one EHCI interface on board using port1. GPIO35 is used as power enable. GPIO38 is used as port1 PHY reset. History: http://marc.info/?l=linux-omap&w=2&r=1&s=Craneboard%253A%2BAdd%2BUSB%2BEHCI%2Bsupport&q=b Signed-off-by: Srinath Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit e1928c86c4829703b800c81cc9edc939b5634e6f Author: Michael Chan Date: Thu Dec 23 07:43:04 2010 +0000 cnic: Add FCoE support on 57712 - Connection ID (cid) management - Slow-path command and response support - Update version to 2.2.11. Reviewed-by: Bhanu Prakash Gollapudi Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit e21ba414eed8a233eadb79bb6b158ac7ceb35025 Author: Michael Chan Date: Thu Dec 23 07:43:03 2010 +0000 cnic: Add kcq2 support on 57712 The kcq2 (2nd kernel work queue) is used by FCoE on 57712 devices. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 42ecbb8426aa229167d7f9d4b4e20f24bf42cb24 Author: Eddie Wai Date: Thu Dec 23 07:43:02 2010 +0000 cnic: Call cm_connect_complete() immediately on error If we get a path_resp error from userspace, call cm_connect_complete() immediately with error so that bnx2i can react to the error faster. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit eaaa6e9c222d5c398488ed4216f0fd94e4b81759 Author: Michael Chan Date: Thu Dec 23 08:38:30 2010 +0000 cnic: Check device state before reading the kcq pointer in IRQ If the device is down, the kcq pointer may be NULL. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 4aacb7afb6afd78efe26427e74fa56a5fc72fad3 Author: Michael Chan Date: Thu Dec 23 07:43:01 2010 +0000 cnic: Support NIC Partition mode Add a common function cnic_read_bnx2x_iscsi_mac() to read the iSCSI MAC address at any specified shared memory location. In NIC Partition mode, we need to get the MAC address from the MF_CFG area of shared memory. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 5159fdc1e6cb4000f482faebeeba0be91611276d Author: Michael Chan Date: Thu Dec 23 07:42:59 2010 +0000 cnic: Use proper client and connection IDs on iSCSI ring Use the IDs specified by the bnx2x driver when initializing the ring. We don't have to make code changes when these IDs change in the future. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 939b82e5bde56a98c72eccde2e3a88d32bffad4a Author: Michael Chan Date: Thu Dec 23 07:42:58 2010 +0000 cnic: Improve ->iscsi_nl_msg_send() 1. Change first parameter from cnic_dev to ulp_handle which is the hba pointer. All other similar upcalls are using hba pointer. The callee can then directly reference the hba without conversion. 2. Change return value from void to int so that an error code can be passed back. This allows the operation to be retried. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 8adc9240f98a816f7e9b3d93b9446a790110e062 Author: Michael Chan Date: Thu Dec 23 07:42:57 2010 +0000 cnic: Prevent "scheduling while atomic" when calling ->cnic_init() cnic_dev_list is protected by rtnl_lock and cnic_dev_lock spin_lock during modifications. When looping on cnic_dev_list and calling ->cnic_init(), we should just hold rtnl_lock since ->cnic_init() may sleep. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 9b09336072796378dac46df63bcd43291b24fd12 Author: Michael Chan Date: Thu Dec 23 07:42:56 2010 +0000 cnic: Fix iSCSI TCP port endian order. Pass the TCP port parameter for iSCSI connections to the firmware in proper endian order. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a130883d9528eefb66285728ba6a232d8fff9465 Merge: d9f4fba 65a6538 Author: David S. Miller Date: Thu Dec 23 10:13:30 2010 -0800 Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit d9f4fbaf7053af43e6c72909c2aff18654717aed Author: Jiri Kosina Date: Wed Dec 22 23:23:38 2010 +0000 tcp: cleanup of cwnd initialization in tcp_init_metrics() Commit 86bcebafc5e7f5 ("tcp: fix >2 iw selection") fixed a case when congestion window initialization has been mistakenly omitted by introducing cwnd label and putting backwards goto from the end of the function. This makes the code unnecessarily tricky to read and understand on a first sight. Shuffle the code around a little bit to make it more obvious. Signed-off-by: Jiri Kosina Signed-off-by: David S. Miller commit 94462ad3b14739d158a1ab87bb30008c1e5a6bc1 Author: Steven Rostedt Date: Mon Nov 29 13:15:42 2010 -0500 module: Move RO/NX module protection to after ftrace module update The commit: 84e1c6bb38eb318e456558b610396d9f1afaabf0 x86: Add RO/NX protection for loadable kernel modules Broke the function tracer with this output: ------------[ cut here ]------------ WARNING: at kernel/trace/ftrace.c:1014 ftrace_bug+0x114/0x171() Hardware name: Precision WorkStation 470 Modules linked in: i2c_core(+) Pid: 86, comm: modprobe Not tainted 2.6.37-rc2+ #68 Call Trace: [] warn_slowpath_common+0x85/0x9d [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] warn_slowpath_null+0x1a/0x1c [] ftrace_bug+0x114/0x171 [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ftrace_process_locs+0x1ae/0x274 [] ? __process_new_adapter+0x7/0x34 [i2c_core] [] ftrace_module_notify+0x39/0x44 [] notifier_call_chain+0x37/0x63 [] __blocking_notifier_call_chain+0x46/0x5b [] blocking_notifier_call_chain+0x14/0x16 [] sys_init_module+0x73/0x1f3 [] system_call_fastpath+0x16/0x1b ---[ end trace 2aff4f4ca53ec746 ]--- ftrace faulted on writing [] __process_new_adapter+0x7/0x34 [i2c_core] The cause was that the module text was set to read only before ftrace could convert the calls to mcount to nops. Thus, the conversions failed due to not being able to write to the text locations. The simple fix is to move setting the module to read only after the module notifiers are called (where ftrace sets the module mcounts to nops). Reported-by: Peter Zijlstra Acked-by: Rusty Russell Signed-off-by: Steven Rostedt commit 0d99d2b036974ed1160f9d10457b6054646fb7d6 Author: Peter Ujfalusi Date: Wed Dec 22 10:45:18 2010 +0200 ASoC: tlv320dac33: Add 32/24 bit audio support Add support for 24 bit audio (with S32_LE msbits 24). The reason to limit the msbits to 24, is that the FIFO can be configured for 16 or 24 bit layout. It is unknown how the codec would downsample from 32 to 24 bit, if the interface is configured to receive 32 bit data. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 549675ed658761b9a84cb579795c9ec1da227fea Author: Peter Ujfalusi Date: Wed Dec 22 10:45:17 2010 +0200 ASoC: tlv320dac33: Some cleanup for 32/24 bit support Change the structure of FIFO handling in order to pave the way for adding 32/24 bit audio support. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 3591f4cd53a3835e6d59dd509337503c2c61173e Author: Peter Ujfalusi Date: Wed Dec 22 10:45:16 2010 +0200 ASoC: tlv320dac33: Remove manual FIFO configuration The manual FIFO configuration was the first version to enable the use of the FIFO in the codec. It had served it's purpose as debugging aid, but the automatic FIFO configuration is much safer to use. The removal of the manual controls, and configuration makes it easier to add new features for the codec later, since the manual mode neded different ways to calculate, and protect against misconfiguration. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit f769bdf2a7ee97c8e762fc133ff00aabe935867b Author: Olaya, Margarita Date: Mon Dec 20 10:39:20 2010 -0600 ASoC: twl6040: Convert HF and HS drivers to use DAPM OUT_DRV widget Make the phoenix HS and HF drivers use the new DAPM driver widget in order to guarantee power ON/OFF order sequence. Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d4686c654bb1d7ea226578d5725ca34911d6e34c Author: Jorge Eduardo Candelaria Date: Mon Dec 20 11:32:47 2010 -0600 ASoC: mcbsp: Add McBSP support for OMAP4 This patch adds McBSP support for the OMAP4 CPU Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Acked-by: Peter Ujfalusi Acked-by: Jarkko Nikula Signed-off-by: Liam Girdwood commit 104db7ff1d9d01a03a2568a156b19e1fd972e8bf Merge: 4a7863c 32b2b6e Author: Ingo Molnar Date: Thu Dec 23 14:19:45 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit d08935711b542c3fe5c51abf290e172536d4cf09 Merge: 9d01df0 1435b94 Author: Takashi Iwai Date: Thu Dec 23 13:39:59 2010 +0100 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into topic/asoc commit 394f4528c523d88daabd50f883a8d6b164075555 Merge: 90a8a73 3c2dcf2 Author: Ingo Molnar Date: Thu Dec 23 12:57:04 2010 +0100 Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/rcu commit 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 Author: Ajay Ramaswamy Date: Thu Dec 23 01:19:39 2010 -0800 Input: wacom - add support for digitizer in Lenovo W700 Signed-off-by: Ajay Ramaswamy Reviewed-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit ef8313bb1a22e7d2125d9d758aa8a81f1de91d81 Author: Andres Salomon Date: Thu Dec 23 01:19:38 2010 -0800 Input: psmouse - disable the synaptics extension on OLPC machines OLPC has switched to a Synaptics touchpad. It turns out that it's pretty useless in absolute mode. This patch looks for an OLPC system (via DMI tables), and refuses to init Synaptics mode in that scenario (falling back to relative mode). Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 7ee99161a4febe53c906cb9becc596075fd6193e Author: Andres Salomon Date: Thu Dec 23 01:18:28 2010 -0800 Input: psmouse - fix up Synaptics comment Minor comment fixup for typos and grammar. Noticed while adding a separate workaround. Signed-off-by: Andres Salomon Signed-off-by: Dmitry Torokhov commit 26e20a108caca6231c6a5ec659f815a866904751 Merge: 691513f 90a8a73 Author: Ingo Molnar Date: Thu Dec 23 09:48:41 2010 +0100 Merge commit 'v2.6.37-rc7' into x86/security commit cfb13c5db08c90311a5defdde9a0328ee788cca5 Merge: 4b6ba8a 90a8a73 Author: Grant Likely Date: Thu Dec 23 00:41:14 2010 -0700 Merge commit 'v2.6.37-rc7' into devicetree/next commit b333fb16dcc50541df1930addea3eac03c838a4c Author: Sunyoung Kang Date: Thu Sep 16 11:11:45 2010 +0900 ARM: S5PV310: Update Kconfig and Makefile for supporting CPUFREQ This patch adds ARCH_HAS_CPUFREQ in Kconfig of ARCH_S5PV310 and updates Makefile for supporting build S5PV310 CPUFREQ driver. Signed-off-by: Sunyoung Kang Signed-off-by: Kukjin Kim commit 877d1b571d7763dbf57e38de2827177ad5369e64 Author: Jaecheol Lee Date: Thu Dec 23 14:25:31 2010 +0900 ARM: S5PV310: Add FOUT APLL get rate function FOUT APLL clock is used as a source of ARM core clock. So we need that the clock source can be changed dynamically by using CPUFREQ driver. This patch can give correct frequency when calling clk_get_rate() function. Signed-off-by: Jaecheol Lee Signed-off-by: Sangwook Ju Signed-off-by: Kukjin Kim commit bf5ce054f5ffdb9a2f5556edab07e86acec916ed Author: Sangwook Ju Date: Wed Dec 22 16:49:32 2010 +0900 ARM: S5PV310: Update CPUFREQ This patch updates following of CPUFREQ. - Updated DVFS table and divider value - Added common function - Added some function for changing APLL and setting Signed-off-by: Sangwook Ju Reviewed-by: Jaecheol Lee Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit f40f91fefcf3a9049bcfa31ac53bc0e775444dab Author: Sunyoung Kang Date: Thu Sep 16 17:59:21 2010 +0900 ARM: S5PV310: Add support CPUFREQ This patch adds support CPUFREQ driver for S5PV310 and S5PC210. This can support DVFS(Dynamic Voltage and Frequency Scaling). The voltage scaling depends on existence of regulator. Sigend-off-by: Sunyoung Kang Signed-off-by: Kukjin Kim commit dd0b7e20da906b40d55f24bb2dc21abd58ed3f55 Author: Sunyoung Kang Date: Wed Dec 22 07:21:17 2010 +0900 ARM: S5PV310: Add DMC registers and map_desc This patch adds DMC io mapping for access it and adds registers. This is used in checking DRAM memory type. Signed-off-by: Sunyoung Kang Signed-off-by: Kukjin Kim commit 09dc781e94b881d23e3c5da8c72d6832ae542938 Author: Sangwook Ju Date: Wed Dec 22 07:26:40 2010 +0900 ARM: S5PV310: Define missing CMU register for CPUFREQ This patch adds missing CMU(Clock Management Unit) registers for updated S5PV310 CPUFREQ driver. Signed-off-by: Sangwook Ju Signed-off-by: Sangbeom Kim Signed-off-by: Kukjin Kim commit 7af36b9787e19b4cbde9ee984e431d64b586784e Author: Sunyoung Kang Date: Sat Sep 18 10:59:31 2010 +0900 ARM: S5PV310: Update CMU registers for CPUFREQ This patch adds CMU(Clock Management Unit) registers for S5PV310/S5PC210 CPUFREQ driver and modifies some register names according to datasheet. Signed-off-by: Sunyoung Kang Signed-off-by: Kukjin Kim commit ce82ba80477c2cf3576f1e42c4c377e9995633a7 Merge: 5f7bb3a 047b7bd Author: James Bottomley Date: Wed Dec 22 23:29:40 2010 -0600 Merge branch 'block' commit 5f7bb3a439ce51ae8b92ca1dc93b91712224b69a Author: adam radford Date: Tue Dec 14 19:11:56 2010 -0800 [SCSI] megaraid_sas: Documentation update The following patch updates the Documentation/scsi/ChangeLog.megaraid_sas file. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 9c915a8c99bce637226aa09cb05fc18486b229cb Author: adam radford Date: Tue Dec 21 13:34:31 2010 -0800 [SCSI] megaraid_sas: Add 9565/9285 specific code This patch adds MegaRAID 9265/9285 (Device id 0x5b) specific code Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit cd50ba8ede5cd3c4606a8e5d163913da5ff36ad7 Author: adam radford Date: Tue Dec 21 10:23:23 2010 -0800 [SCSI] megaraid_sas: Add struct megasas_instance_template changes The following patch adds struct megasas_instance_template changes to the megaraid_sas driver, and changes all code to use the new instance entries: irqreturn_t (*service_isr )(int irq, void *devp); void (*tasklet)(unsigned long); u32 (*init_adapter)(struct megasas_instance *); u32 (*build_and_issue_cmd) (struct megasas_instance *, struct scsi_cmnd *); void (*issue_dcmd) (struct megasas_instance *instance, struct megasas_cmd *cmd); Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit b6d5d8808b4c563a56414a4c4c6d652b5f87c088 Author: adam radford Date: Tue Dec 14 18:56:07 2010 -0800 [SCSI] megaraid_sas: Use lowest memory bar for SR-IOV VF support The following patch modifies the megaraid_sas driver to select the lowest memory bar available so the driver will work in SR-IOV VF environments where the memory bar mapping changes. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 80d9da98b4034edd31f6bacdb96c7489c4460173 Author: adam radford Date: Tue Dec 21 10:17:40 2010 -0800 [SCSI] megaraid_sas: Add MSI-X support and msix_disable module parameter This patch adds MSI-X support and 'msix_disable' module parameter to the megaraid_sas driver. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 46081b166415acb66d4b3150ecefcd9460bb48a1 Author: FUJITA Tomonori Date: Mon Dec 20 18:44:45 2010 +0200 [SCSI] st: Increase success probability in driver buffer allocation Modify allocation to try the minimum possible page order allowed by the HBA scatter/gather segment limit in allocation of the driver's internal buffer. This increases the probability of successful allocation. The allocation may still fail if this minimum order is > 0. Signed-off-by: FUJITA Tomonori Signed-off-by: Kai Makisara Reported-by: Lukas Kolbe Signed-off-by: James Bottomley commit 373daacfce9ea0091cb3027572354ddebefb8ebb Author: Kai Makisara Date: Mon Dec 20 18:43:39 2010 +0200 [SCSI] st: Store page order before driver buffer allocation The order of the pages allocated for the driver buffer must be stored before allocation because it is used in freeing already allocated pages if allocation fails. Signed-off-by: Kai Makisara Reported-by: Lukas Kolbe Signed-off-by: James Bottomley commit a87e3a67d57472f40da2218793ff6d25c4518498 Author: Douglas Gilbert Date: Fri Dec 17 19:16:06 2010 -0500 [SCSI] scsi_debug: set resid to indicate no data-in when medium error set resid to the requested data-in length when a MEDIUM ERROR is simulated. This implies no valid data is returned in the data-in buffer Signed-off-by: Douglas Gilbert Signed-off-by: James Bottomley commit a8733c7baf457b071528e385a0b7d4aaec79287c Author: James Bottomley Date: Fri Dec 17 15:36:34 2010 -0500 [SCSI] fix medium error problems with some arrays which can cause data corruption Our current handling of medium error assumes that data is returned up to the bad sector. This assumption holds good for all disk devices, all DIF arrays and most ordinary arrays. However, an LSI array engine was recently discovered which reports a medium error without returning any data. This means that when we report good data up to the medium error, we've reported junk originally in the buffer as good. Worse, if the read consists of requested data plus a readahead, and the error occurs in readahead, we'll just strip off the readahead and report junk up to userspace as good data with no error. The fix for this is to have the error position computation take into account the amount of data returned by the driver using the scsi residual data. Unfortunately, not every driver fills in this data, but for those who don't, it's set to zero, which means we'll think a full set of data was transferred and the behaviour will be identical to the prior behaviour of the code (believe the buffer up to the error sector). All modern drivers seem to set the residual, so that should fix up the LSI failure/corruption case. Reported-by: Douglas Gilbert Cc: Stable Tree Signed-off-by: James Bottomley commit 0b50c691f93a973136dc821ef11372ffdfae9646 Author: Tony Lindgren Date: Wed Dec 22 18:42:36 2010 -0800 omap2+: Initialize serial port for dynamic remuxing for n8x0 Use omap_serial_init_port so we can let the serial code handle the remuxing of the RX pads. Note that this patch alone is not enough and additional GPIO related patches are needed. Only initialize uart3_rx_irrx pin, the other uart pins can be stay static. Signed-off-by: Tony Lindgren commit 40e44399301b6dbd997408a184140b79b77f632d Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add struct omap_board_data and use it for platform level serial init This is needed to pass board specific data such as pads used to the platform level driver init code. Signed-off-by: Tony Lindgren commit 8d9af88f55be89fa4c897ded3204ef12c947731e Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Allow hwmod state changes to mux pads based on the state changes Allow hwmod state changes to mux pads based on the state changes. By default, only enable and disable the pads. In some rare cases dynamic remuxing for the idles states is needed, this can be done by passing the enable, idle, and off pads from board-*.c file along with OMAP_DEVICE_PAD_REMUX flag. Thanks to Paul Walmsley for the comments on the hwmod related changes. Signed-off-by: Tony Lindgren commit 9796b323b5a1940f9ec62c3a6cf7e442bf540d53 Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add support for hwmod specific muxing of devices This allows adding hwmod specific pads dynamically during the platform device init. Note that we don't currently have the hwmod specific signals listed in the hwmod data, but struct omap_hwmod_mux_info will make that possible if necessary. Signed-off-by: Tony Lindgren commit 8419fdbaf2118a0a169441be82f09f7be93a5ca1 Author: Tony Lindgren Date: Wed Dec 22 18:42:35 2010 -0800 omap2+: Add omap_mux_get_by_name Do this by splitting _omap_mux_init_signal as it already has most of the necessary features. Based on an earlier patch by Dan Murphy . Cc: Dan Murphy Signed-off-by: Tony Lindgren commit db02754c8a1205b24beac70562c45ca5d671151f Author: Sunil Mushran Date: Wed Dec 22 12:39:42 2010 -0800 ocfs2/cluster: Show o2net timing statistics Adds debugfs dentry o2net/stats to show the o2net timing statistics. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit e453039f8bf44abf82f3ecfb34177e0cb04bce12 Author: Sunil Mushran Date: Wed Dec 22 12:39:41 2010 -0800 ocfs2/cluster: Track process message timing stats for each socket Tracks total time taken to process messages received on a socket. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 3c193b3807e933cf2a16d55a38debbe549195847 Author: Sunil Mushran Date: Wed Dec 22 12:39:40 2010 -0800 ocfs2/cluster: Track send message timing stats for each socket Tracks total send and status times for all messages sent on a socket. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit ff1becbf85bf4d4d4652915b7ab27db949585f6b Author: Sunil Mushran Date: Wed Dec 22 12:39:39 2010 -0800 ocfs2/cluster: Use ktime instead of timeval in struct o2net_sock_container Replace time trackers in struct o2net_sock_container from struct timeval to union ktime. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 3f9c14fab0a2e90af9995f261a123f59e0b41141 Author: Sunil Mushran Date: Wed Dec 22 12:39:38 2010 -0800 ocfs2/cluster: Replace timeval with ktime in struct o2net_send_tracking Replace time trackers in struct o2net_send_tracking from struct timeval to union ktime. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 8757241e32a295a2aa836e8f8b32912204d11fda Author: Sunil Mushran Date: Wed Dec 22 12:39:37 2010 -0800 ocfs2: Add DEBUG_FS dependency Make OCFS2_FS_STATS depend on DEBUG_FS. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 079ffb743c622fe2189b75614427c56e8391498b Author: Sunil Mushran Date: Mon Dec 20 16:35:01 2010 -0800 ocfs2/dlm: Hard code the values for enums In o2dlm, the enumerated message values are part of the protocol. The patch hard codes each value so as to reduce the chance of an editing error causing a protocol mismatch. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 37096a7927decb0b1d3c2514b8adb4583a834112 Author: Sunil Mushran Date: Mon Dec 20 16:35:00 2010 -0800 ocfs2/dlm: Minor cleanup Patch makes use of task_pid_nr(). Also removes the null check before calling debugfs_remove(). Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 02bd9c394ef64a16a313eb4d968a94b7000c5d00 Author: Sunil Mushran Date: Mon Dec 20 16:34:59 2010 -0800 ocfs2/dlm: Cleanup dlmdebug.c Remove struct debug_buffer in dlmdebug.c/h. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 1e6d9153df27923649976554d034a69ac7b28f95 Author: Tao Ma Date: Mon Dec 20 16:21:11 2010 +0800 ocfs2: Release buffer_head in case of error in ocfs2_double_lock. In ocfs2_double_lock, when ocfs2_inode_lock for inode1 fails, we just unlock inode2 and return without releasing buffer we get from inode_lock(inode2). The good thing is that it is freed by the only caller ocfs2_rename when it exits. But I don't think this is a right way for error handling. We should free the buffer_head we get in ocfs2_double_lock before exit so that the caller doesn't need to take care of it. Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 1435b9402fe0fb27ac4ec5bb271112de2c4806c0 Author: Mark Brown Date: Thu Dec 23 01:56:20 2010 +0000 ASoC: ifdef out trace points from modules for x86 No idea why this works on ARM but not x86. Signed-off-by: Mark Brown commit 17f9cc3124c97f50a19a7597e5f29f915b5b835c Author: Gustavo F. Padovan Date: Wed Dec 22 23:00:34 2010 -0200 Bluetooth: Improve handling of HCI control channel in bind Does not allow any channel different of HCI_CHANNEL_RAW and HCI_CHANNEL_CONTROL to bind. Signed-off-by: Gustavo F. Padovan commit 23bb57633df97ede067ea26f3cdc8a7ba2cd8109 Author: Johan Hedberg Date: Tue Dec 21 23:01:27 2010 +0200 Bluetooth: Fix __hci_request synchronization for hci_open_dev The initialization function used by hci_open_dev (hci_init_req) sends many different HCI commands. The __hci_request function should only return when all of these commands have completed (or a timeout occurs). Several of these commands cause hci_req_complete to be called which causes __hci_request to return prematurely. This patch fixes the issue by adding a new hdev->req_last_cmd variable which is set during the initialization procedure. The hci_req_complete function will no longer mark the request as complete until the command matching hdev->req_last_cmd completes. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit c71e97bfaadfa727669fcfcf12301744fd169091 Author: Johan Hedberg Date: Mon Dec 13 21:07:07 2010 +0200 Bluetooth: Add management events for controller addition & removal This patch adds Bluetooth Management interface events for controller addition and removal. The events correspond to the existing HCI_DEV_REG and HCI_DEV_UNREG stack internal events. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit f7b64e69c7c75c8e9f2d5e23edec8de1ce883bcc Author: Johan Hedberg Date: Mon Dec 13 21:07:06 2010 +0200 Bluetooth: Add read_info management command This patch implements the read_info command which is used to fetch basic info about an adapter. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit faba42eb2a8cf905ed26d540c3c93d429e327224 Author: Johan Hedberg Date: Mon Dec 13 21:07:05 2010 +0200 Bluetooth: Add read_index_list management command This patch implements the read_index_list command through which userspace can get a list of current adapter indices. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 02d981292ad3149e8e5f37cffbccedab1a8576d8 Author: Johan Hedberg Date: Mon Dec 13 21:07:04 2010 +0200 Bluetooth: Add read_version management command This patch implements the initial read_version command that userspace will use before any other management interface operations. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit e41d8b4e131a41f2a3b74aaa783b16aa46376d8e Author: Johan Hedberg Date: Mon Dec 13 21:07:03 2010 +0200 Bluetooth: Add error handling for managment command handlers The command handlers for bluetooth management messaging should be able to report errors (such as memory allocation failures) to the higher levels in the call stack. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 0caa102da82799efaba88e234484786a9591c797 Author: Li Zefan Date: Mon Dec 20 16:30:25 2010 +0800 Btrfs: Add BTRFS_IOC_SUBVOL_GETFLAGS/SETFLAGS ioctls This allows us to set a snapshot or a subvolume readonly or writable on the fly. Usage: Set BTRFS_SUBVOL_RDONLY of btrfs_ioctl_vol_arg_v2->flags, and then call ioctl(BTRFS_IOCTL_SUBVOL_SETFLAGS); Changelog for v3: - Change to pass __u64 as ioctl parameter. Changelog for v2: - Add _GETFLAGS ioctl. - Check if the passed fd is the root of a subvolume. - Change the name from _SNAP_SETFLAGS to _SUBVOL_SETFLAGS. Signed-off-by: Li Zefan commit b83cc9693f39689490970c19f6c5b866f6719a70 Author: Li Zefan Date: Mon Dec 20 16:04:08 2010 +0800 Btrfs: Add readonly snapshots support Usage: Set BTRFS_SUBVOL_RDONLY of btrfs_ioctl_vol_arg_v2->flags, and call ioctl(BTRFS_I0CTL_SNAP_CREATE_V2). Implementation: - Set readonly bit of btrfs_root_item->flags. - Add readonly checks in btrfs_permission (inode_permission), btrfs_setattr, btrfs_set/remove_xattr and some ioctls. Changelog for v3: - Eliminate btrfs_root->readonly, but check btrfs_root->root_item.flags. - Rename BTRFS_ROOT_SNAP_RDONLY to BTRFS_ROOT_SUBVOL_RDONLY. Signed-off-by: Li Zefan commit fa0d2b9bd717340e0bc4850a80ac0eb344e9a7fb Author: Li Zefan Date: Mon Dec 20 15:53:28 2010 +0800 Btrfs: Refactor btrfs_ioctl_snap_create() Split it into two functions for two different ioctls, since they share no common code. Signed-off-by: Li Zefan commit f622691c91cd1bb27d03a5caa8a43822572c62bc Author: Tomoya Date: Wed Dec 22 03:00:39 2010 +0000 pch_can: Fix array miss-pointing issue Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 05fad3e72e98e57274b8930a08f8b476048f5022 Author: Kevin Hilman Date: Wed Dec 22 23:04:17 2010 +0000 OMAP2: PM: fix compile error when !CONFIG_SUSPEND When CONFIG_SUSPEND is not enabled, none of the system PM methods are used, so do not compile them in. Thanks to Charles Manning for reporting the problem and proposing an initial patch. Reported-by: Charles Manning Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 1c4655651f1377297425525b250b2e4b5462015b Merge: f400c82 b35cecf Author: Tony Lindgren Date: Wed Dec 22 15:08:05 2010 -0800 Merge branch 'pm-sr' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit f400c82efb474b2ccf01c796b60b36408f7845a3 Author: Paul Walmsley Date: Mon Dec 6 19:08:54 2010 -0700 MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership Add myself and Benoît as co-maintainers of the OMAP hwmod core code. (The OMAP hwmod code manages the integration of IP blocks on the OMAP SoC family.) Add Benoît as the maintainer of OMAP4-based SoC hwmod mode. Signed-off-by: Paul Walmsley Signed-off-by: Benoît Cousson Signed-off-by: Tony Lindgren commit 25cf0398bdf365d027e171116aa4a281e9cd3c1c Merge: 9326845 59bdd13 Author: Russell King Date: Wed Dec 22 22:46:24 2010 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit 1da0c89c66753860ccfe81eb327c25db46c2a24a Author: Russell King Date: Wed Dec 15 21:56:47 2010 +0000 ARM: versatile: convert sched_clock() to use new infrastructure Convert versatile platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Will Deacon Signed-off-by: Russell King commit f06a1624621527ef597ae4b3b795553fc1b2eff2 Author: Russell King Date: Wed Dec 15 21:55:06 2010 +0000 ARM: orion: convert sched_clock() to use new infrastructure Convert orion platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Nicolas Pitre Signed-off-by: Russell King commit dc548fbbd2ecd0fc3b02301d551e5f8e19ae58fd Author: Russell King Date: Wed Dec 15 21:53:51 2010 +0000 ARM: omap: convert sched_clock() to use new infrastructure Convert omap to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Santosh Shilimkar Signed-off-by: Russell King commit ec05aa139939d9c7b790041a379f0e752b2f1a4d Author: Russell King Date: Wed Dec 15 21:53:02 2010 +0000 ARM: nomadik: convert sched_clock() to use new infrastructure Convert nomadik platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Linus Walleij Signed-off-by: Russell King commit 08f26b1ef25a2f7b52afcb805d260fd5a000a7f6 Author: Russell King Date: Wed Dec 15 21:52:10 2010 +0000 ARM: iop: convert sched_clock() to use new infrastructure Convert iop platforms to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 5c21b7ca2c1cca3758a1d357dd57987c96ad1aa0 Author: Russell King Date: Wed Dec 15 21:50:14 2010 +0000 ARM: u300: convert sched_clock() to use new infrastructure Convert u300 to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Acked-by: Linus Walleij Signed-off-by: Russell King commit e3f4c0ab916334e861fc49eeb2673a8c13e978e7 Author: Russell King Date: Wed Dec 15 21:49:42 2010 +0000 ARM: tegra: convert sched_clock() to use new infrastructure Convert tegra to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Olof Johansson Signed-off-by: Russell King commit 5094b92f1c7d0f21c5d4411ba7415bac0684210f Author: Russell King Date: Wed Dec 15 21:49:06 2010 +0000 ARM: sa1100: convert sched_clock() to use new infrastructure Convert sa1100 to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 7ce830188199c23aaeaf0c5ccc28b73c32b6df02 Author: Russell King Date: Wed Dec 15 21:48:15 2010 +0000 ARM: pxa: convert sched_clock() to use new infrastructure Convert pxa to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Eric Miao Signed-off-by: Russell King commit 28bb7bc61a8cd48716d38d9c153fdc524f09870a Author: Russell King Date: Wed Dec 15 21:46:48 2010 +0000 ARM: mmp: convert sched_clock() to use new infrastructure Convert mmp to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Signed-off-by: Russell King commit 5b0d495c067d843c52fc1f9edbca29d5e9368b10 Author: Russell King Date: Wed Dec 15 21:23:13 2010 +0000 ARM: ixp4xx: convert sched_clock() to use new infrastructure Convert ixp4xx to use the new sched_clock() infrastructure for extending 32bit counters to full 64-bit nanoseconds. Tested-by: Mikael Pettersson Signed-off-by: Russell King commit 112f38a4a31668eb6a7d91d128296a26afdf7c4b Author: Russell King Date: Wed Dec 15 19:23:07 2010 +0000 ARM: sched_clock: provide common infrastructure for sched_clock() Provide common sched_clock() infrastructure for platforms to use to create a 64-bit ns based sched_clock() implementation from a counter running at a non-variable clock rate. This implementation is based upon maintaining an epoch for the counter and an epoch for the nanosecond time. When we desire a sched_clock() time, we calculate the number of counter ticks since the last epoch update, convert this to nanoseconds and add to the epoch nanoseconds. We regularly refresh these epochs within the counter wrap interval. We perform a similar calculation as above, and store the new epochs. We read and write the epochs in such a way that sched_clock() can easily (and locklessly) detect when an update is in progress, and repeat the loading of these constants when they're known not to be stable. The one caveat is that sched_clock() is not called in the middle of an update. We achieve that by disabling IRQs. Finally, if the clock rate is known at compile time, the counter to ns conversion factors can be specified, allowing sched_clock() to be tightly optimized. We ensure that these factors are correct by providing an initialization function which performs a run-time check. Acked-by: Peter Zijlstra Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Tested-by: Jamie Iles Reviewed-by: Nicolas Pitre Signed-off-by: Russell King commit b5776c4a6d0afc13697e8452b9ebe1cc4d961b74 Author: john stultz Date: Thu Dec 16 19:03:27 2010 +0000 Fix rounding in clocks_calc_mult_shift() Russell King reports: | On the ARM dev boards, we have a 32-bit counter running at 24MHz. Calling | clocks_calc_mult_shift(&mult, &shift, 24MHz, NSEC_PER_SEC, 60) gives | us a multiplier of 2796202666 and a shift of 26. | | Over a large counter delta, this produces an error - lets take a count | from 362976315 to 4280663372: | | (4280663372-362976315) * 2796202666 / 2^26 - (4280663372-362976315) * (1000/24) | => -38.91872422891230269990 | | Can we do better? | | (4280663372-362976315) * 2796202667 / 2^26 - (4280663372-362976315) * (1000/24) | 19.45936211449532822051 | | which is about twice as good as the 2796202666 multiplier. | | Looking at the equivalent divisions obtained, 2796202666 / 2^26 gives | 41.66666665673255920410ns per tick, whereas 2796202667 / 2^26 gives | 41.66666667163372039794ns. The actual value wanted is 1000/24 = | 41.66666666666666666666ns. Fix this by ensuring we round to nearest when calculating the multiplier. Signed-off-by: John Stultz Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Tested-by: Jamie Iles Signed-off-by: Russell King commit 5e06b6492e53ab2a4e467763a9ee9f70b032c301 Author: Russell King Date: Wed Dec 15 19:19:25 2010 +0000 ARM: ensure all sched_clock() implementations are notrace marked ftrace requires sched_clock() to be notrace. Ensure that all implementations are so marked. Also make sure that they include linux/sched.h Also ensure OMAP clocksource read functions are marked notrace as they're used for sched_clock() too. Tested-by: Santosh Shilimkar Tested-by: Will Deacon Tested-by: Mikael Pettersson Tested-by: Eric Miao Tested-by: Olof Johansson Signed-off-by: Russell King commit 684e94cbcb5add60356d124166e40feb2174f0f1 Author: Colin Cross Date: Wed Nov 17 16:20:15 2010 -0800 ARM: tegra: timer: Separate clocksource and sched_clock tegra_clocksource_read should not use cnt32_to_63, wrapping is already handled in the clocksource code. Move the cnt32_to_63 into the sched_clock function, and replace the use of clocksource mult and shift with a multiplication by 1000 to convert us to ns. Acked-by: John Stultz Acked-by: Linus Walleij Tested-by: Olof Johansson Signed-off-by: Colin Cross Signed-off-by: Russell King commit 11e718a6535c0c7a375b24c3ad60a98b988090c8 Author: Russell King Date: Mon Dec 13 13:21:52 2010 +0000 ARM: realview/versatile: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Will Deacon Signed-off-by: Russell King commit 2218543fe0c40ce36fa165c5003072cc8b236c34 Author: Russell King Date: Mon Dec 13 13:21:41 2010 +0000 ARM: stmp: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af Author: Russell King Date: Mon Dec 13 13:21:33 2010 +0000 ARM: orion: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Nicolas Pitre Signed-off-by: Russell King commit e0387320c32d4b9852e6436233274003e82318a6 Author: Russell King Date: Mon Dec 13 13:21:21 2010 +0000 ARM: spear: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Viresh Kumar Signed-off-by: Russell King commit 8492fd28987732e42f33a3711299927e8905d448 Author: Russell King Date: Mon Dec 13 13:20:49 2010 +0000 ARM: nomadik: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Linus Walleij Signed-off-by: Russell King commit 509e1f0fd7627a5b8d2da9e8c2b4ab1c2743c5f6 Author: Russell King Date: Mon Dec 13 13:20:35 2010 +0000 ARM: mxc: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Sascha Hauer Signed-off-by: Russell King commit d28b116b9239b603f790a5ed6f0c5fe329561b49 Author: Russell King Date: Mon Dec 13 13:20:23 2010 +0000 ARM: iop: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 894cf56b1a64b65360086c2c890c2ae7f257793f Author: Russell King Date: Mon Dec 13 13:20:06 2010 +0000 ARM: nuc: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Wan zongshun Signed-off-by: Russell King commit da797478c1ba05a858c7719a02ce0856a5bb69ce Author: Russell King Date: Mon Dec 13 13:19:55 2010 +0000 ARM: U300: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Linus Walleij Signed-off-by: Russell King commit 6b46340a18e7552656097119d121b4b42049dde1 Author: Russell King Date: Mon Dec 13 13:19:44 2010 +0000 ARM: tcc8k: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 2c760b5b52a56e8b92c384dc9611e23fd4980d03 Author: Russell King Date: Mon Dec 13 13:19:35 2010 +0000 ARM: SA11x0: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 71c874529904818a2888a650425369e0842ff28d Author: Russell King Date: Mon Dec 13 13:19:22 2010 +0000 ARM: s5pv310: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Kukjin Kim Signed-off-by: Russell King commit f62ae0ce4369effc432ea25df09c88d7aa08965e Author: Russell King Date: Mon Dec 13 13:19:11 2010 +0000 ARM: PXA: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Eric Miao Signed-off-by: Russell King commit 8437c25e78c3af2b31bf6c8942494e34e267f446 Author: Russell King Date: Mon Dec 13 13:18:44 2010 +0000 ARM: omap: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Santosh Shilimkar Signed-off-by: Russell King commit b460ddbbe29a45cc13e3f13314ec9aed7e9412f2 Author: Russell King Date: Mon Dec 13 13:18:32 2010 +0000 ARM: ns9xxx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 4f9272bfe8fca7e6d9e2f44eb78fd2c3ecdf9a0e Author: Russell King Date: Mon Dec 13 13:18:21 2010 +0000 ARM: netx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit ff9c9772480f06bc7164217b93ebb99fc088539f Author: Russell King Date: Mon Dec 13 13:18:12 2010 +0000 ARM: MSM: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-By: Jeff Ohlstein Acked-by: David Brown Signed-off-by: Russell King commit 5975f496e07e0f1e396939308b815f99907440ea Author: Russell King Date: Mon Dec 13 13:18:04 2010 +0000 ARM: mmp: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 594cbf2f4ceaaacc706eb1302ff139a61092ec6f Author: Russell King Date: Mon Dec 13 13:17:52 2010 +0000 ARM: lpc32xx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit b7c7c50adcf0d9c901542c5db8d795fe226bb454 Author: Russell King Date: Mon Dec 13 13:17:40 2010 +0000 ARM: ixp4xx: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Tested-by: Mikael Pettersson Signed-off-by: Russell King commit 08963dab7c6b0ba6a687cb008299eabbbeff7282 Author: Russell King Date: Mon Dec 13 13:17:24 2010 +0000 ARM: integrator: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Signed-off-by: Russell King commit 7c044be50d4bdc33e039a65956b8a927feecaaa3 Author: Russell King Date: Mon Dec 13 13:17:12 2010 +0000 ARM: davinci: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Kevin Hilman Tested-by: Kevin Hilman Signed-off-by: Russell King commit 6eda51192fb1c767f792e92c67b9a4fd73c1fcba Author: Russell King Date: Mon Dec 13 13:16:39 2010 +0000 ARM: bcmring: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-By: Scott Branden Acked-By: Jiandong Zheng Signed-off-by: Russell King commit 32b2b6ec57a3adb3ab7215fbf36ec61c15de06ee Author: Franck Bui-Huu Date: Wed Dec 22 17:37:13 2010 +0100 perf probe: Fix wrong warning in __show_one_line() if read(1) errors happen This was introduced by commit fde52dbd7f71934aba4e150f3d1d51e826a08850. Cc: H. Peter Anvin Cc: Masami Hiramatsu Cc: Ingo Molnar Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit d3678758048308049cdad31ec3eae063be17c0db Author: Arnaldo Carvalho de Melo Date: Tue Dec 21 23:38:37 2010 -0200 perf test: Look forward for symbol aliases Not just before, fixing these false positives: [acme@mica linux]$ perf test -v 1 1: vmlinux symtab matches kallsyms: --- start --- Looking at the vmlinux_path (6 entries long) Using //lib/modules/2.6.37-rc5-00180-ge06b6bf/build/vmlinux for symbols 0xffffffff81058dc0: diff name v: sys_vm86old k: sys_ni_syscall 0xffffffff81058dc0: diff name v: sys_vm86 k: sys_ni_syscall 0xffffffff81058dc0: diff name v: sys_subpage_prot k: sys_ni_syscall 0xffffffff810b5f7c: diff name v: probe_kernel_write k: __probe_kernel_write 0xffffffff810b5fe5: diff name v: probe_kernel_read k: __probe_kernel_read 0xffffffff811bc380: diff name v: __memset k: memset 0xffffffff81384a98: diff name v: __sched_text_start k: sleep_on_common 0xffffffff81386750: diff name v: __sched_text_end k: _raw_spin_trylock 0xffffffff8138cee8: diff name v: __irqentry_text_start k: do_IRQ 0xffffffff8138f079: diff name v: __start_notes k: _etext 0xffffffff8138f079: diff name v: __stop_notes k: _etext ---- end ---- vmlinux symtab matches kallsyms: FAILED! [acme@mica linux]$ Some are weak functions, others are just markers, etc. They get in the rb tree with the same addr, so we need to look around to find the symbol with the same name. We were looking just at the previous entries with the same addr, look forward too. Cc: Frederic Weisbecker Cc: Han Pingtian Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit b35cecf978e33bf8f4be0f36ffe00fe10f381c4a Author: Thara Gopinath Date: Wed Aug 18 12:23:12 2010 +0530 OMAP4: Smartreflex framework extensions This patch extends the smartreflex framework to support OMAP4. The changes are minor like compiling smartreflex Kconfig option for OMAP4 also, and a couple of OMAP4 checks in the smartreflex framework. The change in sr_device.c where new logic has to be introduced for reading the efuse registers is due to the fact that in OMAP4 the efuse registers are 24 bit aligned. A __raw_readl will fail for non-32 bit aligned address and hence the 8-bit read and shift. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fb200cfb2330b959eabc94e2f2c15717ce8466af Author: Benoit Cousson Date: Wed Aug 18 12:22:52 2010 +0530 OMAP4: hwmod: Add inital data for smartreflex modules. This patch adds the hwmod details for OMAP4 smartreflex modules. Signed-off-by: Benoit Cousson Signed-off-by: Kevin Hilman commit 1376ee1d191b32d0be6d2956f1a6f3dd63251e2e Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP4: PM: Program correct init voltages for scalable VDDs By default the system boots up at nominal voltage for every voltage domain in the system. This patch puts vdd_mpu, vdd_iva and vdd_core to the correct boot up voltage as per the opp tables specified. This patch implements this by matching the rate of the main clock of the voltage domain with the opp table and picking up the correct voltage. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit bd38107b565a41d994aa22db0962ffcc34ebef02 Author: Thara Gopinath Date: Fri Dec 10 23:15:23 2010 +0530 OMAP4: Adding voltage driver support OMAP4 has three scalable voltage domains vdd_mpu, vdd_iva and vdd_core. This patch adds the voltage tables and other configurable voltage processor and voltage controller settings to control these three scalable domains in OMAP4. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 3b01a413c196c91040d41c86e5b56f76bb369f74 Author: Arnaldo Carvalho de Melo Date: Wed Dec 22 01:08:36 2010 -0200 perf symbols: Improve kallsyms symbol end addr calculation For kallsyms we don't have the symbol address end, so we do an extra pass and set the symbol end addr as being the start of the next minus one. But this was being done just after we filtered the symbols of a particular type (functions, variables), so the symbol end was sometimes after what it really is. Fixing up symbol end also was falling apart when we have symbol aliases, then the end address of all but the last alias was being set to be before its start. Fix it up by checking for symbol aliases and making the kallsyms__parse routine use the next symbol, whatever its type, as the limit for the previous symbol, passing that end address to the callback. This was detected by the 'perf test' synthetic paranoid regression tests, fix it up so that even that case doesn't mislead us. Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 7bc3ed9ae632b9c94d3721d555d3452e24ca8ee3 Author: Thara Gopinath Date: Fri Dec 10 23:15:16 2010 +0530 OMAP4: Register voltage PMIC parameters with the voltage layer TWL6030 is the power IC used along with OMAP4 in OMAP4 SDPs, blaze boards and panda boards. This patch registers the OMAP4 PMIC specific information with the voltage layer. This also involves implementing a different formula for voltage to vsel and vsel to voltage calculations from TWL4030. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 1482d8be5525eccdec6286677d40af29da03a30c Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP3: PM: Program correct init voltages for VDD1 and VDD2 By default the system boots up at nominal voltage for every voltage domain in the system. This patch puts VDD1 and VDD2 to the correct boot up voltage as per the opp tables specified. This patch implements this by matching the rate of the main clock of the voltage domain with the opp table and picking up the correct voltage. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 077fceca3a5db69791d64723ffba1caad2f03a08 Author: Thara Gopinath Date: Wed Oct 27 20:29:37 2010 +0530 OMAP3: PM: Adding debug support to Voltage and Smartreflex drivers This patch adds debug support to the voltage and smartreflex drivers. This means a whole bunch of voltage processor and smartreflex parameters are now visible through the pm debugfs. The voltage parameters can be viewed at /debug/voltage/vdd_/ and the smartreflex parameters can be viewed at /debug/voltage/vdd_/smartreflex/ Also smartreflex n-target values are now exposed out at /debug/voltage/vdd_/smartreflex/nvalue/ This is a read-write interface which means user has the flexibility to change the n-target values for any opp. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fbc319f67660ede23cc22f3af5df559693f8062e Author: Thara Gopinath Date: Fri Dec 10 22:51:05 2010 +0530 OMAP3: PM: Register TWL4030 pmic info with the voltage driver. This patch registers the TWL4030 PMIC specific informtion with the voltage driver. Failing this patch the voltage driver is unware of the formula to use for vsel to voltage and vice versa conversion and lot of other PMIC dependent parameters. This file is based on the arch/arm/plat-omap opp_twl_tpl.c file by Paul Walmsley. The original file is replaced by this file. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit fa765823a3cbb9ce1b13ce2832109a50d899c471 Author: Thara Gopinath Date: Sat May 29 22:02:25 2010 +0530 OMAP3: PM: Adding smartreflex class3 driver Smartreflex Class3 implementation continuously monitors silicon performance and instructs the Voltage Processors to increase or decrease the voltage. This patch adds smartreflex class 3 driver. This driver hooks up with the generic smartreflex driver smartreflex.c to abstract out class specific implementations out of the generic driver. Class3 driver is chosen as the default class driver for smartreflex. If any other class driver needs to be implemented, the init of that driver should be called from the board file. That way the new class driver will over-ride the Class3 driver. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit d34427267186827dfd62bd8cf726601fffb22534 Author: Thara Gopinath Date: Sat May 29 22:02:24 2010 +0530 OMAP3: PM: Adding smartreflex hwmod data This patch adds the smartreflex hwmod data for OMAP3430 and OMAP3630. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 0c0a5d61ed9319e7e666990a7888f3b00868ac20 Author: Thara Gopinath Date: Sat May 29 22:02:23 2010 +0530 OMAP3: PM: Adding smartreflex device file. This patch adds support for device registration of various smartreflex module present in the system. This patch introduces the platform data for smartreflex devices which include the efused n-target vaules, a parameter to indicate whether smartreflex autocompensation needs to be enabled on init or not. An API omap_enable_smartreflex_on_init is provided for the board files to enable smartreflex autocompensation during system boot up. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 984aa6dbf4ca5be806fee217311c9cc68e8f2e88 Author: Thara Gopinath Date: Sat May 29 22:02:22 2010 +0530 OMAP3: PM: Adding smartreflex driver support. SmartReflex modules do adaptive voltage control for real-time voltage adjustments. With Smartreflex the power supply voltage can be adapted to the silicon performance(manufacturing process, temperature induced performance, age induced performance etc). There are differnet classes of smartreflex implementation. Class-0: Manufacturing Test Calibration Class-1: Boot-Time Software Calibration Class-2: Continuous Software Calibration Class-3: Continuous Hardware Calibration Class-4: Fully Integrated Power Management OMAP3 has two smartreflex modules one associated with VDD MPU and the other associated with VDD CORE. This patch adds support for smartreflex driver. The driver is designed for Class-1 , Class-2 and Class-3 support and is a platform driver. Smartreflex driver can be enabled through a Kconfig option "SmartReflex support" under "System type"->"TI OMAP implementations" menu. Smartreflex autocompensation feature can be enabled runtime through a debug fs option. To enable smartreflex autocompensation feature echo 1 > /debug/voltage/vdd_/smartreflex/autocomp To disable smartreflex autocompensation feature echo 0 > /debug/voltage/vdd_/smartreflex/autocomp where X can be mpu, core , iva etc. This patch contains code originally in linux omap pm branch. Major contributors to this driver are Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley, Nishant Menon, Kevin Hilman. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 3b92408c7dfeb918fdd2f9fadc73177a59ad621c Author: Thara Gopinath Date: Wed Aug 18 16:21:58 2010 +0530 OMAP: Introduce voltage domain information in the hwmod structures This patch extends the device hwmod structure to contain info about the voltage domain to which the device belongs to. This is needed to support a device based DVFS where the device knows which voltage domain it belongs to. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit 2f34ce81b8c05c900e45bd88595cc154f7bb5957 Author: Thara Gopinath Date: Sat May 29 22:02:21 2010 +0530 OMAP3: PM: Adding voltage driver support. This patch adds voltage driver support for OMAP3. The driver allows configuring the voltage controller and voltage processors during init and exports APIs to enable/disable voltage processors, scale voltage and reset voltage. The driver maintains the global voltage table on a per VDD basis which contains the various voltages supported by the VDD along with per voltage dependent data like smartreflex efuse offset, errminlimit and voltage processor errorgain. The driver also allows the voltage parameters dependent on the PMIC to be passed from the PMIC file through an API. The driver allows scaling of VDD voltages either through "vc bypass method" or through "vp forceupdate method" the choice being configurable through the board file. This patch contains code originally in linux omap pm branch smartreflex driver. Major contributors to this driver are Lesly A M, Rajendra Nayak, Kalle Jokiniemi, Paul Walmsley, Nishant Menon, Kevin Hilman. The separation of PMIC parameters into a separate structure which can be populated from the PMIC file is based on the work of Lun Chang from Motorola in an internal tree. Signed-off-by: Thara Gopinath [khilman: fixed link error for OMAP2-only defconfig] Signed-off-by: Kevin Hilman commit a3ba81131aca243bfecfa78c42edec0cd69f72d6 Author: Ben Gamari Date: Wed Dec 22 13:30:14 2010 -0500 Make fixdep error handling more explicit Also add missing error handling to fstat call Signed-off-by: Ben Gamari Signed-off-by: Michal Marek commit 4a7863cc2eb5f9804f1c4e9156619a801cd7f14f Author: Don Zickus Date: Wed Dec 22 14:00:03 2010 -0500 x86, nmi_watchdog: Remove ARCH_HAS_NMI_WATCHDOG and rely on CONFIG_HARDLOCKUP_DETECTOR The x86 arch has shifted its use of the nmi_watchdog from a local implementation to the global one provide by kernel/watchdog.c. This shift has caused a whole bunch of compile problems under different config options. I attempt to simplify things with the patch below. In order to simplify things, I had to come to terms with the meaning of two terms ARCH_HAS_NMI_WATCHDOG and CONFIG_HARDLOCKUP_DETECTOR. Basically they mean the same thing, the former on a local level and the latter on a global level. With the old x86 nmi watchdog gone, there is no need to rely on defining the ARCH_HAS_NMI_WATCHDOG variable because it doesn't make sense any more. x86 will now use the global implementation. The changes below do a few things. First it changes the few places that relied on ARCH_HAS_NMI_WATCHDOG to use CONFIG_X86_LOCAL_APIC (the former was an alias for the latter anyway, so nothing unusual here). Those pieces of code were relying more on local apic functionality the nmi watchdog functionality, so the change should make sense. Second, I removed the x86 implementation of touch_nmi_watchdog(). It isn't need now, instead x86 will rely on kernel/watchdog.c's implementation. Third, I removed the #define ARCH_HAS_NMI_WATCHDOG itself from x86. And tweaked the include/linux/nmi.h file to tell users to look for an externally defined touch_nmi_watchdog in the case of ARCH_HAS_NMI_WATCHDOG _or_ CONFIG_HARDLOCKUP_DETECTOR. This changes removes some of the ugliness in that file. Finally, I added a Kconfig dependency for CONFIG_HARDLOCKUP_DETECTOR that said you can't have ARCH_HAS_NMI_WATCHDOG _and_ CONFIG_HARDLOCKUP_DETECTOR. You can only have one nmi_watchdog. Tested with ARCH=i386: allnoconfig, defconfig, allyesconfig, (various broken configs) ARCH=x86_64: allnoconfig, defconfig, allyesconfig, (various broken configs) Hopefully, after this patch I won't get any more compile broken emails. :-) v3: changed a couple of 'linux/nmi.h' -> 'asm/nmi.h' to pick-up correct function prototypes when CONFIG_HARDLOCKUP_DETECTOR is not set. Signed-off-by: Don Zickus Cc: Peter Zijlstra Cc: fweisbec@gmail.com LKML-Reference: <1293044403-14117-1-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 5c4bc1ce917d93ce8f7dd498fbec6881b3d7743a Author: Chaoming Li Date: Wed Dec 22 10:56:02 2010 -0600 rtlwifi: Fix large packet issue An RX buffer is set to 9100 bytes to receive 8K AMSDU; however, an skb of this size fails in the kernel. Signed-off-by: Chaoming Li Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 172128468f61e16e1427238278b9ad775584aa89 Author: Johannes Berg Date: Wed Dec 22 10:15:30 2010 +0100 mac80211: cleanup select_queue There's a redundant rcu_read_lock/unlock pair, a redundant variable, and a few redundant accesses to the 1d_to_ac array. Fix this to make the code neater and easier to follow. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit db7ec38d8e99f449856c11ffaef363a8eb5af90f Author: Mohammed Shafi Shajakhan Date: Wed Dec 22 12:20:12 2010 +0530 ath9k: Reset keycache on resume It looks like some hardware registers are left into undefined state after suspend/resume. At minimum, this can cause odd issues related to key cache and hardware trying to encrypt/decrypt frames unexpectedly. This seems to happen even when there is no keys configured, i.e., hardware can end up touching TX frames just based of invalid key cache context even if the driver is not asking a specific entry to be used. In addition, RX can likely be affected. This patch fixes this issue. Signed-off-by: Jouni Malinen Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit e6d8a817d00793eecd063b1548bbc954ab62b124 Author: Larry Finger Date: Tue Dec 21 19:40:40 2010 -0600 rtlwifi: rtl8192ce: Fix driver problem when radio switch off at module load If the radio enable switch is off when the driver is loaded, it is not possible to get radio output until the driver is unloaded and reloaded with the switch on. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 40d70dd12200ffeacfe9caaa8242e3ad2995bb5d Author: Jussi Kivilinna Date: Tue Dec 21 22:44:49 2010 +0200 rndis_wlan: add support for set_power_mgmt Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 49b35bd3f5bbc6997b24b04e9d4896f00cee3528 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:42 2010 +0200 rndis_wlan: add support for set_cqm_rssi_config Device poller already reads current RSSI, so add support for set_cqm_rssi_config there. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit a3463a1fdc9aa0881760e54efbd62742275601a5 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:34 2010 +0200 rndis_wlan: remove unused variable from priv structure Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit c2aa413279cde7c867fc90b07f83fff3c1e9e98d Author: Jussi Kivilinna Date: Tue Dec 21 22:44:27 2010 +0200 rndis_wlan: constify rndis_config_ops Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 21b27beca73ad7d2829fe9cc3e48054f69e3d9d3 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:20 2010 +0200 rndis_wlan: turn radio off before interface is bring up Radio should be off when interface is down. Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit 0b578021745b61b2ff89f6bacbac5db08a9a8089 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:12 2010 +0200 rndis_wlan: do not set default_key if not WEP key rndis_set_default_key did call add_wep_key to set default key on device, even if key is WPA. This caused rndis_wlan not work with wpa_supplicant in nl80211 mode (causing disconnect from AP). Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit bfe3850b0cfca6ba64395e2705d9a51cd044f374 Author: Jussi Kivilinna Date: Tue Dec 21 22:44:05 2010 +0200 rndis_wlan: scanning, workaround device returning incorrect bssid-list item count. Sometimes device returns wrong number of items in bssid-list. Appears that some specific beacons trigger this problem and leads to very poor scanning results. Workaround by ignoring num_items received from device and walkthrough full bssid-list buffer. v2: Fix buffer range checks and reading next item length. Old code read behind buffer on last item but didn't use those values as 'count' would also reach zero. Also fix resizing of buffer if device has larger buffer, old code assumed that BSSID-list OID would return same buffer size when it really can return yet another new larger length. Tested-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit ab72efdf107e5b0e0a05efb8f24cc6c598ae31ea Author: Rafał Miłecki Date: Tue Dec 21 21:29:44 2010 +0100 b43: N-PHY: enable support for PHYs rev 3 and higher Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d4814e69eec24f46a9f0a6d57b80e0a6add594c7 Author: Rafał Miłecki Date: Tue Dec 21 23:57:48 2010 +0100 b43: N-PHY: update 2056 radio on channel switch on rev3+ Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d41446467320b7cbe550a85c44fd9d3cb12c119d Author: Rafał Miłecki Date: Tue Dec 21 19:40:18 2010 +0100 b43: N-PHY: use correct channel tables for rev4+ Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aca434d36f38754392f53e7b16f90eab66ae95e0 Author: Rafał Miłecki Date: Tue Dec 21 11:50:22 2010 +0100 b43: N-PHY: avoid PHY hangs for rev 3 and 4 Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 94a5b0452410f8bdff27aa13592bec046fb6095d Author: Rafał Miłecki Date: Tue Dec 21 11:50:21 2010 +0100 b43: N-PHY: add init tables for 2056 radio Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ea7ee14b8a6371f006d73333ef2b7fe929b6dab0 Author: Rafał Miłecki Date: Tue Dec 21 17:13:44 2010 +0100 b43: N-PHY: implement radio 2056 init steps Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e41596a118a5cb15a045ef773dc117b2596e6a86 Author: Rafał Miłecki Date: Tue Dec 21 11:50:19 2010 +0100 b43: use correct firmware for newer cores Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d0ce2d170585b7061a08af061d64ebb08c6782dd Author: Vasanthakumar Thiagarajan Date: Tue Dec 21 01:42:43 2010 -0800 ath9k_hw: Fix bug in eeprom data length validation for AR9485 The size of the eeprom data is 1088 bytes for AR9485. But a sanity check is done against 4K which would result in a 'potential read past the end of the buffer' smatch complaint. Reported-by: Dan Carpenter Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 0207c0c51a37659a92232e665f2a7fadec170556 Author: Bruno Randolf Date: Tue Dec 21 17:30:43 2010 +0900 ath5k: Use helper function to get eeprom mode from channel Introduce a helper function to get the EEPROM mode from channel and remove multiple similar switch statements. Also since it's now easy to get the EEPROM mode from the channel, use them inside the functions which need it, instead of passing a redundant ee_mode parameter. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 26a51ad7f285236ca593c57cffcaadd40514084a Author: Bruno Randolf Date: Tue Dec 21 17:30:37 2010 +0900 ath5k: Remove ATH5K_INI_RFGAIN defines, use band instead Remove redundant defines. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 51f00622e5664ae77fd6c8670ddd402d9b77ccc8 Author: Bruno Randolf Date: Tue Dec 21 17:30:32 2010 +0900 ath5k: Track current TX power separately from max TX power Add a new variable to keep track of the currently configured tx power. Before max_pwr was re-used for keeping the maximum allowed power as well as the current configuration. Doing a min() on it allows you to lower the txpower, but how would you be able to make it higher again? This patch fixes that by adding a new variable ah_cur_pwr which is used instead of txp_max_pwr to keep the current configuration. txp_max_pwr is used to check if we are within the limits. Another problem fixed by this patch is that it avoids setting a zero txpower when things are initialized first and the current power is not yet set. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 56bd29d361a53f3bf6b815b5bf570a23bdc55b35 Author: Bruno Randolf Date: Tue Dec 21 17:30:26 2010 +0900 ath5k: Separate powertable setup and writing And rename functions which write the powertable to make it clearer. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 26c7fc436422de5d6d2b491f777e965e96f5c3a2 Author: Bruno Randolf Date: Tue Dec 21 17:30:20 2010 +0900 ath5k: Simplify powertable recalculation Let ath5k_hw_txpower() decide if it can re-use the powertable or if it has to be recalculated instead of passing a 'fast' flag from the outside. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 6dab55bf7eb52ca21d5e6c97b97f70875fe41ddc Author: Dan Carpenter Date: Tue Dec 21 06:59:06 2010 +0300 ath9k: unlock on error path in ath9k_change_interface() There is a missing unlock when we hit the "No beacon slot available" error condition. Signed-off-by: Dan Carpenter Signed-off-by: John W. Linville commit 8d6a686a0d20d39c202fdfc6fa7f1daf1d6e3b35 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:56 2010 +0100 rtlwifi: Use pci_pcie_cap() Use function pci_pcie_cap() instead of accessing struct member directly. Signed-off-by: Hauke Mehrtens Tested-by: Larry Finger Signed-off-by: John W. Linville commit e40b5faabc34f61fdf17b40d2e31837461ddc467 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:55 2010 +0100 ath9k: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Luis R. Rodriguez Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit e98b06b09be0fc459806aa4d2c301cfaf268c570 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:54 2010 +0100 ath5k: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Luis R. Rodriguez Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 2cdb9a42f3b4c97088ea0768dbee55ee8863f233 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:53 2010 +0100 rt2x00: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. Signed-off-by: Hauke Mehrtens Acked-by: Gertjan van Wingerde Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 6b740aaa005474a7b135d3c554b9295c73eaab95 Author: Hauke Mehrtens Date: Tue Dec 21 02:01:52 2010 +0100 ssb: Use pci_is_pcie() Use function pci_is_pcie() instead of accessing struct member directly. CC: Michael Buesch Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 750de29109770f6b50daecc4c44aaa50a9e0075b Author: Hauke Mehrtens Date: Tue Dec 21 02:01:51 2010 +0100 wl12xx: remove unnecessary import No function declared in gpio.h is used here. Signed-off-by: Hauke Mehrtens Acked-by: Luciano Coelho Signed-off-by: John W. Linville commit 63d9faf665ba27c65f0cf118df05a412d3dfd39d Author: Hauke Mehrtens Date: Tue Dec 21 02:01:50 2010 +0100 wl1251: remove unnecessary import No function declared in gpio.h is used here. Signed-off-by: Hauke Mehrtens Acked-by: Kalle Valo Signed-off-by: John W. Linville commit afe68d0a8f5961652e26cea39d74e2cc820de841 Author: Luis R. Rodriguez Date: Mon Dec 20 11:29:59 2010 -0500 ath9k: fix aphy / wiphy idle mismatch ath9k supports its own set of virtual wiphys, and it uses the mac80211 idle notifications to know when a device needs to be idle or not. We recently changed ath9k to force idle on driver stop() and on resume but forgot to take into account ath9k's own virtual wiphy idle states. These are used internally by ath9k to check if the device's radio should be powered down on each idle call. Without this change its possible that the device could have been forced off but the virtual wiphy idle was left on. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d584747be838775cebbf5937c20b24da6899e3e8 Author: Rajkumar Manoharan Date: Mon Dec 20 14:39:51 2010 +0530 ath9k: Fix warnings on card removal The recently added warning message on power change failure is not needed on device removal. ath: Failed to wakeup in 500us ------------[ cut here ]------------ WARNING: at drivers/net/wireless/ath/ath9k/hw.c:1618 ath9k_hw_setpower+0x61f/0x630 [ath9k_hw]() Hardware name: 64756D6 Pid: 540, comm: kworker/u:3 Not tainted 2.6.37-rc6-wl #37 Call Trace: [] warn_slowpath_common+0x7a/0xb0 [] ? ath9k_iowrite32+0x0/0x90 [ath9k] [] warn_slowpath_null+0x15/0x20 [] ath9k_hw_setpower+0x61f/0x630 [ath9k_hw] [] ath9k_ps_wakeup+0x85/0xd0 [ath9k] [] ath9k_configure_filter+0x25/0x80 [ath9k] [] ieee80211_configure_filter+0x133/0x190 [mac80211] [] ieee80211_do_stop+0x132/0x540 [mac80211] [] ? _raw_spin_unlock_bh+0x1f/0x30 [] ? dev_deactivate+0x1c3/0x1e0 [] ieee80211_stop+0x15/0x20 [mac80211] [] __dev_close+0x56/0x90 Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 97dcec5715a381362c88d1542e52c63147764d3c Author: Sujith Manoharan Date: Mon Dec 20 08:02:42 2010 +0530 ath9k_htc: Fix warning on device removal The commit "ath9k_hw: warn if we cannot change the power to the chip" introduced a new warning to indicate chip powerup failures, but this is not required for devices that have been removed. Handle USB device removal properly by checking for unplugged status. For PCI devices, this warning will still be seen when the card is pulled out, not sure how to check for card removal. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 2af10844eb6ed104f9505bf3a7ba3ceb02264f31 Merge: 73bc7d3 90a8a73 Author: Greg Kroah-Hartman Date: Wed Dec 22 12:25:34 2010 -0800 USB: Merge 2.6.37-rc5 into usb-next This is to resolve the conflict in the file, drivers/usb/gadget/composite.c that was due to a revert in Linus's tree needed for the 2.6.37 release. Reported-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 28bd2c341120db346f30b3ba11b4eac06b2cc981 Author: Sekhar Nori Date: Mon Dec 20 21:31:34 2010 +0530 davinci: am18x/da850/omap-l138 evm: add support for higher speed grades Apart from the regular AM18x/DA850/OMAP-L138 SoC operating at 300MHz, these SoCs have variants that can operate at a maximum of 456MHz. Variants at 408Mhz and 375 Mhz are available as well. Not all silicon is qualified to run at higher speeds and unfortunately the maximum speed the chip can support can only be determined from the label on the package (not software readable). The EVM hardware for all these variants is the same (except for the actual SoC populated). U-Boot on the EVM sets up ATAG_REVISION to inform the OS regarding the speed grade supported by the silicon. We use this information to pass on the speed grade information to the SoC code. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 39e145500458bd68d1d33adfa256886900b1597b Author: Sekhar Nori Date: Mon Dec 20 21:31:33 2010 +0530 davinci: am18x/da850/omap-l138: add support for higher speed grades AM18x/DA850/OMAP-L138 SoCs have variants that can operate at a maximum of 456 MHz at 1.3V operating point. Also the 1.2V operating point has a variant that can support a maximum of 375 MHz. This patch adds three new OPPs (456 MHz, 408 MHz and 372 MHz) to the list of DA850 OPPs. Not all silicon is qualified to run at higher speeds and unfortunately the maximum speed the chip can support can only be determined from the label on the package (not software readable). Because of this, we depend on the maximum speed grade information to be provided to us in some board specific way. The board informs the maximum speed grade information by setting the da850_max_speed variable. Signed-off-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 9cc3049911d0166d54247cf2471802eb5293c66c Author: Ben Gardiner Date: Thu Dec 9 16:51:07 2010 -0500 da850-evm: KEYBOARD_GPIO_POLLED Kconfig conditional Use the mach-davinci/Kconfig to enable gpio-keys-polled as default when da850-evm machine is enabled. Signed-off-by: Ben Gardiner CC: Kevin Hilman CC: "Nori, Sekhar" CC: Gabor Juhos Signed-off-by: Kevin Hilman commit 70b3093963feefbf122672f9fe5f916db5338ca0 Author: Ben Gardiner Date: Thu Dec 9 16:51:06 2010 -0500 da850-evm: add baseboard GPIO expander buttons, switches and LEDs This patch adds a pca953x platform device for the tca6416 found on the evm baseboard. The tca6416 is a GPIO expander, also found on the UI board at a separate I2C address. The pins of the baseboard IO expander are connected to software reset, deep sleep enable, test points, a push button, DIP switches and LEDs. Add support for the push button, DIP switches and LEDs and test points (as free GPIOs). The reset and deep sleep enable connections are reserved by the setup routine so that userspace can't toggle those lines. The existing tca6416-keypad driver was not employed because there was no apararent way to register the LEDs connected to gpio's on the tca6416 while simultaneously registering the tca6416-keypad instance. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi CC: Govindarajan, Sriramakrishnan Reviewed-by: Sekhar Nori Reviewed-by: Dmitry Torokhov CC: Gabor Juhos Signed-off-by: Kevin Hilman commit 53c2897d36153830d4d34324bedf23a641602cc9 Author: Ben Gardiner Date: Thu Dec 9 16:51:05 2010 -0500 da850-evm: extract defines for SEL{A,B,C} pins in UI expander The setup and teardown methods of the UI expander reference the SEL_{A,B,C} pins by 'magic number' in each function. This uses the common enum for their offsets in the expander setup and teardown functions. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi Reviewed-by: Sekhar Nori Signed-off-by: Sekhar Nori CC: Victor Rodriguez Signed-off-by: Kevin Hilman commit 75929f5e2bcba7cc328fcf9a3d7ba7076946ac3a Author: Ben Gardiner Date: Thu Dec 9 16:51:04 2010 -0500 da850-evm: add UI Expander pushbuttons This patch adds EV_KEYs for each of the 8 pushbuttons on the UI board via a gpio-key device. The expander is a tca6416; it controls the SEL_{A,B,C} lines which enable and disable the peripherals found on the UI board in addition to the 8 pushbuttons mentioned above. The reason the existing tca6416-keypad driver is not employed is because there was no aparent way to keep the gpio lines used as SEL_{A,B,C} registered while simultaneously registering the pushbuttons as a tca6416-keypad instance. Some experimentation with the polling interval was performed; we were searching for the largest polling interval that did not affect the feel of the responsiveness of the buttons. It is very subjective but 200ms seems to be a good value that accepts firm pushes but rejects very light ones. The key values assigned to the buttons were arbitrarily chosen to be F1-F8. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi CC: Govindarajan, Sriramakrishnan Reviewed-by: Sekhar Nori Signed-off-by: Sekhar Nori CC: Kevin Hilman CC: Gabor Juhos Signed-off-by: Kevin Hilman commit ee09b3c1cff0335137dc1b146488e4352f640f13 Author: Eric Dumazet Date: Wed Dec 22 11:39:59 2010 -0800 sfq: fix sfq class stats handling sfq_walk() runs without qdisc lock. By the time it selects a non empty hash slot and sfq_dump_class_stats() is run (with lock held), slot might have been freed : We then access q->slots[SFQ_EMPTY_SLOT], out of bounds, and crash in slot_queue_walk() On previous kernels, bug is here but out of bounds qs[SFQ_DEPTH] and allot[SFQ_DEPTH] are located in struct sfq_sched_data, so no illegal memory access happens, only possibly wrong data reported to user. Also, slot_dequeue_tail() should make sure slot skb chain is correctly terminated, or sfq_dump_class_stats() can access freed skbs. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 65a6538a56d4c7ae8465f2a8420ddc65877b6779 Author: Luciano Coelho Date: Tue Dec 21 16:02:17 2010 +0200 mac80211: check for CONFIG_MAC80211_LEDS in the tpt_led_trigger declaration If CONFIG_MAC80211_LEDS is not set, ieee80211_i.h was failing to compile, because struct led_trigger is only declared when CONFIG_LEDS_TRIGGERS is set. This patch adds ifdefs around the tpt_led_trigger declaration in ieee80211_i.h to avoid the problem. Signed-off-by: Luciano Coelho Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 67408c8c7b9daf28b50e33be3541334c07d15789 Author: Johannes Berg Date: Tue Nov 30 08:59:23 2010 +0100 mac80211: selective throughput LED trigger active The throughput LED trigger was always active when the radio was enabled. In most cases that's likely the desired behaviour, but iwlwifi requires it to be only active when one of the virtual interfaces is actually "connected" in some way. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e1e5406854378dfada3f33c7192b012083a5b8e0 Author: Johannes Berg Date: Tue Nov 30 08:58:45 2010 +0100 mac80211: add throughput based LED blink trigger iwlwifi and other drivers like to blink their LED based on throughput. Implement this generically in mac80211, based on a throughput table the driver specifies. That way, drivers can set the blink frequencies depending on their desired behaviour and max throughput. All the drivers need to do is provide an LED class device, best with blink hardware offload. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit fe67c913f1ec2a01aaa9176c80ef36eaf87d705d Author: Johannes Berg Date: Sat Nov 27 20:02:59 2010 +0100 mac80211: make LED trigger names available early The throughput trigger will require doing LED classdev/trigger handling before register_hw(), so drivers should have access to the trigger names before it. If trigger registration fails, this will still make the trigger name available, but that's not a big problem since the default trigger will the simply not be found. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 808601b75804475c9022f6375e76b7c62c99a10a Merge: c10abbb f17f972 Author: Tony Lindgren Date: Wed Dec 22 11:32:24 2010 -0800 Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus commit c10abbb26513f4ccff89c4d80912cb4d36fcd3e8 Merge: 4931445 da1f026 Author: Tony Lindgren Date: Wed Dec 22 11:30:12 2010 -0800 Merge branches 'devel-gpmc' and 'devel-misc' into omap-for-linus commit 63e35cd9bd4c8ae085c8b9a70554595b529c4100 Merge: 503b1a5 3d986b2 Author: John W. Linville Date: Wed Dec 22 14:27:21 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h commit da1f026b532ce944d74461497dc6d8c16456466e Author: Janusz Krzysztofik Date: Mon Dec 20 21:09:22 2010 +0000 Keyboard: omap-keypad: use matrix_keypad.h Most keypad drivers make use of the defined macros, structures and inline functions. Convert omap-keypad driver to use those as well, as suggested by a compile time warning, hardcoded into the OMAP . Created against linux-2.6.37-rc5. Tested on Amstrad Delta. Compile tested with omap1_defconfig and omap2plus_defconfig shrinked to board-h4. Signed-off-by: Janusz Krzysztofik Reviewed-by: Aaro Koskinen Acked-by: Dmitry Torokhov Signed-off-by: Tony Lindgren commit 4e012e5f246d4da924b14d453452fd0838d4e03b Author: Arno Steffen Date: Wed Dec 22 18:14:36 2010 +0000 OMAP3: fix typo in OMAP3_IVA_MASK OMAP3_IVA_MASK should use OMAP3_IVA_SHIFT instead of OMAP3_SGX_SHIFT Signed-off-by: Arno Steffen Signed-off-by: Tony Lindgren commit 6d38c4b4f1df70f953633c27ebcdc2712e9039bc Author: Jarkko Nikula Date: Tue Dec 21 17:46:01 2010 +0000 omap: rx51: Remove tvout code that plays with gpio 40 Commit 60d24ee "Added video data to support tvout on rx51" added code that tries to assign gpio 40 as OMAP DSS reset_gpio for tvout. This is wrong since this gpio has nothing to do with OMAP DSS but it is used to control one switch that selects is the audio jack connected to tvout or audio circuitry. This switch is already supported by the RX51 ASoC driver so there is no need to control it elsewhere. Switch is contolled with ALSA control 'Jack Function' and tvout can be selected with following example: amixer -D hw:0 set 'Jack Function' 'TV-OUT' Signed-off-by: Jarkko Nikula Cc: Srikar Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit 31bbb4f035c13a73d1ebc2626663971723cbd28f Author: Jarkko Nikula Date: Tue Dec 21 17:25:35 2010 +0000 omap: rx51: Add vdda_dac supply for tvout Commmit 60d24ee "Added video data to support tvout on rx51" broke the DSS on RX51/N900 since it added DSS VENC support but a patch adding needed supply is missing from tree and no framebuffers are initialized. This patch is basically cleaned up version of original one: http://marc.info/?l=linux-omap&m=129070041402418&w=2 Signed-off-by: Jarkko Nikula Cc: Srikar Cc: Mark Brown Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit b5b9945b2b139ca922b49062053f34486ca64cca Author: Jarkko Nikula Date: Tue Dec 21 17:25:34 2010 +0000 omap: rx51: Cleanup vdds_sdi supply construction It is much more cleaner to use REGULATOR_SUPPLY macro and a device name instead of having a reference to rx51_display_device.dev with #if defined() guards. Signed-off-by: Jarkko Nikula Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren commit 3cfeb0c33f5cbcc6dde371392877ef3101b8f805 Author: John W. Linville Date: Mon Dec 20 15:16:53 2010 -0500 rtl818x: move rtl8180 and rtl8187 to separate subdirectories These drivers share one header file, but nothing else. Worse, both drivers use the rtl8225 part with different register settings. The results has been some ugly naming -- let's simplify that. Signed-off-by: John W. Linville Acked-by: Hin-Tak Leung Acked-by: Larry Finger Acked-by: Herton Ronaldo Krzesinski commit 68229689b6dc950bea4b81dd60563884f4a7e1c5 Author: Oliver Neukum Date: Wed Dec 22 15:33:40 2010 +0100 HID: usbhid: base runtime PM on modern API This patch doesn't alter functionality, but removes a dedicated kernel thread. Signed-off-by: Oliver Neukum Tested-by: Maulik Mankad Signed-off-by: Jiri Kosina commit 43b210139a3cb09d49a18f0dc9bed3674c55f235 Author: Namhyung Kim Date: Wed Dec 22 19:01:47 2010 +0100 hrtimer: fix a typo in comment Signed-off-by: Namhyung Kim Signed-off-by: Jiri Kosina commit 43d547f9ce039e5a9d2401c8f2fbfa29932b6b4f Author: Jim Cromie Date: Fri Dec 17 14:32:36 2010 -0700 init/Kconfig: fix typo Signed-off-by:  Jim Cromie Signed-off-by: Jiri Kosina commit 4b7bd364700d9ac8372eff48832062b936d0793b Merge: c0d8768 90a8a73 Author: Jiri Kosina Date: Wed Dec 22 18:57:02 2010 +0100 Merge branch 'master' into for-next Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated. commit f17f9726c27c3921e00a5750e85070e6dd7e1ff7 Author: Jon Hunter Date: Thu Dec 9 23:13:40 2010 +0100 OMAP4: clock data: Add missing fixed divisors The following OMAP4 clocks have the following fixed divisors that determine the frequency at which these clocks operate. These dividers are defined by the PRCM specification and without these dividers the rates of the below clocks are calculated incorrectly. This may cause internal peripherals using these clocks to operate at the wrong frequency. - abe_24m_fclk (freq = divided-by-8) - ddrphy_ck (freq = parent divided-by-2) - dll_clk_div_ck (freq = parent divided-by-2) - per_hs_clk_div_ck (freq = parent divided-by-2) - usb_hs_clk_div_ck (freq = parent divided-by-3) - func_12m_fclk (freq = parent divided-by-16) - func_24m_clk (freq = parent divided-by-4) - func_24mc_fclk (freq = parent divided-by-8) - func_48mc_fclk (freq = divided-by-4) - lp_clk_div_ck (freq = divided-by-16) - per_abe_24m_fclk (freq = divided-by-4) Signed-off-by: Jon Hunter Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit 9bf8391846db849509a6aa6f1f0659843ca30662 Author: Vishwanath BS Date: Tue Oct 5 19:35:34 2010 +0530 OMAP3: SDRC: Add comments on Errata i520 for Global SW reset This patch adds comments on precaution to be taken if Global Warm reset is used as the means to trigger system reset. Signed-off-by: Vishwanath BS [paul@pwsan.com: fixed typos, one mentioned by Sanjeev] Signed-off-by: Paul Walmsley Cc: Sanjeev Premi commit 9fb67204d7a00a6444bc121f221527034613d338 Merge: 8c1df40 287050d Author: Ingo Molnar Date: Wed Dec 22 12:46:12 2010 +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 3a39c18d63fec35f49df577d4b2a4e29c2212f22 Author: Li Zefan Date: Mon Nov 8 15:22:19 2010 +0800 btrfs: Extract duplicate decompress code Add a common function to copy decompressed data from working buffer to bio pages. Signed-off-by: Li Zefan commit 1a419d85a76853d7d04e9b6280a80e96770bf3e3 Author: Li Zefan Date: Mon Oct 25 15:12:50 2010 +0800 btrfs: Allow to specify compress method when defrag Update defrag ioctl, so one can choose lzo or zlib when turning on compression in defrag operation. Changelog: v1 -> v2 - Add incompability flag. - Fix to check invalid compress type. Signed-off-by: Li Zefan commit a6fa6fae40ec336c7df6155255ae64ebef43a8bc Author: Li Zefan Date: Mon Oct 25 15:12:26 2010 +0800 btrfs: Add lzo compression support Lzo is a much faster compression algorithm than gzib, so would allow more users to enable transparent compression, and some users can choose from compression ratio and speed for different applications Usage: # mount -t btrfs -o compress[=] dev /mnt or # mount -t btrfs -o compress-force[=] dev /mnt "-o compress" without argument is still allowed for compatability. Compatibility: If we mount a filesystem with lzo compression, it will not be able be mounted in old kernels. One reason is, otherwise btrfs will directly dump compressed data, which sits in inline extent, to user. Performance: The test copied a linux source tarball (~400M) from an ext4 partition to the btrfs partition, and then extracted it. (time in second) lzo zlib nocompress copy: 10.6 21.7 14.9 extract: 70.1 94.4 66.6 (data size in MB) lzo zlib nocompress copy: 185.87 108.69 394.49 extract: 193.80 132.36 381.21 Changelog: v1 -> v2: - Select LZO_COMPRESS and LZO_DECOMPRESS in btrfs Kconfig. - Add incompability flag. - Fix error handling in compress code. Signed-off-by: Li Zefan commit 261507a02ccba9afda919852263b6bc1581ce1ef Author: Li Zefan Date: Fri Dec 17 14:21:50 2010 +0800 btrfs: Allow to add new compression algorithm Make the code aware of compression type, instead of always assuming zlib compression. Also make the zlib workspace function as common code for all compression types. Signed-off-by: Li Zefan commit 4b72029dc3fd6ba7dc45ccd1cf0aa0ebfa209bd3 Author: Li Zefan Date: Tue Nov 9 08:27:27 2010 +0800 btrfs: Fix error handling in zlib Return failure if alloc_page() fails to allocate memory, and the upper code will just give up compression. Signed-off-by: Li Zefan commit 8844355df7f4e091b03cc131e1549631238b397b Author: Li Zefan Date: Mon Oct 25 15:11:43 2010 +0800 btrfs: Fix bugs in zlib workspace - Fix a race that can result in alloc_workspace > cpus. - Fix to check num_workspace after wakeup. Signed-off-by: Li Zefan commit 6a504a751124889e0bdbb25963a7edf7aeedb7bd Author: Dimitris Papastamos Date: Wed Dec 22 11:33:11 2010 +0000 ASoC: Add initial WM8995 driver The WM8995 is a digital audio hub CODEC designed for smartphones. The current driver supports most of the basic functionality of the WM8995. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9d01df063e70260d6c0aabd58dd5507db151aa51 Author: Takashi Iwai Date: Wed Dec 22 14:08:40 2010 +0100 ASoC: don't pass the string as the format arguemtn for dev_info() Signed-off-by: Takashi Iwai commit d8850ba425d9823d3184bd52f065899dac4689f9 Author: Jack Steiner Date: Tue Nov 30 13:55:40 2010 -0600 x86, UV: Fix the effect of extra bits in the hub nodeid register UV systems can be partitioned into multiple independent SSIs. Large partitioned systems may have extra bits in the node_id register. These bits are used when the total memory on all SSIs exceeds 16TB. These extra bits need to be ignored when calculating x2apic_extra_bits. Signed-off-by: Jack Steiner LKML-Reference: <20101130195926.972776133@sgi.com> Signed-off-by: Ingo Molnar commit e681041388e61ecd7f99dba66b3c1db11a564d92 Author: Jack Steiner Date: Tue Nov 30 13:55:39 2010 -0600 x86, UV: Add common uv_early_read_mmr() function for reading MMRs Early in boot, reading MMRs from the UV hub controller require calls to early_ioremap()/early_iounmap(). Rather than duplicating code, add a common function to do the map/read/unmap. Signed-off-by: Jack Steiner LKML-Reference: <20101130195926.834804371@sgi.com> Signed-off-by: Ingo Molnar commit f49be89bb4e235776af08cdcef91a37a0d12aa62 Author: Seungwhan Youn Date: Wed Dec 22 18:46:24 2010 +0900 ASoC: SAMSUNG: Debug wrong parameter snd_soc_jack_new()'s first parameter was changed from snd_soc_card to snd_soc_codec after Multi-Component support patches. So, this patch fixes parameter that we missed. Signed-off-by: Seungwhan Youn Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1c9e9795b5e2348df619fd6010d7583dc9b8c811 Author: Mark Brown Date: Sun Dec 5 12:53:08 2010 +0000 ASoC: Add jack IRQ trace to 88pm860x driver Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2bbb5d667958f20ef8e7f7b37f9acced6dac0b98 Author: Mark Brown Date: Sun Dec 5 12:50:12 2010 +0000 ASoC: Trace Wolfson jack detection IRQs Add jack detection interrupt trace to Wolfson CODEC drivers. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 6d3c26bcb7a129a11a54d78644e264ec872547e1 Author: Mark Brown Date: Sun Dec 5 12:41:52 2010 +0000 ASoC: Use delayed work to debounce WM8350 jack IRQs This avoids blocking the IRQ thread and allows further bounces to extend the debounce time. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 36bb94ba36f332de767cfaa3af6a5136435a3a9c Author: Russell King Date: Tue Nov 16 08:40:36 2010 +0000 ARM: pgtable: provide RDONLY page table bit rather than WRITE bit Signed-off-by: Russell King commit 9522d7e4cb5e0858122fc55d33a2c07728f0b10d Author: Russell King Date: Tue Nov 16 00:23:31 2010 +0000 ARM: pgtable: invert L_PTE_EXEC to L_PTE_XN The hardware page tables use an XN bit 'execute never'. Historically, we've had a Linux 'execute allow' bit, in the positive sense. Get rid of this artifact as future hardware will continue to have the XN sense. Signed-off-by: Russell King commit e926f4495e202500a6265987277fab217e235f08 Author: Russell King Date: Sun Nov 21 11:55:37 2010 +0000 ARM: pgtable: remove FIRST_USER_PGD_NR FIRST_USER_PGD_NR is now unnecessary, as this has been replaced by FIRST_USER_ADDRESS except in the architecture code. Fix up the last usage of FIRST_USER_PGD_NR, and remove the definition. Signed-off-by: Russell King commit af3813d6a5bf8d0f71b23d3ce458fa5f9916c6b7 Author: Russell King Date: Sun Nov 21 11:48:16 2010 +0000 ARM: pgtable: use conventional page table code for identity mappings Remove some knowledge of our 2-level page table layout from the identity mapping code - we assume that a step size of PGDIR_SIZE will allow us to step over all entries. While this is true today, it won't be true in the near future. Signed-off-by: Russell King commit 614dd0585f376a25c638abbed9c5fbd21d7baece Author: Russell King Date: Sun Nov 21 11:41:57 2010 +0000 ARM: pgtable: collect up identity mapping functions We have two places where we create identity mappings - one when we bring secondary CPUs online, and one where we setup some mappings for soft- reboot. Combine these two into a single implementation. Also collect the identity mapping deletion function. Signed-off-by: Russell King commit 26bbf0b57a0848932f725076bcb1245ca696e8d3 Author: Russell King Date: Sun Nov 21 11:30:36 2010 +0000 ARM: pgtable: remove L2 cache flushes for SMP page table bring-up The MMU is always configured to read page tables from the L2 cache so there's little point flushing them out of the L2 cache back to RAM. Remove these flushes. Signed-off-by: Russell King commit d30e45eeabefadc6039d7f876a59e5f5f6cb11c6 Author: Russell King Date: Tue Nov 16 00:16:01 2010 +0000 ARM: pgtable: switch order of Linux vs hardware page tables This switches the ordering of the Linux vs hardware page tables in each page, thereby eliminating some of the arithmetic in the page table walks. As we now place the Linux page table at the beginning of the page, we can deal with the offset in the pgt by simply masking it away, along with the other control bits. This also makes the arithmetic all be positive, rather than a mixture. Signed-off-by: Russell King commit 8c1df4002aa425973d7d25ffa56c042acd953bed Merge: 6c529a2 21dd9ae Author: Ingo Molnar Date: Wed Dec 22 11:54:50 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 6c529a266bdc590a870ee2d2092ff6527eff427b Merge: 7639dae 90a8a73 Author: Ingo Molnar Date: Wed Dec 22 11:53:20 2010 +0100 Merge commit 'v2.6.37-rc7' into perf/core Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar commit 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f Author: Henrik Rydberg Date: Sat Dec 18 15:42:30 2010 +0100 Input: synaptics - ignore bogus mt packet In multitouch mode, at least one device (fw: 7.4 id: 0x1c0b1) sometimes sends a final main packet with x == 1. Since the normal values are above 1472, this is clearly bogus. At the same time, a two-finger touch is signaled, even though only one finger was on the pad to begin with. This patch ignores the packet altogether, removing the problem. Acked-by: Chris Bagwell Acked-by: Chase Douglas Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 047b7bdab951b76d19b44388e35cf579ef91e448 Merge: b0f259e fcc5704 Author: Jens Axboe Date: Wed Dec 22 09:49:28 2010 +0100 Merge branch 'for-2.6.38/event-handling' into for-next commit fcc57045d53edc35bcce456e60ac4aa802712934 Author: Jens Axboe Date: Wed Dec 22 09:48:49 2010 +0100 Revert "sd: implement sd_check_events()" This reverts commit c8d2e937355d02db3055c2fc203e5f017297ee1f. We run into merging problems with the SCSI tree, revert this one so it can be handled by a postmerge tree there. Signed-off-by: Jens Axboe commit 11c8ea81cc639c2ea56f94a9cdaa6242ff13a3af Author: Linus Walleij Date: Fri Dec 17 21:16:23 2010 +0100 ux500: rename modem IRQ and MBOX files Suffix the U5500 modem IRQ and MBOX files with *-db5500* so that we clearly know the SoC they belong to, in line with the rest of the files in mach-ux500. Cc: Stefan Nilsson Cc: Martin Persson Signed-off-by: Linus Walleij commit 6bf45a1018ff3cda8b6ef2fa7e023a023bc01dc8 Author: Takashi YOSHII Date: Wed Dec 22 06:35:30 2010 +0000 ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM Adding platform resources, PFC setting and release reset pin for eMMC on ag5evm. [damm@opensource.se: Add MSTP code for MMCIF] Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5d7814728d80ee56d02e99cc2ab0850c8625a047 Author: Takashi YOSHII Date: Wed Dec 22 06:30:19 2010 +0000 ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins Follow up to pfc-sh73a0.c's pull-up support. Change GPIO_FN_KEYINx to GPIO_FN_KEYINx_PU. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit a0794fd019820d3d5e9d73ffd61b5bbcac818f18 Author: Takashi YOSHII Date: Wed Dec 22 06:26:06 2010 +0000 ARM: mach-shmobile: sh73a0 GPIO pullup improvement On SH-Mobile, Pull UP/Downs can be controlled independently from Function selectors (by lower nibble of PFCR). It means people may want to use GPIO_FN_xxx_PU/PD in addition to GPIO_IN_PU/PD which is currently supported. This patch adds pull-up version for some input signals on KEYSC, MMC, FSIA as well as SDHI1. Signed-off-by: Takashi YOSHII Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 019c4ae313ccf5d253be32197e002c626d8bd678 Author: Magnus Damm Date: Wed Dec 22 06:14:05 2010 +0000 ARM: mach-shmobile: sh73a0 CPGA fix for KEYSC Fix the sh73a0 KEYSC clock control by adding MSTP403 to mstp_clks[]. Use KEYSC instead of KEYSC0 in comments. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 752a4a95e3c96a8e8d3405b16d292f13e8c7856b Merge: bc3f67a 90a8a73 Author: Grant Likely Date: Wed Dec 22 00:10:01 2010 -0700 Merge commit 'v2.6.37-rc7' into spi/next commit 60a0e5d972bad6927b63aede7a1cfe758b8251ad Author: Santosh Shilimkar Date: Tue Dec 21 22:37:29 2010 -0700 OMAP4: clock data: Keep L3INSTR clock domain modulemode under HW control L3INSTR clock domain is read only register and its reset value is HW_AUTO. The modules withing this clock domain needs to be kept under hardware control. MODULEMODE: - 0x0: Module is disable by software. Any INTRCONN access to module results in an error, except if resulting from a module wakeup (asynchronous wakeup). - 0x1: Module is managed automatically by hardware according to clock domain transition. A clock domain sleep transition put module into idle. A wakeup domain transition put it back into function. If CLKTRCTRL=3, any INTRCONN access to module is always granted. Module clocks may be gated according to the clock domain state. This patch keeps CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL and CM_L3INSTR_INTRCONN_WP1_CLKCTRL module mode under hardware control by using ENABLE_ON_INIT flag. Without this the OMAP4 device OFF mode SAR restore phase aborts during interconnect register restore phase. This can be also handled by doing explicit a clock enable and disable in the low power code since there is no direct module associated with it. But that seems not necessary since the clock domain is under HW control. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 80f093657371b3ebb1d05354a698088bf7b21c15 Author: Santosh Shilimkar Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: powerdomain: Remove L3INIT_PD OFF state On OMAP4, there is an issue when L3INIT transitions to OFF mode without device OFF. The SAR restore mechanism will not get triggered without wakeup from device OFF and hence the USB host and USB TLL context will not be restored. Hardware team recommended to remove the OFF state support for L3INIT_PD since there is no power impact. It will be removed on next OMAP revision (OMAP4440 and beyond). Hence this patch removed the OFF state from L3INIT_PD. The deepest state supported on L3INIT_PD is OSWR just like CORE_PD and PER_PD Signed-off-by: Santosh Shilimkar [b-cousson@ti.com: update the changelog with next OMAP info] Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 474e7aeb6a5ac78071cc9b841889fcf026524e97 Author: Rajendra Nayak Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: powerdomain: l4per pwrdm does not support OFF The l4per power domain in ES2.0 does support only RET and ON states. The previous ES1.0 HW database was wrong and thus fixed on ES2. Change the pwrsts field to reflect that. Signed-off-by: Rajendra Nayak Acked-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 33de32b3ebcb4f7f77f10a1b42493352f00c6a30 Author: Rajendra Nayak Date: Tue Dec 21 22:37:28 2010 -0700 OMAP4: PM: Do not assume clkdm supports hw transitions omap_set_pwrdm_state today assumes a clkdm supports hw_auto transitions and hence leaves some which do not support this in sw wkup state preventing low power transitions. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 71a488dbcc4acbc9b845491a368b30ecd7484089 Author: Rajendra Nayak Date: Tue Dec 21 22:37:27 2010 -0700 OMAP4: PM: Use the low-power state change feature on OMAP4 For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking up the domain to put it back to deeper sleep state. Signed-off-by: Rajendra Nayak Signed-off-by: Santosh Shilimkar Acked-by: Benoit Cousson Cc: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 73bc7d315f56e260071bdb5f15e25b53bddc1402 Author: Melchior FRANZ Date: Wed Dec 22 02:04:33 2010 +0100 USB: add support for Dream Cheeky DL100B Webmail Notifier (1d34:0004) So far the USBLED driver only supports Delcom's "USB Visual Signal Indicator" (http://www.delcomproducts.com/products_USBLMP.asp). The driver generates virtual files "red", "green", and "blue" under the device's /sys/ directory, where color values can be read from and written to. This patch adds support for Dream Cheeky's "DL100B Webmail Notifier" (http://www.dreamcheeky.com/webmail-notifier -- available from several shops, such as http://www.conrad.at/ce/de/product/777048/USB-WEBMAIL). This device isn't as pretty as Delcom's, but it's *far* cheaper, and its 3 LEDs can be set in 32 brightness steps each. The grey envelope contour can easily be removed, leaving a rather neutral white box (with a few small holes), which is useful for generic signalling purposes. Of course, the small circuit board can easily be put into a prettier case. The DL100B device pretends to be a HID, but the HID descriptor shows that it's not overly useful as such (see below). The patch therefore removes the "HID-ness" (hid-core.c, hid-ids.h), and adds the necessary commands to usbled.c. The protocol info comes from the developer's manual that Dream Cheeky kindly provided (815DeveloperManual.pdf). HID descriptor: 0: 05 01 Usage Page 'Generic Desktop Controls' 2: 09 10 Usage 'Reserved' 4: a1 01 Collection 'Application (mouse, keyboard)' 6: 05 00 Usage Page 'Undefined' 8: 19 10 Usage Minimum = 16 10: 29 11 Usage Maximum = 17 12: 15 00 Logical Minimum = 0 14: 25 0f Logical Maximum = 15 16: 75 08 Report Size = 8 18: 95 08 Report Count = 8 20: 91 02 Output data *var abs lin pref-state null-pos non-vol bit-field 22: 19 10 Usage Minimum = 16 24: 29 11 Usage Maximum = 17 26: 15 00 Logical Minimum = 0 28: 25 0f Logical Maximum = 15 30: 75 08 Report Size = 8 32: 95 08 Report Count = 8 34: 81 00 Input data array abs lin pref-state null-pos non-vol bit-field 36: c0 End Collection Signed-off-by: Melchior FRANZ Signed-off-by: Greg Kroah-Hartman commit 5010f3db952b19cd353d1e90838818922d995697 Author: Magnus Damm Date: Tue Dec 21 08:40:59 2010 +0000 ARM: mach-shmobile: sh73a0 TMU support Add support for 2 TMU timer channels on sh73a0. One timer channel is used for clocksource and the other is used for clockevents. All channels in the same TMU block share MSTP bit as usual. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5f53a56af50c002cdb091914aa98df80b1b28ec8 Author: Magnus Damm Date: Tue Dec 21 08:37:32 2010 +0000 ARM: mach-shmobile: sh73a0 INTCS support Add INTCS support for the sh73a0 processor. The interrupts on the sh73a0 processor are managed through controllers such as GIC, INTCS and INTCA. The ARM cores use the GIC as primary interrupt controller and the INTCS and INTCA are hanging off the GIC as cascaded interrupt controllers. Peripherals connected both to the GIC and the INTC controllers should if possible only use the GIC. If no GIC connection is available then INTCS and INTCA may be used instead. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 354e4157d9e1529cf71c7041a22fde2fd113642b Author: Kuninori Morimoto Date: Tue Dec 21 11:20:45 2010 +0000 ARM: mach-shmobile: mackerel: fixup default memory size Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6081dc348f122cdb76093b2fc6cf5742c968cb69 Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP: PM noop: implement context loss count for non-omap_devices For devices which have not (yet) been converted to use omap_device, implement the context loss counter using the "brutal method" as originally proposed by Paul Walmsley[1]. The dummy context loss counter is incremented every time it is checked, but only when off-mode is enabled. When off-mode is disabled, the dummy counter stops incrementing. Tested on 36xx/Zoom3 using MMC driver, which is currently the only in-tree user of this API. This patch should be reverted after all devices are converted to using omap_device. [1] http://marc.info/?l=linux-omap&m=129176260000626&w=2 Signed-off-by: Kevin Hilman [paul@pwsan.com: fixed compile warning; fixed to compile on OMAP1] Signed-off-by: Paul Walmsley commit c80705aa7074045e7431ed2ebeb0f7d5773615ab Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP: PM: implement context loss count APIs Implement OMAP PM layer omap_pm_get_dev_context_loss_count() API by creating similar APIs at the omap_device and omap_hwmod levels. The omap_hwmod level call is the layer with access to the powerdomain core, so it is the place where the powerdomain is queried to get the context loss count. The new APIs return an unsigned value that can wrap as the context-loss count grows. However, the wrapping is not important as the role of this function is to determine context loss by checking for any difference in subsequent calls to this function. Note that these APIs at each level can return zero when no context loss is detected, or on errors. This is to avoid returning error codes which could potentially be mistaken for large context loss counters. NOTE: only works for devices which have been converted to use omap_device/omap_hwmod. Longer term, we could possibly remove this API from the OMAP PM layer, and instead directly use the omap_device level API. Signed-off-by: Kevin Hilman Signed-off-by: Paul Walmsley commit 7f595674e08b8b4d3faf64a19bccc95445d7ed35 Author: Kevin Hilman Date: Tue Dec 21 21:31:55 2010 -0700 OMAP2+: powerdomain: add API to get context loss count Add new powerdomain API u32 pwrdm_get_context_loss_count(struct powerdomain *pwrdm) for checking how many times the powerdomain has lost context. The loss count is the sum of the powerdomain off-mode counter, the logic off counter and the per-bank memory off counter. Signed-off-by: Kevin Hilman [paul@pwsan.com: removed bogus return value on error; improved kerneldoc; tweaked commit message] Signed-off-by: Paul Walmsley commit 0a01aa211da8530dc6a3ff3a725f2edd3464c46f Author: Hari Kanigeri Date: Tue Dec 21 21:18:56 2010 -0700 OMAP4: clocks: add dummy clock for mailbox In omap4, there is no explicit configuration register to enable mailbox clocks. Defining dummy clock for mailbox clock module to keep the mailbox driver backward compatible with previous omaps. Signed-off-by: Hari Kanigeri Acked-by: Benoît Cousson Signed-off-by: Paul Walmsley commit a36795c1278112af2a78f93c99b7586cb7e2a0a2 Author: Jon Hunter Date: Tue Dec 21 21:31:43 2010 -0700 OMAP: clock: fix configuration of J-Type DPLLs to work for OMAP3 and OMAP4 J-Type DPLLs have additional configuration parameters that need to be programmed when setting the multipler and divider for the DPLL. These parameters being the sigma delta divider (SD_DIV) for the DPLL and the digital controlled oscillator (DCO) to be used by the DPLL. The current code is implemented specifically to configure the OMAP3630 PER J-Type DPLL. The OMAP4430 USB DPLL is also a J-Type DPLL and so this code needs to be updated to work for both OMAP3 and OMAP4 devices and any other future devices that have J-TYPE DPLLs. For the OMAP3630 PER DPLL both the SD_DIV and DCO paramenters are used but for the OMAP4430 USB DPLL only the SD_DIV field is used. The current implementation will only program the SD_DIV and DCO fields if the DPLL has both and hence this does not work for OMAP4430. In order to make the code more generic add two new fields to the dpll_data structure for the SD_DIV field and DCO field bit-masks and only program these fields if the masks are defined for a specific DPLL. This simplifies the code and allows us to remove the flag DPLL_NO_DCO_SEL. Tested on OMAP36xx Zoom3 and OMAP4 Blaze. Signed-off-by: Jon Hunter [paul@pwsan.com: removed explicit inlining and added '_' prefix on lookup_*() functions; added testing info to commit message; added 35xx comments back in] Signed-off-by: Paul Walmsley commit b183aaf7274245bb0241d81176cb6b06a3b01ca6 Author: Charulatha V Date: Tue Dec 21 21:31:43 2010 -0700 OMAP3: clock: Update clock domain name for mcspi fck Update clock3xxx_data for mcspi1-4 with appropriate clock domain name. Signed-off-by: Charulatha V Signed-off-by: Govindraj.R Signed-off-by: Paul Walmsley commit 7cffa6b888c77e9386a6b886ef10bc57aac464ec Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP4: hwmod data: Add SIDLE_SMART_WKUP modes to several IPs uart, gpio, wd_timer and i2c does support the new smart-idle with wakeup added in OMAP4. Add the flag to allow the hwmod core to enable this mode when applicable. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit 86009eb326afde34ffdc5648cd344aa86b8d58d4 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Add wakeup support for new OMAP4 IPs The new OMAP4 IPs introduced a new idle mode named smart-idle with wakeup. This new idlemode replaces the enawakeup for the new IPs but seems to coexist as well for some legacy IPs (UART, GPIO, MCSPI...) Add the new SIDLE_SMART_WKUP flag to mark the IPs that support this capability. The omap_hwmod_44xx_data.c will have to be updated to add this new flag. Enable this new mode when applicable in _enable_wakeup, _enable_sysc and _idle_sysc. Signed-off-by: Benoit Cousson Tested-by: Sebastien Guiriec Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak commit f2dd7e09db3e18e4c053810b72fe026685d9bf0c Author: Rajendra Nayak Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Disable clocks when hwmod enable fails In cases where a module (hwmod) does not become accesible on enabling the main clocks (can happen if there are external clocks needed for the module to become accesible), make sure the clocks are not left enabled. This ensures that when the requisite external dependencies are met a omap_hwmod_enable and omap_hwmod_idle/shutdown would rightly enable and disable clocks using clk framework. Leaving the clocks enabled in the error case causes additional usecounting at the clock framework level leaving the clock enabled forever. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit ce35b2446945c506cb02960eab2072f56efdf1c0 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Remove omap_hwmod_mutex The hwmod list will be built are init time and never be modified at runtime. There is no need anymore to protect the list from concurrent accesses using a mutex. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 01592df95049a6f3d4abb0571ae1c7cb6e9d1cd7 Author: Benoit Cousson Date: Tue Dec 21 21:31:28 2010 -0700 OMAP2+: hwmod: Mark functions used only during initialization with __init _register, _find_mpu_port_index and _find_mpu_rt_base are static APIs that will be used only during the omap_hwmod initialization phase. There is no need to keep them for runtime. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 0102b62789af5aed92cea4cf7f36afaa1ab12c72 Author: Benoit Cousson Date: Tue Dec 21 21:31:27 2010 -0700 OMAP2+: hwmod: Make omap_hwmod_register private and remove omap_hwmod_unregister Do not allow omap_hwmod_register to be used outside the core hwmod code. An omap_hwmod should be registered only at init time. Remove the omap_hwmod_unregister that is not used today since the hwmod list will be built once at init time and never be modified at runtime. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 50ebb7772c8975086dbfc3d21be74dd806650df4 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP2430: hwmod data: Use common dev_attr for i2c1 and i2c2 Since i2c1 and i2c2 are using the same data, remove the two previous instances and use a common i2c_dev_attr one. Moreover, that will fix the following warning: arch/arm/mach-omap2/omap_hwmod_2430_data.c:485: warning: 'i2c_dev_attr' defined but not used Signed-off-by: Benoit Cousson Acked-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Charulatha V commit ce8aceae842bceaa4d74a9122208576e5a00c9a3 Merge: 90a8a73 460ed69 Author: Kukjin Kim Date: Wed Dec 22 13:11:38 2010 +0900 Merge branch 'next-samsung-asoc' into next-samsung-asoc2 commit 5a7ddcbdaf1bb7603422fb6188156ccc39711b0f Author: Kevin Hilman Date: Tue Dec 21 21:08:34 2010 -0700 OMAP2+: omap_hwmod: fix wakeup enable/disable for consistency In the omap_hwmod core, most of the SYSCONFIG register helper functions do not directly write the register, but instead just modify a value passed in. This patch converts the _enable_wakeup() and _disable_wakeup() helper functions to take a value argument and only modify it instead of actually writing the register. This makes the wakeup helpers consistent with the other helper functions and avoids unintentional problems like the following. This problem was found after discovering that GPIO wakeups were no longer functional. The root cause was that the ENAWAKEUP bit of the SYSCONFIG register was being unintentionaly overwritten, leaving wakeups disabled after the following two commits were combined: commit: 9980ce53c97392a3dbdc9d1ac3e455d79b4167ed OMAP: hwmod: Enable module wakeup if in smartidle commit: 78f26e872f77b6312273216de1a8f836c6f2e143 OMAP: hwmod: Set autoidle after smartidle during _sysc_enable There resulting in code in _enable_sysc() was this: /* * XXX The clock framework should handle this, by * calling into this code. But this must wait until the * clock structures are tagged with omap_hwmod entries */ if ((oh->flags & HWMOD_SET_DEFAULT_CLOCKACT) && (sf & SYSC_HAS_CLOCKACTIVITY)) _set_clockactivity(oh, oh->class->sysc->clockact, &v); _write_sysconfig(v, oh); so here, 'v' has wakeups disabled. /* If slave is in SMARTIDLE, also enable wakeup */ if ((sf & SYSC_HAS_SIDLEMODE) && !(oh->flags & HWMOD_SWSUP_SIDLE)) _enable_wakeup(oh); Here wakeup is enabled in the SYSCONFIG register (but 'v' is not updated) /* * Set the autoidle bit only after setting the smartidle bit * Setting this will not have any impact on the other modules. */ if (sf & SYSC_HAS_AUTOIDLE) { idlemode = (oh->flags & HWMOD_NO_OCP_AUTOIDLE) ? 0 : 1; _set_module_autoidle(oh, idlemode, &v); _write_sysconfig(v, oh); } And here, SYSCONFIG is updated again using 'v', which does not have wakeups enabled, resulting in ENAWAKEUP being cleared. Special thanks to Benoit Cousson for pointing out that wakeups were supposed to be automatically enabled when a hwmod is enabled, and thus helping target the root cause of this problem. Signed-off-by: Paul Walmsley Cc: Benoit Cousson Signed-off-by: Benoit Cousson Signed-off-by: Kevin Hilman commit b399bca897802db3f342b6f3032a19ab8f2af99b Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod & clock data: Fix GPIO opt_clks and ocp_if iclk Fix opt clocks name in clock framework and hwmod. Add the missing iclk in the ocp_if structure. Add the HWMOD_CONTROL_OPT_CLKS_IN_RESET flag to ensure the the GPIO optional clock is enable during reset. Signed-off-by: Benoit Cousson Tested-by: Charulatha V Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 8f25bdc55d619bdd469a90b82743248680422507 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod data: Add IVA and DSP Add IVA and DSP hwmods in order to allow the pm code to initialize properly the processors devices during omap2_init_processor_devices. It will avoid the following warnings. _init_omap_device: could not find omap_hwmod for iva _init_omap_device: could not find omap_hwmod for dsp Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit 659fa8222c0ca1061d74cb3282614c017f415fe5 Author: Benoit Cousson Date: Tue Dec 21 21:08:34 2010 -0700 OMAP4: hwmod data: Fix missing address in DMM and EMIF_FW The DMM is a piece of interconnect that need to be configured properly for the tiler functionnality. It thus exposes some configuration registers that were missing previously. Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 0cfe8751bbb8703bc77beb031eb6f4edf3d601d3 Author: Benoit Cousson Date: Tue Dec 21 21:08:33 2010 -0700 OMAP4: hwmod data: Add SYSS_HAS_RESET_STATUS flag Update the data for GPIO, UART, WD_TIMER and I2C in order to support the new reset status flag introduce in the following commit: commit 2cb068149c365f1c2b10f2ece6786139527dcc16 OMAP: hwmod: Fix softreset status check for some new OMAP4 IPs Without this flag properly set, the reset is done, but the hwmod core code will not wait for the reset completion to continue its excecution. Signed-off-by: Benoit Cousson Tested-by: Charulatha V Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Govindraj.R Cc: Kevin Hilman commit 3b54baad8a79cc252e9d6a5ccc796b4c8b2b7173 Author: Benoit Cousson Date: Tue Dec 21 21:08:33 2010 -0700 OMAP4: hwmod data: Fix hwmod entries order The original OMAP4 hwmod data files is fully generated from HW database. But since the file is introduced incrementaly along with driver that uses the data, it has to be splitted by the driver owner and then re-merged by the maintainer. Because of the similarity of the data, git is completely lost during such merge and thus the data does not look like the original one at the end. Re-order properly the structures to stay in sync with original data set. This makes it much easier to diff the autogenerated script output with what's in mainline, see differences, and generate patches for those diffs. The goal is to stay in sync with the autogenerated data from now on. Add a comment that does contain all the IPs that can have a hwmod, but do not have it in the file for the moment. It gives a good indication of the progress. Signed-off-by: Benoit Cousson [paul@pwsan.com: updated to apply against current core integration branch, commit message slightly amplified; fixed opt_clks_cnt whitespace] Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Govindraj.R Cc: Charulatha V Cc: Kevin Hilman commit 65ae65c9058eb41e9566ffd12699607c68b23e5f Author: Janusz Krzysztofik Date: Tue Dec 21 21:08:15 2010 -0700 OMAP1: clock_data: use runtime cpu / machine checks Otherwise multi-omap1 configurations may set wrong clock speed. Created and tested against l-o master on Amstrad Delta. Signed-off-by: Janusz Krzysztofik Signed-off-by: Paul Walmsley commit 1124d2f9186ec9e42e1c3f78c20199ba2cb597e2 Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP2/3: SRAM: add comment about crashes during a TLB miss Some users were observing crashes during the execution of CORE DVFS code from OCM RAM -- a locally-modified copy of the linux-omap code. Richard Woodruff tracked this down to a DTLB miss which had been inadvertently and intermittently caused by the local modifications. (The TLB miss caused the ARM MMU to attempt to walk the page tables stored in SDRAM, which was not possible since SDRAM is off-line for a portion of the CORE DVFS OCM RAM code.) Add a note to the OMAP2 & OMAP3 CORE DVFS SRAM code to warn others that changes may result in crashes here if they are not carefully tested. Signed-off-by: Paul Walmsley Cc: Richard Woodruff Cc: Jon Hunter Cc: Nishanth Menon commit f1f4b7703f8fd165ece458ae97ebddb2b62b2ce3 Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP3: clock: fix incorrect rate display when switching MPU rate at boot The OMAP3 clock code contains some legacy code to allow the MPU rate to be specified as a kernel command line parameter. If the 'mpurate' parameter is specified, the kernel will attempt to switch the MPU rate to this rate during boot. As part of this process, a short message "Switched to new clocking rate" is generated -- and in this message, the "Core" clock rate and "MPU" clock rate are transposed. This patch ensures that the clock rates are displayed in the correct order. Thanks to Bruno Guerin for reporting this bug and proposing a fix. Thanks to Richard Woodruff for reviewing the problem and passing the report on. Signed-off-by: Paul Walmsley Cc: Bruno Guerin Cc: Richard Woodruff commit 553d239aadc75bee70c7858ac4548d073cb3daff Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP3: clock: clarify usage of struct clksel_rate.flags and struct omap_clk.cpu Clarify the usage of the struct omap_clk.cpu flags (e.g., CK_*) to use bits only for individual SoC variants (e.g., CK_3430ES1, CK_3505, etc.). Superset flags, such as CK_3XXX or CK_AM35XX, are now defined as disjunctions of individual SoC variant flags. This simplifies the definition and use of these flags. struct omap_clk record definitions can now simply specify the bitmask of actual SoCs that the records are valid for. The clock init code can simply set a single CPU type mask bit for the SoC that is currently in use, and test against that, rather than needing to set some combination of flags. Similarly, clarify the use of struct clksel_rate.flags. The bit allocated for RATE_IN_3XXX has been reassigned, and RATE_IN_3XXX has been defined as a disjunction of the 34xx and 36xx rate flags. The advantages are the same as the above. Clarify the usage of struct omap_clk.cpu flags such as CK_34XX to only apply to the SoCs that they name, e.g., OMAP34xx chips. The previous practice caused significantly different SoCs, such as OMAP36xx, to be included in CK_34XX. In my opinion, this is much more intuitive. Similarly, clarify the use of struct clksel_rate.flags, such that RATE_IN_3430ES2PLUS now only applies to 34xx chips with ES level >= 2 - it does not apply to OMAP36xx. ... At some point, it probably makes sense to collapse the CK_* and RATE_IN_* flags together into a single bitfield, and possibly use the existing CHIP_IS_OMAP* flags for platform detection. ... This all seems to work fine on OMAP34xx and OMAP36xx Beagle. Not sure if it works on Sitara or the TI816X, unfortunately I don't have any here to test with. Signed-off-by: Paul Walmsley commit d4521f6731756c82a76d3e791c3ec2d28b38f97e Author: Paul Walmsley Date: Tue Dec 21 21:08:14 2010 -0700 OMAP2xxx clock: fix dss2_fck recalc to use clksel dss2_fck is a clksel clock, and therefore its rate should be recalculated with the clksel mechanism. This was working in early 2009, but was one of the casualties of the big OMAP clock merge between 2.6.29 and 2.6.30. Signed-off-by: Paul Walmsley commit cb13459b38c8f2e99df4923d2a71ce6db99f2436 Author: Rajendra Nayak Date: Tue Dec 21 21:08:14 2010 -0700 OMAP4: clock data: Export control to enable/disable CORE/PER M3 clocks The CORE and PER M3 post dividers are different from the rest of the DPLL post dividers as in they go to SCRM, and are used there to export clocks for instance used by external sensor. There is no automatic HW dependency in PRCM to manage them. Hence these two clocks (dpll post dividers) should be managed by SW and explicitly enabled/disabled. Add control in clock framework to handle that. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit e0cb70c565acffb210ffa2a4590637d1844d13c5 Author: Rajendra Nayak Date: Tue Dec 21 21:08:14 2010 -0700 OMAP4: clock data: Add SCRM auxiliary clock nodes Add support for auxiliary clocks nodes which are part of SCRM. Signed-off-by: Rajendra Nayak Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley commit 768ab94f8b2b16a23fa10900430c10ec44f2643e Author: Jonathan Bergsagel Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add missing fields in iva_hsd_byp_clk_mux_ck Add register address, mask and link to the clksel structure that were missing in the IVA DPLL mux clock node. Signed-off-by: Jonathan Bergsagel Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 032b5a7e3aa7dca8a13a79ff6a59232d307552a3 Author: Thara Gopinath Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add missing DPLL x2 clock nodes This patch extends the OMAP4 clock data to include various x2 clock nodes between DPLL and HS dividers as the clock framework skips a x2 while calculating the dpll locked frequency. The clock database extensions are autogenerated using the scripts maintained by Benoit Cousson. Signed-off-by: Benoit Cousson Signed-off-by: Thara Gopinath [paul@pwsan.com: fixed merge conflicts against v2.6.37-rc5; dropped dpll_mpu_x2_ck on advice from Benoît] Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit ae4b4fc1bb59ad8802800a8103a6519acadcc9cf Author: Benoit Cousson Date: Tue Dec 21 21:08:13 2010 -0700 OMAP3: clock data: Add "wkup_clkdm" in sr1_fck and sr2_fck The smartreflex modules belong to an ALWON_FCLK clock domain that does not have any SW control. The gating of that interface clock is triggered by a transition of the WKUP clock domain to idle. Attach both smartreflex instances on OMAP3 to the WKUP clock domain. The missing clock domain field in srX_fck clock nodes was reported by Kevin during the discussion about smartreflex on OMAP3: https://patchwork.kernel.org/patch/199342/ Signed-off-by: Benoit Cousson Signed-off-by: Paul Walmsley Cc: Kevin Hilman commit d9b98f5f9e20389c43370539ef3de4aba7cf1d79 Author: Benoit Cousson Date: Tue Dec 21 21:08:13 2010 -0700 OMAP4: clock data: Add control for pad_clks_ck and slimbus_clk The gating of pad_clks and slimbus_ck is controlled by the PRCM, but since the clock source is external, this is the SW responsability to gate / un-gate it when the mcpdm or slimbus module need to be used. There is no autogating possible with such external clock. Add SW control to enable / disable this SW gating in the pad_clks_ck and slimbus_clk clock node. Signed-off-by: Benoit Cousson Signed-off-by: Sebastien Guiriec Signed-off-by: Paul Walmsley Cc: Rajendra Nayak commit 596efe4792c50163578578bd4fe470f97652aad7 Author: Paul Walmsley Date: Tue Dec 21 21:05:16 2010 -0700 OMAP3: control/PM: move padconf save code to mach-omap2/control.c Move the padconf save code from pm34xx.c to the System Control Module code in mach-omap2/control.c. This is part of the general push to move direct register access from middle-layer core code to low-level core code, so the middle-layer code can be abstracted to work on multiple platforms and cleaned up. In the medium-to-long term, this code should be called by the mux layer code, not the PM idle code. This is because, according to the TRM, saving the padconf only needs to be done when the padconf changes[1]. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Tony Lindgren Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar 1. OMAP34xx Multimedia Device Silicon Revision 3.1.x [Rev. ZH] [SWPU222H] Section 4.11.4 "Device Off-Mode Sequences" commit 72e06d087204f3bc9acf281717b90ebf0b9731f7 Author: Paul Walmsley Date: Tue Dec 21 21:05:16 2010 -0700 OMAP2+: powerdomain: move header file from plat-omap to mach-omap2 The OMAP powerdomain code and data is all OMAP2+-specific. This seems unlikely to change any time soon. Move plat-omap/include/plat/powerdomain.h to mach-omap2/powerdomain.h. The primary point of doing this is to remove the temptation for unrelated upper-layer code to access powerdomain code and data directly. As part of this process, remove the references to powerdomain data from the GPIO "driver" and the OMAP PM no-op layer, both in plat-omap. Change the DSPBridge code to point to the new location for the powerdomain headers. The DSPBridge code should not be including the powerdomain headers; these should be removed. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Omar Ramirez Luna Cc: Felipe Contreras Cc: Greg Kroah-Hartman commit 1540f214065982e6cbc6b8da1fe65a15e358f7c5 Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2+: clockdomain: move header file from plat-omap to mach-omap2 The OMAP clockdomain code and data is all OMAP2+-specific. This seems unlikely to change any time soon. Move plat-omap/include/plat/clockdomain.h to mach-omap2/clockdomain.h. The primary point of doing this is to remove the temptation for unrelated upper-layer code to access clockdomain code and data directly. DSPBridge also uses the clockdomain headers for some reason, so, modify it also. The DSPBridge code should not be including the clockdomain headers; these should be removed. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Omar Ramirez Luna Cc: Felipe Contreras Cc: Greg Kroah-Hartman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit 55ae35073b1c76f24c3736cf797c40d9932b19aa Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2/3: clockdomain: remove unneeded .clkstctrl_reg, remove some direct CM register accesses Reverse some of the effects of commit 84c0c39aec31a09571fc08a752a2f4da0fe9fcf2 ("ARM: OMAP4: PM: Make OMAP3 Clock-domain framework compatible for OMAP4"). On OMAP2/3, the CM_CLKSTCTRL register is at a constant offset from the powerdomain's CM instance. Also, remove some of the direct CM register access from the clockdomain code, moving it to the OMAP2/3 CM code instead. The intention here is to simplify the clockdomain code. (The long-term goal is to move all direct CM register access across the OMAP core code to the appropriate cm*.c file.) Signed-off-by: Paul Walmsley Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit bd2122ca358fbd5c8e94869ae731a0951b36c757 Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP4: clockdomains: add OMAP4 PRCM data and OMAP4 support Add PRCM partition, CM instance register address offset, and clockdomain register address offset to each OMAP4 struct clockdomain record. Add OMAP4 clockdomain code to use this new data to access registers properly. While here, clean up some nearby clockdomain code to allocate auto variables in my recollection of Linus's preferred style. The autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Cc: Benoît Cousson Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit e4156ee52fe617c2c2d80b5db993ff4bf07d7c3c Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP4: CM instances: add clockdomain register offsets In OMAP4 CM instances, some registers (CM_CLKSTCTRL, CM_STATICDEP, CM_DYNAMICDEP, and the module-specific registers underneath) are organized by clockdomain. Add the clockdomain offset macros to the appropriate PRCM module header files. This data was almost completely autogenerated from the TI hardware database; the autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit b170fbe1f9f1aa38773b1bcf064ab65951ce739d Author: Paul Walmsley Date: Tue Dec 21 21:05:15 2010 -0700 OMAP2+: clockdomains: split the clkdm hwsup enable/disable function Split _omap2_clkdm_set_hwsup() into _disable_hwsup() and _enable_hwsup(). While here, also document that the autodeps are deprecated and that they should be removed at the earliest opportunity. The documentation has been fixed for _{enable,disable}_hwsup(), thanks to Kevin Hilman for pointing out that those functions still had placeholder documentation in an earlier patch revision. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit a64bb9cda8b12f599766c7dfe81770d2082a133a Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: powerdomains: add PRCM partition data; use OMAP4 PRM functions OMAP4 powerdomain control registers are split between the PRM hardware module and the PRCM_MPU local PRCM. Add this PRCM partition information to each OMAP4 powerdomain record, and convert the OMAP4 powerdomain function implementations to use the OMAP4 PRM instance functions. Also fixes a potential null pointer dereference of pwrdm->name. The autogeneration scripts have been updated. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Cc: Benoît Cousson Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit c4d7e58fb52c632d8e33cd23a4917d7a7f8302ac Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP2/3: PRM/CM: prefix OMAP2 PRM/CM functions with "omap2_" Now that OMAP4-specific PRCM functions have been added, distinguish the existing OMAP2/3-specific PRCM functions by prefixing them with "omap2_". This patch should not result in any functional change. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Jarkko Nikula Cc: Peter Ujfalusi Cc: Liam Girdwood Cc: Mark Brown Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit dac9a77120e2724e22696f06f3ecb4838da1e3e4 Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: PRCM: move global reset function for OMAP4 to an OMAP4-specific file Move the OMAP4 global software reset function to the OMAP4-specific prm44xx.c file, where it belongs. Part of the long-term process of moving all of the direct PRCM register writes into lower-layer code. Also add OCP barriers on OMAP2/3/4 to reduce the chance that the MPU will continue executing while the system is supposed to be resetting itself. Signed-off-by: Paul Walmsley Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 2ace831ffc8feaffb8bc03da89ff43d948efdc97 Author: Paul Walmsley Date: Tue Dec 21 21:05:14 2010 -0700 OMAP4: PRCM: add OMAP4-specific accessor/mutator functions In some ways, the OMAP4 PRCM register layout is quite different than the OMAP2/3 PRCM register layout. For example, on OMAP2/3, from a register layout point of view, all CM instances were located in the CM subsystem, and all PRM instances were located in the PRM subsystem. OMAP4 changes this. Now, for example, some CM instances, such as WKUP_CM and EMU_CM, are located in the system PRM subsystem. And a "local PRCM" exists for the MPU - this PRCM combines registers that would normally appear in both CM and PRM instances, but uses its own register layout which matches neither the OMAP2/3 PRCM layout nor the OMAP4 PRCM layout. To try to deal with this, introduce some new functions, omap4_cminst* and omap4_prminst*. The former is to be used when writing to a CM instance register (no matter what subsystem or hardware module it exists in), and the latter, similarly, with PRM instance registers. To determine which "PRCM partition" to write to, the functions take a PRCM instance ID argument. Subsequent patches add these partition IDs to the OMAP4 powerdomain and clockdomain definitions. As far as I can see, there's really no good way to handle these types of register access inconsistencies. This patch seemed like the least bad approach. Moving forward, the long-term goal is to remove all direct PRCM register access from the PM code. PRCM register access should go through layers such as the powerdomain and clockdomain code that can hide the details of how to interact with the specific hardware variant. While here, rename cm4xxx.c to cm44xx.c to match the naming convention of the other OMAP4 PRCM files. Thanks to Santosh Shilimkar , Rajendra Nayak , and Benoît Cousson for some comments. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Santosh Shilimkar commit 17d6ce11195fceda62af00beefde37e37a01337c Author: Aaro Koskinen Date: Mon Dec 20 23:50:22 2010 +0200 sisfb: eliminate compiler warnings Convert some bit masks to 8-bit values to avoid the following compiler warnings: drivers/video/sis/sis_main.c:3858: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5855: warning: large integer implicitly truncated to unsigned type drivers/video/sis/init301.c:5869: warning: large integer implicitly truncated to unsigned type Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 114776776a8e38fff5772efeef68fc3fdde76a82 Author: Aaro Koskinen Date: Mon Dec 20 23:50:21 2010 +0200 sisfb: delete unused register I/O macros Delete unused register I/O macros. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit ad78adb4e814104510da421a38cfe89ab018a8b1 Author: Aaro Koskinen Date: Mon Dec 20 23:50:20 2010 +0200 sisfb: replace setSISIDXREG with SiS_SetRegANDOR Replace setSISIDXREG() with SiS_SetRegANDOR(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 667a8b4114641895c90f8c98db1678c0bfa056df Author: Aaro Koskinen Date: Mon Dec 20 23:50:19 2010 +0200 sisfb: replace andSISIDXREG with SiS_SetRegAND Replace andSISIDXREG() with SiS_SetRegAND(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 27799d6c40828d5983fb1778ad3089740b946af8 Author: Aaro Koskinen Date: Mon Dec 20 23:50:18 2010 +0200 sisfb: replace orSISIDXREG with SiS_SetRegOR Replace orSISIDXREG() with SiS_SetRegOR(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 44b751bbe1fb6e7a75bbdee2d0c5f3ee133d6b0f Author: Aaro Koskinen Date: Mon Dec 20 23:50:17 2010 +0200 sisfb: replace outSISIDXREG with SiS_SetReg Replace outSISIDXREG() with SiS_SetReg(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit e57d413681b6d9c3d256eeac1e34f0d1b8b81e26 Author: Aaro Koskinen Date: Mon Dec 20 23:50:16 2010 +0200 sisfb: replace inSISIDXREG with SiS_GetReg Replace inSISIDXREG() with SiS_GetReg(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 63e13f8e2b4873b97d78567de8ad4dbcc63740db Author: Aaro Koskinen Date: Mon Dec 20 23:50:15 2010 +0200 sisfb: replace outSISREG with SiS_SetRegByte Replace outSISREG() with SiS_SetRegByte(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 1e1687d78bcaba01c7a22ef8564af2029e8e9919 Author: Aaro Koskinen Date: Mon Dec 20 23:50:14 2010 +0200 sisfb: replace inSISREG with SiS_GetRegByte Replace inSISREG() with SiS_GetRegByte(). Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit f0611a5c220e50dec65041b10bd2fe9484f061a6 Author: Paul Walmsley Date: Tue Dec 21 15:30:56 2010 -0700 OMAP3: PRM/CM: separate CM context save/restore; remove PRM context save/restore The OMAP3 PRM module is in the WKUP powerdomain, which is always powered when the chip is powered, so it shouldn't be necessary to save and restore those PRM registers. Remove the PRM register save/restore code, which should save several microseconds during off-mode entry/exit, since PRM register accesses are relatively slow. While doing so, move the CM register save/restore code into CM-specific code. The CM module has been distinct from the PRM module since 2430. This patch includes some minor changes to pm34xx.c. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Rajendra Nayak Cc: Tero Kristo Cc: Kalle Jokiniemi Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit f48b9644ef330a13c6bb16ca85c2efdbe7e25558 Author: Aaro Koskinen Date: Mon Dec 20 23:50:13 2010 +0200 sisfb: change register I/O functions to use fixed size types Use fixed-sized types (u8, u16, u32) instead of plain C types. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit e68046b72e9b35d054e3d98d71dc2c69d7e88e1e Author: Aaro Koskinen Date: Mon Dec 20 23:50:12 2010 +0200 sisfb: remove duplicate function declarations Remove duplicate register I/O function declarations by moving them into a common header file. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit b5b7dda7b5d9126d531ffa212b6a89d72aeac90a Author: Aaro Koskinen Date: Mon Dec 20 23:50:11 2010 +0200 sisfb: delete HAVE_CONFIG_H checks Delete unneeded HAVE_CONFIG_H checks. Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 679c489fffe1ca426de1faa1ba51f0413149d139 Author: Aaro Koskinen Date: Mon Dec 20 23:50:10 2010 +0200 sisfb: eliminate unused variable compiler warning Eliminate the following compiler warning on non-x86 platforms by limiting the variable scope: drivers/video/sis/sis_main.c:4108: warning: unused variable 'temp' Signed-off-by: Aaro Koskinen Cc: Thomas Winischhofer Signed-off-by: Paul Mundt commit 7ccbefe07ea0a3570e44d1ec13a307552ee4dadd Merge: 623eb15 90a8a73 Author: Paul Mundt Date: Wed Dec 22 12:56:10 2010 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 59fb659b065f52fcc2deed293cfbfc58f890376c Author: Paul Walmsley Date: Tue Dec 21 15:30:55 2010 -0700 OMAP2/3: PRCM: split OMAP2/3-specific PRCM code into OMAP2/3-specific files In preparation for adding OMAP4-specific PRCM accessor/mutator functions, split the existing OMAP2/3 PRCM code into OMAP2/3-specific files. Most of what was in mach-omap2/{cm,prm}.{c,h} has now been moved into mach-omap2/{cm,prm}2xxx_3xxx.{c,h}, since it was OMAP2xxx/3xxx-specific. This process also requires the #includes in each of these files to be changed to reference the new file name. As part of doing so, add some comments into plat-omap/sram.c and plat-omap/mcbsp.c, which use "sideways includes", to indicate that these users of the PRM/CM includes should not be doing so. Thanks to Felipe Contreras for comments on this patch. Signed-off-by: Paul Walmsley Cc: Jarkko Nikula Cc: Peter Ujfalusi Cc: Liam Girdwood Cc: Omar Ramirez Luna Acked-by: Omar Ramirez Luna Cc: Felipe Contreras Acked-by: Felipe Contreras Cc: Greg Kroah-Hartman Acked-by: Mark Brown Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit cdb54c4457d68994da7c2e16907adfbfc130060d Author: Paul Walmsley Date: Tue Dec 21 15:30:55 2010 -0700 OMAP4: PRCM: rename _MOD macros to _INST Back in the OMAP2/3 PRCM interface days, the macros that referred to the offsets of individual PRM/CM instances from the top of the PRM/CM hardware modules were incorrectly suffixed with "_MOD". (They should have been suffixed with something like "_INST" or "_INSTANCE".) These days, now that we have better contact with the OMAP hardware people, we know that this naming is wrong. And in fact in OMAP4, there are actual hardware module offsets inside the instances, so the incorrect naming gets confusing very quickly for anyone who knows the hardware. Fix this naming for OMAP4, before things get too far along, by changing "_MOD" to "_INST" on the end of these macros. So, for example, OMAP4430_CM2_INSTR_MOD becomes OMAP4430_CM2_INSTR_INST. This unfortunately creates quite a large diff, but it is a straightforward rename. This patch should not result in any functional changes. The autogeneration scripts have been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Cc: Santosh Shilimkar Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 0f318fd52d7e251c5f48416c3e7156acc680d81c Author: Benoit Cousson Date: Tue Dec 21 15:30:54 2010 -0700 OMAP4: PRCM: Add SCRM header file Add the header file with scrm registers absolute address, offset and bitfields. Signed-off-by: Benoit Cousson Signed-off-by: Rajendra Nayak [paul@pwsan.com: renamed OMAP4_SCRM to OMAP4_SCRM_BASE] Signed-off-by: Paul Walmsley commit d198b514bd9e94930ee0b9ca1cad0a51f5e29608 Author: Paul Walmsley Date: Tue Dec 21 15:30:54 2010 -0700 OMAP4: PRCM: reorganize existing OMAP4 PRCM header files Split the existing cm44xx.h file into cm1_44xx.h and cm2_44xx.h files so they match their underlying OMAP hardware modules. Add clockdomain offset information. Add header files for the MPU local PRCM, prcm_mpu44xx.h, and for the SCRM, scrm44xx.h. SCRM register offsets still need to be added; TI should do this. Move the "_MOD" macros out of the prcm-common.h header file, into the header file of the hardware module that they belong to. For example, OMAP4430_PRM_*_MOD macros have been moved into the prm44xx.h header. Adjust #includes of all files that used the old PRCM header file names to point to the new filenames. The autogeneration scripts have been updated accordingly. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Rajendra Nayak Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Rajendra Nayak Tested-by: Santosh Shilimkar commit f5f9d132d1c212bf3828c7926d95f79e0c20d243 Author: Paul Walmsley Date: Tue Dec 21 15:30:53 2010 -0700 OMAP3: control/PRCM: move CONTROL_PADCONF_SYS_NIRQ save/restore to SCM code For some reason, the PRCM context save/restore code also saves and restores a single System Control Module register, CONTROL_PADCONF_SYS_NIRQ. This is probably just an error -- the register should be handled by SCM code -- so this patch moves it there. If this register really does need to be saved and restored before the rest of the PRCM registers, the code to do so should live in the SCM code, and the PM code should call this separate function. This register pertains to devices with a stacked modem, so this patch is unlikely to affect most OMAP devices out there. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 166353bd75587a2158d713af1b9489a79e0ce297 Author: Paul Walmsley Date: Tue Dec 21 20:01:21 2010 -0700 OMAP3: control/PRCM: add omap3_ctrl_write_boot_mode() Get rid of the open-coded scratchpad write in mach-omap2/prcm.c and replace it with an actual API, omap3_ctrl_write_boot_mode(). While there, get rid of the gratuitous omap_writel(). There's not much documentation available for what should wind up in the scratchpad here, so more documentation would be appreciated. Also, at some point, we should formalize our treatment of the scratchpad; right now, accesses to the scratchpad are not well-documented. Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar commit dc0b3a701499bb7727314d7a9c764f7486db4802 Author: Paul Walmsley Date: Tue Dec 21 20:01:20 2010 -0700 OMAP2+: clockdomains: move clockdomain static data to .c files Static data should be declared in .c files, not .h files. It should be possible to #include .h files at any point without creating multiple copies of the same data. We converted the clock data to .c files some time ago. This patch does the same for the clockdomain data. Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 6e01478ae8a4322c9a2b2d6efed50196265ed5f2 Author: Paul Walmsley Date: Tue Dec 21 20:01:20 2010 -0700 OMAP2+: powerdomains: move powerdomain static data to .c files Static data should be declared in .c files, not .h files. It should be possible to #include .h files at any point without creating multiple copies of the same data. We converted the clock data to .c files some time ago. This patch does the same for the powerdomain data. Signed-off-by: Paul Walmsley Cc: Rajendra Nayak Cc: Santosh Shilimkar Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 4b4f62c4672805466652a785070cc2ac8a398e16 Author: Santosh Shilimkar Date: Tue Dec 21 20:01:19 2010 -0700 OMAP4: powerdomain: Add pwrdm_clear_all_prev_pwrst Like OMAP3, OMAP4430 ES2 has additional bitfields in PWRSTST register which help identify the previous power state entered by the powerdomain. Add pwrdm_clear_all_prev_pwrst to the OMAP4 powerdomains implementation to support this. Signed-off-by: Santosh Shilimkar Signed-off-by: Rajendra Nayak [paul@pwsan.com: clarified commit message] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 9b7fc907d9378f86eb6b823bbe84ec9ed584b091 Author: Rajendra Nayak Date: Tue Dec 21 20:01:19 2010 -0700 OMAP: powerdomain: Arch specific funcs for mem control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_mem_onst .pwrdm_set_mem_retst .pwrdm_read_mem_pwrst .pwrdm_read_prev_mem_pwrst .pwrdm_read_mem_retst .pwrdm_clear_all_prev_pwrst .pwrdm_enable_hdwr_sar .pwrdm_disable_hdwr_sar .pwrdm_wait_transition .pwrdm_set_lowpwrstchange Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak [paul@pwsan.com: rearranged Makefile changes] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar commit 12627578523d2d9396cae76b1dad0ed3dccf1730 Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: Arch specific funcs for logic control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_logic_retst .pwrdm_read_logic_pwrst .pwrdm_read_prev_logic_pwrst .pwrdm_read_logic_retst Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit f327e07b0ef9c60a6018799c9f04de10101d8e5a Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: Arch specific funcs for state control Define the following architecture specific funtions for omap2/3/4 .pwrdm_set_next_pwrst .pwrdm_read_next_pwrst .pwrdm_read_pwrst .pwrdm_read_prev_pwrst Convert the platform-independent framework to call these functions. Signed-off-by: Rajendra Nayak [paul@pwsan.com: remove remaining static allocations in powerdomains.h file; remove path in file header comments, rearranged Makefile changes] Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 3b1e8b21fcbd686445f0bb42f84701b4621cdec6 Author: Rajendra Nayak Date: Tue Dec 21 20:01:18 2010 -0700 OMAP: powerdomain: 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 powerdomain framework into platform-independent part (for all omaps) and platform-specific parts. Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Kevin Hilman Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit 74bea6b9881f4b32f6c0379e46d2f5e16fd34a07 Author: Rajendra Nayak Date: Tue Dec 21 20:01:17 2010 -0700 OMAP: powerdomain: Move static allocations from powerdomains.h to a .c file powerdomains.h header today has only static definitions. Adding any function declarations into it and including it in multiple source file is expected to cause issues. Hence move all the static definitions from powerdomains.h file into powerdomains_data.c file. Also, create a new powerdomain section of the mach-omap2/Makefile, and rearrange the prcm-common part of the Makefile, now that the powerdomain code is in its own Makefile section. Signed-off-by: Rajendra Nayak [paul@pwsan.com: rearrange Makefile changes, tweaked commit message] Signed-off-by: Paul Walmsley Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman Tested-by: Santosh Shilimkar Tested-by: Rajendra Nayak commit ff2516fbef20ed9edd9cc2fc8b8b48d5cb5a932f Author: Paul Walmsley Date: Tue Dec 21 15:39:15 2010 -0700 OMAP2+: wd_timer: disable on boot via hwmod postsetup mechanism The OMAP watchdog timer IP blocks require a specific set of register writes to occur before they will be disabled[1], even if the device clocks appear to be disabled in the CM_*CLKEN registers. In the MPU watchdog case, failure to execute this reset sequence will eventually cause the watchdog to reset the OMAP unexpectedly. Previously, the code to disable this watchdog was manually called from mach-omap2/devices.c during device initialization. This causes the watchdog to be unconditionally disabled for a portion of kernel initialization. This should be controllable by the board-*.c files, since some system integrators will want full watchdog coverage of kernel initialization. Also, the watchdog disable code was not connected to the hwmod shutdown code. This means that calling omap_hwmod_shutdown() will not, in fact, disable the watchdog, and the goal of omap_hwmod_shutdown() is to be able to shutdown any on-chip OMAP device. To resolve the latter problem, populate the pre_shutdown pointer in the watchdog timer hwmod classes with a function that executes the watchdog shutdown sequence. This allows the hwmod code to fully disable the watchdog. Then, to allow some board files to support watchdog coverage throughout kernel initialization, add common code to mach-omap2/io.c to cause the MPU watchdog to be disabled on boot unless a board file specifically requests it to remain enabled. Board files can do this by changing the watchdog timer hwmod's postsetup state between the omap2_init_common_infrastructure() and omap2_init_common_devices() function calls. 1. OMAP34xx Multimedia Device Silicon Revision 3.1.x Rev. ZH [SWPU222H], Section 16.4.3.6, "Start/Stop Sequence for WDTs (Using WDTi.WSPR Register)" Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Charulatha Varadarajan commit 81fbc5ef9b22df2e2198dd0c530719a263a8d1c5 Author: Paul Walmsley Date: Tue Dec 21 19:56:17 2010 -0700 OMAP2+: wd_timer: separate watchdog disable code from the rest of mach-omap2/devices.c Split the wd_timer disable code out into its own file, mach-omap2/wd_timer.c; it belongs in its own file rather than cluttering up devices.c. Signed-off-by: Paul Walmsley Cc: Charulatha Varadarajan commit 233cbe5b94096f95ba7bca2162d63275b0b90b5b Author: Rajendra Nayak Date: Tue Dec 14 12:42:36 2010 -0700 OMAP2+: hwmod: Update the sysc_cache in case module context is lost Do not skip the sysc programming in the hmwod framework based on the cached value alone, since at times the module might have lost context (due to the Powerdomain in which the module belongs transitions to either Open Switch RET or OFF). Identifying if a module has lost context requires atleast one register read, and since a register read has more latency than a write, it makes sense to do a blind write always. Signed-off-by: Rajendra Nayak Acked-by: Kevin Hilman Signed-off-by: Paul Walmsley Cc: Benoit Cousson Cc: Santosh Shilimkar commit b56b7bc8d9293b64e7a459527ae78078902751ff Author: Paul Walmsley Date: Tue Dec 14 12:42:36 2010 -0700 OMAP2+: hwmod: fix a warning, add some docs, remove unused fields Trivial cleanup and documentation changes on the hwmod code and data: - add some hwmod documentation to indicate flags that should be moved outside the static hwmod data in a future patch - remove some unused fields in the struct omap_hwmod_ocp_if and struct omap_hwmod structures Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit dc6d1cda044b24c3d9f8e4af0431887ebe3488ef Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: upgrade per-hwmod mutex to a spinlock Change the per-hwmod mutex to a spinlock. (The per-hwmod lock serializes most post-initialization hwmod operations such as enable, idle, and shutdown.) Spinlocks are needed, because in some cases, hwmods must be enabled from timer interrupt disabled-context, such as an ISR. The current use-case that is driving this is the OMAP GPIO block ISR: it can trigger interrupts even with its clocks disabled, but these clocks are needed for register accesses in the ISR to succeed. This patch also effectively reverts commit 848240223c35fcc71c424ad51a8e8aef42d3879c - this patch makes _omap_hwmod_enable() and _omap_hwmod_init() static, renames them back to _enable() and _idle(), and changes their callers to call the spinlocking versions. Previously, since omap_hwmod_{enable,init}() attempted to take mutexes, these functions could not be called while the timer interrupt was disabled; but now that the functions use spinlocks and save and restore the IRQ state, it is appropriate to call them directly. Kevin Hilman originally proposed this patch - thanks Kevin. Signed-off-by: Paul Walmsley Cc: Kevin Hilman Cc: Benoît Cousson commit bd36179eec2827cd60b4a8c6e180cc030c74a4ec Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: add support for per-class custom device reset functions The standard omap_hwmod.c _reset() code relies on an IP block's OCP_SYSCONFIG.SOFTRESET register bit to reset the IP block. This works for most IP blocks on the chip, but unfortunately not all. For example, initiator-only IP blocks often don't have any MPU-accessible OCP-header registers, and therefore the MPU can't write to any OCP_SYSCONFIG registers in that block. Other IP blocks, such as the IVA and I2C, require a specialized reset sequence. Since we need to be able to reset these IP blocks as well, allow custom IP block reset functions to be passed into the hwmod code via a per-hwmod-class reset function pointer, struct omap_hwmod_class.reset. If .reset is non-null, then the hwmod _reset() code will call the custom function instead of the standard OCP SOFTRESET-based code. As part of this change, rename most of the existing _reset() function code to _ocp_softreset(), to indicate more clearly that it does not work for all cases. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Paul Hunt Cc: Stanley Liu commit 2092e5ccf89db09ebde94e9aabd3c86d5fa05c6c Author: Paul Walmsley Date: Tue Dec 14 12:42:35 2010 -0700 OMAP2+: hwmod: add postsetup state Allow board files and OMAP core code to control the state that some or all of the hwmods end up in at the end of _setup() (called by omap_hwmod_late_init() ). Reimplement the old skip_setup_idle code in terms of this new postsetup state code. There are two use-cases for this patch: the !CONFIG_PM_RUNTIME case, in which all IP blocks should stay enabled after _setup() finishes; and the MPU watchdog case, in which the watchdog IP block should enter idle if watchdog coverage of kernel initialization is desired, and should be disabled otherwise. Signed-off-by: Paul Walmsley Cc: Benoît Cousson Cc: Kevin Hilman Cc: Charulatha Varadarajan commit e4dc8f507c3066d6fcece988d99b6d766c46af85 Author: Paul Walmsley Date: Tue Dec 14 12:42:34 2010 -0700 OMAP2+: hwmod: allow custom pre-shutdown functions Some OMAP IP blocks, such as the watchdog timers, cannot be completely shut down via the standard hwmod shutdown mechanism. This patch enables the hwmod data files to supply a pointer to a custom pre-shutdown function via the struct omap_hwmod_class.pre_shutdown function pointer. If the struct omap_hwmod_class.pre_shutdown function pointer is non-null, the function will be executed before the existing hwmod shutdown code runs. Signed-off-by: Paul Walmsley Cc: Benoît Cousson commit 4805734bcc5a6b28b527a13a5c1603a2912c9f48 Author: Paul Walmsley Date: Tue Dec 21 15:25:10 2010 -0700 OMAP2+: io: split omap2_init_common_hw() Split omap2_init_common_hw() into two functions. The first, omap2_init_common_infrastructure(), initializes the hwmod code and data, the OMAP PM code, and the clock code and data. The second, omap2_init_common_devices(), handles any other early device initialization that, for whatever reason, has not been or cannot be moved to initcalls or early platform devices. This patch is required for the hwmod postsetup patch, which allows board files to change the state that hwmods should be placed into at the conclusion of the hwmod _setup() function. For example, for a board whose creators wish to ensure watchdog coverage across the entire kernel boot process, code to change the watchdog's postsetup state will be added in the board-*.c file between the omap2_init_common_infrastructure() and omap2_init_common_devices() function calls. Signed-off-by: Paul Walmsley Cc: Tony Lindgren commit 5b59cc2fc2ff90369d6aa7862caaba3cf45b5075 Author: Raghuveer Murthy Date: Tue Dec 21 14:14:34 2010 +0000 OMAP4: Pandaboard: Fix MMC card detect gpio line commit bf56f0a6668cd (2.6.37-rc1), from Nishanth Menon attempted to fix card detection for PandaBoard, unfortunately, the fix missed to initialize .gpio_cd member of omap2_hsmmc_info. This results in a default value of '0', which is a valid GPIO line. On PandaBoard, the side effect of this is that GPIO line 0 controls the powering TFP410 DVI chip, and without the fix DVI chip is inadvertently powered. Tested-by: David Anders Acked-by: Nishanth Menon Signed-off-by: Kishore Kadiyala Signed-off-by: Raghuveer Murthy Signed-off-by: Tony Lindgren commit 79c5f68dc221df729417823d4981373f4762d8eb Author: Thomas Weber Date: Tue Dec 21 11:07:09 2010 +0000 OMAP3: Devkit8000: Add DEBUG_LL support Add support for DEBUG_LL for Devkit8000. Devkit8000 uses uart 3 for debug output. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit d858addf10a00e663e438d7607f18496d30f1d1b Author: Daniel Morsing Date: Tue Dec 21 10:23:13 2010 +0000 OMAP2: Devkit8000: Use _cansleep GPIO functions for displayreset lines The display reset lines are connected to a TPS65930 which may sleep when changing GPIO values. Use the appropriate function to silence a nasty warning from gpiolib. Signed-off-by: Daniel Morsing Acked-by: Thomas Weber Signed-off-by: Tony Lindgren commit b9e7683bbca638967a56e5d7fd4035a947109621 Merge: bb3613a 53da4ce Author: Tony Lindgren Date: Tue Dec 21 17:05:57 2010 -0800 Merge branch 'pm-opp' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit bb3613aa34a81a5e2f1227ccdb801fde04a7da10 Merge: 6971071 bb1c903 Author: Tony Lindgren Date: Tue Dec 21 16:53:00 2010 -0800 Merge branch 'pm-next' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 6971071cdda79cad5f53ba390e466d696e7e9006 Merge: 4584acc f31cc96 Author: Tony Lindgren Date: Tue Dec 21 16:48:20 2010 -0800 Merge branch 'devel-dma' into omap-for-linus commit 204663c48711ddceee09df46269cd34d49d1f7be Author: Marek Olšák Date: Tue Dec 21 21:27:34 2010 +0100 drm/radeon/kms: add ARGB2101010 colorbuffer support for r500 This should be part of DRM 2.8.0. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit f3dcab70e192b0489ac05cc554e0b1cedae46d1a Author: Anton Vorontsov Date: Wed Dec 22 02:44:49 2010 +0300 jz4740-battery: Should include linux/io.h During test-build (with disabled 'depends on') I found that jz4740-battery driver lacks linux/io.h, which makes build break like this (on x86): CC [M] drivers/power/isp1704_charger.o jz4740-battery.c: In function 'jz_battery_read_voltage': jz4740-battery.c:84: error: implicit declaration of function 'readw’ jz4740-battery.c: In function 'jz_battery_probe': jz4740-battery.c:284: error: implicit declaration of function 'ioremap_nocache’ jz4740-battery.c:285: warning: assignment makes pointer from integer without a cast jz4740-battery.c:372: error: implicit declaration of function 'iounmap' make[2]: *** [drivers/power/jz4740-battery.o] Error 1 This patch fixes the issues, and thus makes it easier to build-test the driver for me. Signed-off-by: Anton Vorontsov commit ae09f09e94d755ed45c58b695675636c0ec53f9e Merge: 1d99e5c 5909a77 Author: Dave Airlie Date: Wed Dec 22 09:48:54 2010 +1000 Merge remote branch 'intel/drm-intel-next' of /ssd/git/drm-next into drm-core-next * 'intel/drm-intel-next' of /ssd/git/drm-next: (771 commits) drm/i915: Undo "Uncouple render/power ctx before suspending" drm/i915: Allow the application to choose the constant addressing mode drm/i915: dynamic render p-state support for Sandy Bridge drm/i915: Enable EI mode for RCx decision making on Sandybridge drm/i915/sdvo: Border and stall select became test bits in gen5 drm/i915: Add Guess-o-matic for pageflip timestamping. drm/i915: Add support for precise vblank timestamping (v2) drm/i915: Add frame buffer compression on Sandybridge drm/i915: Add self-refresh support on Sandybridge drm/i915: Wait for vblank before unpinning old fb Revert "drm/i915: Avoid using PIPE_CONTROL on Ironlake" drm/i915: Pass clock limits down to PLL matcher drm/i915: Poll for seqno completion if IRQ is disabled drm/i915/ringbuffer: Make IRQ refcnting atomic agp/intel: Fix missed cached memory flags setting in i965_write_entry() drm/i915/sdvo: Only use the SDVO pin if it is in the valid range drm/i915: Enable RC6 autodownclocking on Sandybridge drm/i915: Terminate the FORCE WAKE after we have finished reading drm/i915/gtt: Clear the cachelines upon resume drm/i915: Restore GTT mapping first upon resume ... commit 1d99e5c57255d188773fb437391df24fe8faf575 Merge: 880981e 183720b Author: Dave Airlie Date: Wed Dec 22 09:48:04 2010 +1000 Merge remote branch 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next into drm-core-next * 'nouveau/drm-nouveau-next' of /ssd/git/drm-nouveau-next: drm/nvc0: accelerate ttm buffer moves drm/nvc0: initial support for tiled buffer objects drm/nvc0: implement fbcon acceleration drm/nvc0: implement pgraph engine hooks drm/nvc0: implement pfifo engine hooks drm/nvc0: implement fencing drm/nvc0: fix channel dma init paths drm/nvc0: skip dma object creation for drm channel drm/nvc0: implement channel structure initialisation drm/nvc0: gpuobj_new need only check validity and init the relevant engine drm/nvc0: reject the notifier_alloc ioctl drm/nvc0: create shared channel vm drm/nvc0: initial vm implementation, use for bar1/bar3 management drm/nvc0: import initial vm backend drm/nouveau: modify vm to accomodate dual page tables for nvc0 drm/nv50: add missing license header to nv50_fbcon.c drm/nv50: fix smatch warning in nv50_vram.c drm/nouveau: sizeof() vs ARRAY_SIZE() commit 880981e49b90568ebb53428e231b43b8c1049ef9 Author: Alex Deucher Date: Tue Dec 21 16:16:13 2010 -0500 drm/radeon/kms: disable bo moves using the blitter Blitting from vram to gart is problematic at the moment. Use the CPU for now to avoid buffer corruption. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c66ae9bb4dcaac78cc5e30d0ce7ff2bf3dcb48d9 Author: Vasily Khoruzhick Date: Mon Dec 13 12:26:21 2010 +0200 s3c_adc_battery: Add gpio_inverted field to pdata Add support for inverted gpio_charge_finished values. This change is necessary for H1940 support. Signed-off-by: Vasily Khoruzhick Signed-off-by: Anton Vorontsov commit bc51e7ff521f28a7f14dc2f25307ad9101d1305a Author: Tejun Heo Date: Sat Dec 11 17:51:45 2010 +0100 power_supply: Don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. In battery drivers, the work can be canceled on probe failure and removal and should be flushed on suspend. Replace flush_scheduled_work() usages with direct cancels and flushes. Signed-off-by: Tejun Heo Signed-off-by: Anton Vorontsov commit 3a2dbd611b38cf9a026c0099a85701ad183d1949 Author: Vasiliy Kulikov Date: Fri Nov 19 21:41:58 2010 +0300 power_supply: Fix use after free and memory leak device_unregister() might free its argument. This leads to freed memory use in kfree(). Also use put_device() instead of kfree() as dev may be already used in another layer after call to device_add(). Signed-off-by: Vasiliy Kulikov Signed-off-by: Anton Vorontsov commit 26eb387265872b59566ddeed5e9bf142a6b9ff5b Author: Lars-Peter Clausen Date: Thu Nov 18 23:08:38 2010 +0100 gpio-charger: Fix potential race between irq handler and probe/remove This patch fixes a potential race between the irq handler and the probe and remove functions. The irq should not be requested before the chargers power_supply has been registered and has to be freed before the power_supply is unregistered, otherwise it is possible that the irq fires while the power_supply is not initialized yet or has already been freed. While we are at it replace request_irq with request_any_context_irq. Signed-off-by: Lars-Peter Clausen Signed-off-by: Anton Vorontsov commit 80577b8a478f3386d106464f2a2241b2d43571ce Author: Lars-Peter Clausen Date: Thu Nov 18 23:08:39 2010 +0100 gpio-charger: Provide default name for the power_supply This patch sets a default name for the power_supply in case there was no name supplied through the platform_data. Signed-off-by: Lars-Peter Clausen Signed-off-by: Anton Vorontsov commit 2e9ff5f5e4c6b034554f3539f29529265279102c Author: Lars-Peter Clausen Date: Thu Nov 18 23:08:37 2010 +0100 gpio-charger: Check result of kzalloc Since kzalloc can return NULL we have to check its result. Signed-off-by: Lars-Peter Clausen Signed-off-by: Vasiliy Kulikov Signed-off-by: Dan Carpenter Signed-off-by: Anton Vorontsov commit 722bc28384accb67c0bfbbe1914fd82d4d0c996a Author: Kuninori Morimoto Date: Mon Dec 20 10:03:13 2010 +0900 ASoC: sh: fsi: modify improper dependent FSI-AK4642 and FSI-DA7210 are depend on I2C, not I2C_SH_MOBILE Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 68d44ee0bc70be30ea1ee936e6e21082193386cf Author: Mark Brown Date: Tue Dec 21 17:19:56 2010 +0000 ASoC: Make LZO cache compression optional Make LZO cache compression optional as it pulls in the kernel wide LZO implementation and rbtree compression is generally more efficient for typical register maps, especially in terms of CPU performance. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit be4fcddd17f01ede0ff46cf86c5ab8c5adb37175 Author: Mark Brown Date: Tue Dec 21 17:09:48 2010 +0000 ASoC: If we can't find a cache compression type default to flat This makes it easier to make cache types build time configurable as we don't have a hard dependency on a given cache being built in. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit bb1c9034b3ce7f29d3d178a87b42b767611d6574 Author: Jean Pihet Date: Sat Dec 18 16:49:57 2010 +0100 OMAP3: ASM sleep code format rework Cosmetic fixes to the code: - white spaces and tabs, - alignement, - comments rephrase and typos, - multi-line comments Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 8352129166b8270253a746f336a4429b349b023d Author: Jean Pihet Date: Sat Dec 18 16:44:46 2010 +0100 OMAP3: add comments for low power code errata Errata covered: - 1.157 & 1.185 - i443 - i581 Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit f7dfe3d8a98b7c4869c09826e3a65663cb9c71be Author: Jean Pihet Date: Sat Dec 18 16:44:45 2010 +0100 OMAP3: rework of the ASM sleep code execution paths - Reworked and simplified the execution paths for better readability and to avoid duplication of code, - Added comments on the entry and exit points and the interaction with the ROM code for OFF mode restore, - Reworked the existing comments for better readability. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 1e81bc015a444e0f908451642b0197199d0c6fa4 Author: Jean Pihet Date: Sat Dec 18 16:44:44 2010 +0100 OMAP3: re-organize the ASM sleep code Organize the code in the following sections: - register access macros, - API functions, - internal functions. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit fe360e1c8693bca175338da4c53078b0be807c52 Author: Jean Pihet Date: Sat Dec 18 16:44:43 2010 +0100 OMAP3: remove hardcoded values from the ASM sleep code Using macros from existing include files for registers addresses. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Based on original patch from Vishwa. Signed-off-by: Jean Pihet Cc: Vishwanath BS Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit b4b36fd94e4ca99b3258ff24c2c58cdde67085e0 Author: Jean Pihet Date: Sat Dec 18 16:44:42 2010 +0100 OMAP2+: use global values for the SRAM PA addresses The SRAM PA addresses are locally defined and used at different places, i.e. SRAM management code and idle sleep code. The macros are now defined at a centralized place, for easier maintenance. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit d3cdfd2a15d87d040a5f553231b979fbc28b98e7 Author: Jean Pihet Date: Sat Dec 18 16:44:41 2010 +0100 OMAP3: remove unused code from the ASM sleep code Remove unused code: - macros, - variables, - unused semaphore locking API. This API shall be added back when needed, - infinite loops for debug. Tested on N900 and Beagleboard with full RET and OFF modes, using cpuidle and suspend. Signed-off-by: Jean Pihet Acked-by: Santosh Shilimkar Reviewed-by: Nishanth Menon Tested-by: Nishanth Menon Signed-off-by: Kevin Hilman commit cc1b6028878646a2419b27e5f590b5e9fe01dc3d Author: Eduardo Valentin Date: Mon Dec 20 14:05:09 2010 -0600 OMAP3630: PM: Erratum i583: disable coreoff if < ES1.2 Limitation i583: Self_Refresh Exit issue after OFF mode Issue: When device is waking up from OFF mode, then SDRC state machine sends inappropriate sequence violating JEDEC standards. Impact: OMAP3630 < ES1.2 is impacted as follows depending on the platform: CS0: for 38.4MHz as internal sysclk, DDR content seen to be stable, while for all other sysclk frequencies, varied levels of instability seen based on varied parameters. CS1: impacted This patch takes option #3 as recommended by the Silicon erratum: Avoid core power domain transitioning to OFF mode. Power consumption impact is expected in this case. To do this, we route core OFF requests to RET request on the impacted revisions of silicon. Acked-by: Jean Pihet [nm@ti.com: rebased the code to 2.6.37-rc2- short circuit code changed a bit] Signed-off-by: Nishanth Menon Signed-off-by: Eduardo Valentin Signed-off-by: Kevin Hilman commit 80723c3fe457a5d29c178da4ac72983f47b37ed7 Author: Nishanth Menon Date: Mon Dec 20 14:05:08 2010 -0600 OMAP3: PM: make omap3_cpuidle_update_states independent of enable_off_mode Currently omap3_cpuidle_update_states makes whole sale decision on which C states to update based on enable_off_mode variable Instead, achieve the same functionality by independently providing mpu and core deepest states the system is allowed to achieve and update the idle states accordingly. Acked-by: Santosh Shilimkar Acked-by: Jean Pihet Signed-off-by: Nishanth Menon [khilman: fixed additional user of this API in OMAP CPUidle driver] Signed-off-by: Kevin Hilman commit c4236d2e7913d18d058a018f0d19473eb6a11a3c Author: Peter 'p2' De Schrijver Date: Mon Dec 20 14:05:07 2010 -0600 OMAP3630: PM: Disable L2 cache while invalidating L2 cache While coming out of MPU OSWR/OFF states, L2 controller is reseted. The reset behavior is implementation specific as per ARMv7 TRM and hence $L2 needs to be invalidated before it's use. Since the AUXCTRL register is also reconfigured, disable L2 cache before invalidating it and re-enables it afterwards. This is as per Cortex-A8 ARM documentation. Currently this is identified as being needed on OMAP3630 as the disable/enable is done from "public side" while, on OMAP3430, this is done in the "secure side". Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Jean Pihet Acked-by: Santosh Shilimkar [nm@ti.com: ported to 2.6.37-rc2, added hooks to enable the logic only on 3630] Signed-off-by: Nishanth Menon Signed-off-by: Eduardo Valentin Signed-off-by: Peter 'p2' De Schrijver Signed-off-by: Kevin Hilman commit 458e999eb14a301d4176783c8fcb277f5d009b4e Author: Nishanth Menon Date: Mon Dec 20 14:05:06 2010 -0600 OMAP3630: PM: Erratum i608: disable RTA Erratum id: i608 RTA (Retention Till Access) feature is not supported and leads to device stability issues when enabled. This impacts modules with embedded memories on OMAP3630 Workaround is to disable RTA on boot and coming out of core off. For disabling RTA coming out of off mode, we do this by overriding the restore pointer for 3630 as the first point of entry before caches are touched and is common for GP and HS devices. To disable earlier than this could be possible by modifying the PPA for HS devices, but not for GP devices. Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Jean Pihet Acked-by: Santosh Shilimkar [ambresh@ti.com: co-developer] Signed-off-by: Ambresh K Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 8cdfd83473d9b408b924b5d32777ac3fddd251ff Author: Nishanth Menon Date: Mon Dec 20 14:05:05 2010 -0600 OMAP3: pm: introduce errata handling Introduce errata handling for OMAP3. This patch introduces errata variable and stub for initialization which will be filled up by follow-on patches. Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 9d93b8a2c8c78972f0a3d15a820288dbb3968bf2 Author: Peter 'p2' De Schrijver Date: Mon Dec 20 14:05:04 2010 -0600 OMAP3: PM: Erratum i581 support: dll kick strategy Erratum i581 impacts OMAP3 platforms. PRCM DPLL control FSM removes SDRC_IDLEREQ before DPLL3 locks causing the DPLL not to be locked at times. IMPORTANT: *) This is not a complete workaround implementation as recommended by the silicon erratum. This is a support logic for detecting lockups and attempting to recover where possible and is known to provide stability in multiple platforms. *) This code is mostly important for inactive and retention. The ROM code waits for the maximum DLL lock time when resuming from off mode. So for off mode this code isn't really needed. *) counters are introduced here for eventual export to userspace once the cleanups are completed. This should eventually get refactored as part of cleanups to sleep34xx.S Cc: Kevin Hilman Cc: Tony Lindgren Signed-off-by: Peter 'p2' De Schrijver Signed-off-by: Kevin Hilman commit 0bd40535365c318e331f5e872030a710d5746167 Author: Richard Woodruff Date: Mon Dec 20 14:05:03 2010 -0600 OMAP3: PM: Update clean_l2 to use v7_flush_dcache_all Analysis in TI kernel with ETM showed that using cache mapped flush in kernel instead of SO mapped flush cost drops by 65% (3.39mS down to 1.17mS) for clean_l2 which is used during sleep sequences. Overall: - speed up - unfortunately there isn't a good alternative flush method today - code reduction and less maintenance and potential bug in unmaintained code This also fixes the bug with the clean_l2 function usage. Reported-by: Tony Lindgren Cc: Kevin Hilman Cc: Tony Lindgren Acked-by: Santosh Shilimkar Acked-by: Jean Pihet [nm@ti.com: ported rkw's proposal to 2.6.37-rc2] Signed-off-by: Nishanth Menon Signed-off-by: Richard Woodruff Signed-off-by: Kevin Hilman commit 53da4ce23809ca33405001b0ae117e60b7feced1 Author: Kevin Hilman Date: Thu Dec 9 09:13:48 2010 -0600 OMAP3: remove OPP interfaces from OMAP PM layer With new OPP layer, OPP users will access OPP API directly instead of using OMAP PM layer, so remove all notions of OPPs from the OMAP PM layer. Acked-by: Paul Walmsley Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit f5a6422d4e0e85a9c7f5522d3321254bfdfa7f04 Author: Nishanth Menon Date: Thu Dec 9 09:13:47 2010 -0600 omap4: opp: add OPP table data This patch adds OPP tables for OMAP4. New file has been added to keep the OMAP4 opp tables and the registration of these tables with the generic opp framework by OMAP SoC OPP interface. Based on: http://dev.omapzoom.org/?p=santosh/kernel-omap4-base.git;a=blob;f=arch/arm/mach-omap2/opp44xx_data.c;h=252e3d0cb6050a64f390b9311c1c4977d74f762a;hb=refs/heads/omap4_next Signed-off-by: Thara Gopinath Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit fd1478cd61624479c89e35602925459d74505ff3 Author: Nishanth Menon Date: Thu Dec 9 09:13:46 2010 -0600 omap: opp: add OMAP3 OPP table data and common init Add OPP data for OMAP34xx and OMAP36xx and initialization functions to populate OPP tables based on current SoC. introduce an OMAP generic opp initialization routine which OMAP3 and OMAP4+ SoCs can use to register their OPP definitions. Cc: Thomas Petazzoni Signed-off-by: Kevin Hilman Signed-off-by: Nishanth Menon Signed-off-by: Kevin Hilman commit 1cbbe37ac5c78fb59ce02f639d6c4f69b610cf5e Author: Thara Gopinath Date: Mon Dec 20 21:17:21 2010 +0530 OMAP: pm.c correct the initcall for an early init. omap2_common_pm_init is the API where generic system devices like mpu, l3 etc get initialized. This has to happen really early on during the boot and not at a later time. This is especially important with the new opp changes as these devices need to be built before the opp tables init happen. Today both are device initcalls and it works just because of the order of compilation. Making this postcore_initcall is ideal because the omap device layer init happens as a core_initcall and typically rest of the driver/device inits are arch_initcall or something lower. Signed-off-by: Thara Gopinath Signed-off-by: Kevin Hilman commit c166381d4013fd32512f124c237f4213ae9888e9 Author: Jean Pihet Date: Thu Dec 9 18:39:58 2010 +0100 OMAP2+: disable idle early in the suspend sequence Some bad interaction between the idle and the suspend paths has been identified: the idle code is called during the suspend enter and exit sequences. This could cause corruption or lock-up of resources. The solution is to move the calls to disable_hlt at the very beginning of the suspend sequence (ex. in omap3_pm_begin instead of omap3_pm_prepare), and the call to enable_hlt at the very end of the suspend sequence (ex. in omap3_pm_end instead of omap3_pm_finish). Tested with RET and OFF on Beagle and OMAP3EVM. Signed-off-by: Jean Pihet Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit 503b1a529a6b62b31904bab4699752c523cf76b2 Merge: 4b4f546 215faf9 Author: David S. Miller Date: Tue Dec 21 13:26:15 2010 -0800 Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods commit 4b4f54670859074cf7670cc6fa96fe34a65846d9 Author: Denis Kirjanov Date: Tue Dec 21 02:02:26 2010 +0000 sundance: Program station address into HW Program adapter's StationAddress register when changing device MAC address Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 24de5285dce378e4170e068f2662236d2b46c033 Author: Denis Kirjanov Date: Tue Dec 21 02:01:36 2010 +0000 sundance: Wrap up acceess to ASICCtrl high word with a macro Wrap up acceess to ASICCtrl high word with a macro Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 12b16dadbc2406144d408754f96d0f44aa016239 Author: Eric Dumazet Date: Wed Dec 15 19:45:28 2010 +0000 filter: optimize accesses to ancillary data We can translate pseudo load instructions at filter check time to dedicated instructions to speed up filtering and avoid one switch(). libpcap currently uses SKF_AD_PROTOCOL, but custom filters probably use other ancillary accesses. Note : I made the assertion that ancillary data was always accessed with BPF_LD|BPF_?|BPF_ABS instructions, not with BPF_LD|BPF_?|BPF_IND ones (offset given by K constant, not by K + X register) On x86_64, this saves a few bytes of text : # size net/core/filter.o.* text data bss dec hex filename 4864 0 0 4864 1300 net/core/filter.o.new 4944 0 0 4944 1350 net/core/filter.o.old Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cb8f404893bab40431f7eeb2511454031b07e7df Author: Tejun Heo Date: Tue Dec 14 06:09:59 2010 +0000 bnx2: remove cancel_work_sync() from remove_one Michael pointed out that bnx2_close() already cancels bp->reset_task and thus it is guaranteed to be idle when bnx2_remove_one() is called. Remove the unnecessary cancel_work_sync() in remove_one. Signed-off-by: Tejun Heo Acked-by: Michael Chan Signed-off-by: David S. Miller commit a13c13273a206e0c4b9a814277fb50529457abe7 Merge: 34a52f3 c04bfc6 Author: David S. Miller Date: Tue Dec 21 12:17:29 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 4931445b94f49672028b81ace9d4eee8ddf19ab2 Author: Adrian Hunter Date: Thu Dec 9 11:22:50 2010 +0200 OMAP2/3: OneNAND: add 104MHz support Add GPMC timings for 104MHz OneNAND. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit a3551f5b0c3ca7aaa053e554e3ee766983b5d713 Author: Adrian Hunter Date: Thu Dec 9 10:48:27 2010 +0200 OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds The calculations done with sync_clk are anyway in picoseconds and switching to picoseconds allows sync_clk values that are not a whole number of nanoseconds - which is sometimes the case. Signed-off-by: Adrian Hunter Signed-off-by: Tony Lindgren commit 21dd9ae5a4e9f717f3957ec934dd3158129436b8 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:05 2010 +0100 perf probe: Handle gracefully some stupid and buggy line syntaxes Currently perf probe doesn't handle those incorrect syntaxes: $ perf probe -L sched.c:++13 $ perf probe -L sched.c:-+13 $ perf probe -L sched.c:10000000000000000000000000000+13 This patches rewrites parse_line_range_desc() to handle them. As a bonus, it reports more useful error messages instead of: "Tailing with invalid character...". Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-7-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit c6d92e9b84da2002ee7a75b784834970ddfd3bfd Merge: ba11920 5155e2c Author: David Brown Date: Tue Dec 21 10:53:43 2010 -0800 Merge branch 'msm-usb' into for-next * msm-usb: MSM: Add USB support for MSM7x30 MSM: Add USB suport for QSD8x50 commit 34a52f363ab6bcf6d50a65c153dec03f3fb32653 Author: Dan Carpenter Date: Mon Dec 20 21:34:56 2010 +0000 stmmac: unwind properly in stmmac_dvr_probe() The original code had a several problems: *) It had potential null dereferences of "priv" and "res". *) It released the memory region before it was aquired. *) It didn't free "ndev" after it was allocated. *) It didn't call unregister_netdev() after calling stmmac_probe(). Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 4b97f8e10893e2c8f64a2795901bdb447a3308f4 Author: Dan Carpenter Date: Mon Dec 20 21:04:02 2010 +0000 bnx2x: remove bogus check We dereferenced params on the line before so it's too late to check if params is NULL. In fact, params can never be NULL and strict_cos is either 0 or 1 so that part of the check is bogus too. Let's remove it. Signed-off-by: Dan Carpenter Acked-by: Eilon Greenstein Signed-off-by: David S. Miller commit 70978182d431e0348e6ef711d0f962d12c03bc46 Author: Eric Dumazet Date: Mon Dec 20 21:22:51 2010 +0000 net: timestamp cloned packet in dev_queue_xmit_nit Le vendredi 17 décembre 2010 à 10:26 +0100, Eric Dumazet a écrit : > > I think we can add this after latest Changli patch : > > He does one skb_clone() before calling the sniffers. > We could set timestamp on this clone, instead of original skb. > > Problem solved. > [PATCH net-next-2.6] net: timestamp cloned packet in dev_queue_xmit_nit Now we do one clone of skb if at least one sniffer might take packet, we also can do the skb timestamping on the clone and let original packet unchanged. This is a generalization of commit 8caf153974f2 (net: sch_netem: Fix an inconsistency in ingress netem timestamps.) This way, we can have a good idea when packets are delivered to our stack (tcpdump -i ifb0), while a tcpdump on original device gives timestamps right before ingressing. This also speedup our stack, avoiding taking timestamps if not needed. Signed-off-by: Eric Dumazet Cc: Changli Gao Cc: Patrick McHardy Cc: Jarek Poplawski Acked-by: Changli Gao Signed-off-by: David S. Miller commit e9ccc998b70fbe59626f393bb0328402159c6b5c Author: Nicholas Bellinger Date: Fri Dec 17 13:11:16 2010 -0800 [SCSI] Add missing SPC-4 CDB and MAINTENANCE_[IN,OUT] service action definitions This patch adds a handful of missing CDBs defs that are used by TCM persistent reservation logic in the SPC-4 defined CDB exclusion table for registrations and reservations. This includes a number of missing MI_* and MO_* prefixed service actions defs for MAINTENANCE_IN and MAINTENANCE_OUT that are mentioned wrt to persistent registration and reservation status for the SCSI Initiator Port. Signed-off-by: Nicholas A. Bellinger Signed-off-by: James Bottomley commit 3f1530c1e1f7fc570672f4a54565949070fad05f Author: adam radford Date: Tue Dec 14 18:51:48 2010 -0800 [SCSI] megaraid_sas: Update GPL headers. This patch updates the GPL headers in megaraid_sas_base.c and megaraid_sas.h. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit 0d49016bbab4fe9164710b1d4bbae116b89b7f7e Author: adam radford Date: Tue Dec 14 19:17:17 2010 -0800 [SCSI] megaraid_sas: Rename megaraid_sas.c to megaraid_sas_base.c This patch renames megaraid_sas.c to megaraid_sas_base.c to facilitate other files in the compile. Signed-off-by: Adam Radford Signed-off-by: James Bottomley commit fd01a6632da253210c3dbc7814bc6eceda96623d Author: Hillf Danton Date: Thu Dec 16 14:26:37 2010 -0600 [SCSI] fix the return value of scsi_target_queue_read() It seems that zero should be returned if scsi_target_is_busy(starget) is true, no matter if sdev is on the starved list. Signed-off-by: Hillf Danton Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit db422318cbca55168cf965f655471dbf8be82433 Author: Menny Hamburger Date: Thu Dec 16 14:57:07 2010 -0500 [SCSI] scsi_dh: propagate SCSI device deletion Currently, when scsi_dh_activate() returns with an error (e.g. SCSI_DH_NOSYS) the activate_complete callback is not called and the error is not propagated to DM mpath. When a SCSI device attached to a device handler is deleted, userland processes currently performing I/O on the device will have their I/O hang forever. - Set SCSI_DH_NOSYS error when the handler is in the process of being deleted (e.g. the SCSI device is in a SDEV_CANCEL or SDEV_DEL state). - Set SCSI_DH_DEV_OFFLINED error when device is in SDEV_OFFLINE state. - Call the activate_complete callback function directly from scsi_dh_activate if an error has been set (when either the scsi_dh internal data has already been deleted or is in the process of being deleted). The patch was tested in an iSCSI environment, RDAC H/W handler and multipath. In the following reproduction process, dd will I/O hang forever and the only way to release it will be to reboot the machine: 1) Perform I/O on a multipath device: dd if=/dev/dm-0 of=/dev/zero bs=8k count=1000000 & 2) Delete all slave SCSI devices contained in the mpath device: I) In an iSCSI environment, the easiest way to do this is by stopping iSCSI: /etc/init.d/iscsi stop II) Another way to delete the devices is by applying the following bash scriptlet: dm_devs=$(ls /sys/block/ | grep dm- | xargs) for dm_dev in $dm_devs; do devices=$(ls /sys/block/$dm_dev/slaves) for device in $devices; do echo 1 > /sys/block/$device/device/delete done done NOTE: when DM mpath's fail_path uses blk_abort_queue this scsi_dh change isn't strictly required. However, DM mpath's call to blk_abort_queue will soon be reverted because it has proven to be unsafe due to a race (between blk_abort_queue and scsi_request_fn) that can lead to list corruption. Therefore we cannot rely on blk_abort_queue via fail_path, but even if we could this scsi_dh change is still preferrable. Signed-off-by: Menny Hamburger Signed-off-by: Mike Snitzer Reviewed-by: Babu Moger Signed-off-by: James Bottomley commit 35dd3039e09cd46ca3a8733ff1c817bf7b7b19ce Author: Stephen M. Cameron Date: Thu Dec 16 13:01:03 2010 -0600 [SCSI] hpsa: do not consider RAID level to be part of device identity Otherwise, after doing a RAID level migration, the disk will be disruptively removed and re-added as a different disk on rescan. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit a0b89872b305bd0f6f5af1dd26274a3f057a2303 Author: Stephen M. Cameron Date: Thu Dec 16 13:00:58 2010 -0600 [SCSI] hpsa: do not consider firmware revision when looking for device changes. The firmware may have been updated, in which case, it's the same device, and in that case, we do not want to remove and add the device, we want to let it continue as is. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 774342844f368a0c3ba907f192d844ae337d01aa Author: James Smart Date: Wed Dec 15 17:58:20 2010 -0500 [SCSI] lpfc 8.3.20: Update lpfc driver version to 8.3.20 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 4042629e426da5ff0c793276a61103bd3f6b2183 Author: James Smart Date: Wed Dec 15 17:58:10 2010 -0500 [SCSI] lpfc 8.3.20: Updates to FC discovery commands Updated commands used for ELS to utilize VPI Allocate RPI at node creation time and pass in ELS commnads. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 2fcee4bf874a8ae72ada68b62728d1fdeb30e3d4 Author: James Smart Date: Wed Dec 15 17:57:46 2010 -0500 [SCSI] lpfc 8.3.20: Implement new SLI4 init procedures based on if_type Implement new SLI4 init procedures based on if_type: - Add structure changes for new SLIPORT registers and BAR changes. - Update register names to be consistent with inteface spec terms. - Added union to encapsulate Hardward error registers. - Rework lpfc_sli4_post_status_check() around SLI-4's SLI_INTF type - Removed the lpfc_sli4_fw_cfg_check routine - Segmented driver logic to include evaluation of the if_type to engage different behaviors. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 70f3c073362ef7b5e55c92b83eb2dd9a7fb4e9bf Author: James Smart Date: Wed Dec 15 17:57:33 2010 -0500 [SCSI] lpfc 8.3.20: Implement the FC and SLI async event handlers Implement the FC and SLI async event handlers: - Updated MQ_CREATE_EXT mailbox structure to include fc and SLI async events. - Added the SLI trailer code. - Split physical field into type and number to reflect latest SLI spec. - Changed lpfc_acqe_fcoe to lpfc_acqe_fip to reflect latest Spec changes. - Added lpfc_acqe_fc_la structure for FC link attention async events. - Added lpfc_acqe_sli structure for sli async events. - Added lpfc_sli4_async_fc_evt routine to handle fc la async events. - Added lpfc_sli4_async_sli routine to handle sli async events. - Moved LPFC_TRAILER_CODE_FC to be handled by its own handler function. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit be858b65cf9701e75bc49ed38c56e5b51ff281cd Author: James Smart Date: Wed Dec 15 17:57:20 2010 -0500 [SCSI] lpfc 8.3.20: Critical fixes - Use for iocbq->context1 to hold the ndlp pointer. - Set ndlp in all iocbs generated from ioctl functions. - Turn parity and serr bits back on after performing sli4 board reset. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 395eb20238f5f1d5fba0ae284760a68095dd9e66 Author: Krishna Gudipati Date: Mon Dec 13 16:23:51 2010 -0800 [SCSI] bfa: Update the driver version to 2.3.2.3 Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 15821f05b78dbeb2f897d1d22576449103a4d8d5 Author: Krishna Gudipati Date: Mon Dec 13 16:23:27 2010 -0800 [SCSI] bfa: io tag handling and minor bug fix. Fix iotag handling: 1) Update and check io tag for retry case. 2) Clearing upper 3 bits in io tag when an IO completes. The 3 upper bits in io tags are used for counting FCP exchange retry. Un-cleared bits will cause firmware to access invalid memory when the same io tag is used for an IO to a target that doesn't support FCP exchange retry. 3) Only check the effective bits when validating an iotag. Other minor fixes: 1) Added trace to get FC header type with assert of unhandled packet received. Ignore the type FC_TYPE_FC_FSS (FC_XS). 2) Fixed the adapter info display check - to check for fcmode flag even. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit b704495c6707013806d1b66507a967896e2b4a7c Author: Krishna Gudipati Date: Mon Dec 13 16:17:42 2010 -0800 [SCSI] bfa: direct attach mode fix. - Direct attach is not working due to the check of PID in fcxp_send request. - Added logic to set the lps->lp_pid with the PID assigned for n2n mode. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f1d584d70f31f54e0a559049906f42db89e2746d Author: Krishna Gudipati Date: Mon Dec 13 16:17:11 2010 -0800 [SCSI] bfa: IOC auto recovery fix. - Made IOC auto_recovery synchronized and not timer based. - Only one PCI function will attempt to recover and reinitialize the ASIC on a failure, after all the active PCI fns acknowledge the IOC failure. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f3a060ca57903daaf2f1a88c6c25832619b2a74f Author: Krishna Gudipati Date: Mon Dec 13 16:16:50 2010 -0800 [SCSI] bfa: Store port configuration in flash for persistency. When the bfa driver is loaded a flogi is sent without the knowledge of trunking configuration. This normal flogi causes the switch ports which had trunking enabled to go to persistent offline. Solution is to store the port configuration (which has trunking info) in the flash for persistency. The firmware will read this configuration when the very first fcport enable is received. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4e78efefa3c083240bd47153ffa99642bfdc7811 Author: Krishna Gudipati Date: Mon Dec 13 16:16:09 2010 -0800 [SCSI] bfa: IOC fwtrace save logic & state machine fixes. - Move fw trace save logic to bfa_ioc_sm_fail_entry(), so that fw trace is saved irrespective of the cause of the failure. - Make bfa_ioc_sm_fail() a failure parking state. - Rename bfa_ioc_sm_initfail() to a more appropriate bfa_ioc_sm_fail_retry() as it is no longer a parking state. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit da99dcc98dd66a2de4864645bcafffd93cf5a62f Author: Maggie Zhang Date: Thu Dec 9 19:13:20 2010 -0800 [SCSI] bfa: remove unused functions and misc cleanups Remove unused functions and fix checkpatch errors. Misc cleanups in comment and formatting. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f16a17507b09e10e0cccc4d675ccbfe030d51ef1 Author: Maggie Zhang Date: Thu Dec 9 19:12:32 2010 -0800 [SCSI] bfa: remove all OS wrappers Remove OS wrapper functions/macros, and as a result remove bfa_os_inc.h. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f314878ab95d4802ddde066096f7b30087cea7ba Author: Maggie Zhang Date: Thu Dec 9 19:11:39 2010 -0800 [SCSI] bfa: remove all SCSI IO callbacks Remove SCSI IO callbacks, and as a result remove bfa_cb_ioim.h. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit e3e7d3eebb08735c8a14cd27f76dac784e9a9b75 Author: Maggie Zhang Date: Thu Dec 9 19:10:27 2010 -0800 [SCSI] bfa: scatter gather processing change Modified scatter gather processing to use the kernel provided scsi_for_each_sg() macro. 1) Instead of allocating and setting up sgpg in bfa_ioim_sge_setup(), we only do allocation. As a result, we remove bfa_ioim_sgpg_setup() and rename bfa_ioim_sge_setup() to bfa_ioim_sgpg_alloc(). 2) bfa_ioim_send_ioreq() call scsi_for_each_sg() to handle both inline and sgpg setup. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit b77ee1fb10e4b76dc61094b3678d805be0e4f7ba Author: Maggie Zhang Date: Thu Dec 9 19:09:26 2010 -0800 [SCSI] bfa: remove a file with small size Removed bfa_drv.c, merged it to bfa_core.c and modified Makefile. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit f7f73812e95077c19a2801bbf4f483fcdab5232f Author: Maggie Zhang Date: Thu Dec 9 19:08:43 2010 -0800 [SCSI] bfa: clean up one line functions Cleaned up one line functions. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit df0f1933eb5454a5c481311837076056557467ad Author: Maggie Zhang Date: Thu Dec 9 19:07:46 2010 -0800 [SCSI] bfa: remove unused and empty functions Removed unused and empty functions. Signed-off-by: Maggie Zhang Signed-off-by: Jing Huang Signed-off-by: James Bottomley commit 402c6eec1bd04581c04de758e4efddc020b78f91 Author: Robert Jennings Date: Thu Dec 9 14:03:59 2010 -0600 [SCSI] ibmvfc: Improve ibmvfc_async_desc memory layout By changing field ordering we can avoid a couple of memory holes in the tables that use the ibmvfc_async_desc structure. Signed-off-by: Robert Jennings Acked-by: Brian King Signed-off-by: James Bottomley commit 058548ae23f5811d0ccdb39d5ad40f078aca63ef Author: Stephen Hemminger Date: Thu Dec 9 09:37:56 2010 -0800 [SCSI] iscsi: add module alias Since iscsi transport can be built as a module and uses netlink socket to communicate. The module should have an alias to autoload when socket of NETLINK_ISCSI type is requested. Signed-off-by: Stephen Hemminger Acked-by: Mike Christie Signed-off-by: James Bottomley commit 0d81b4e8dcc4177726f30a1ac8df1f726d2a7c0c Author: Christof Schmitt Date: Wed Dec 8 17:30:46 2010 +0100 [SCSI] zfcp: Add allow_lun_scan module parameter The zfcpdump tool requires a method to attach exactly one LUN. The easiest way to achieve this is to add a new zfcp module parameter. When allow_lun_scan is set to "false", zfcp only accepts LUNs that have been configured through the unit_add sysfs interface. Reviewed-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 51780d2c38a7294c2c302ae9d2ea517bd4153dec Author: Christof Schmitt Date: Thu Dec 2 15:16:18 2010 +0100 [SCSI] zfcp: Add __init declaration to zfcp_cache_hw_align The function zfcp_cache_hw_align is only called from zfcp_module_init, so it should be declared with __init as well. Reviewed-by: Steffen Maier Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 3d63d3b4fb5fb3674f2d97725e187cbfa22562bc Author: Christof Schmitt Date: Thu Dec 2 15:16:17 2010 +0100 [SCSI] zfcp: Move qdio setup from erp to zfcp_qdio.c Initialization of the qdio waitqueue should happen when the qdio data is initialized and the QDIOUP flag should be handled in the qdio code as well. Adjust the code accordingly and remove the superfluos function zfcp_erp_adapter_strategy_open_qdio. Reviewed-by: Steffen Maier Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ea4a3a6ac40e2a585654808d4aefb39a6d57dca0 Author: Swen Schillig Date: Thu Dec 2 15:16:16 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing final cleanup. This patch is the final cleanup of the redesign from the zfcp tracing. Structures and elements which were used by multiple areas of the former debug tracing are now changed to the new scheme. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 250a1352b95e1db3216e5c5d4f4365bea5122f4a Author: Swen Schillig Date: Thu Dec 2 15:16:15 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for SCSI records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp SCSI area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit a54ca0f62f953898b05549391ac2a8a4dad6482b Author: Swen Schillig Date: Thu Dec 2 15:16:14 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for HBA records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp HBA area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 2c55b750a884b86dea8b4cc5f15e1484cc47a25c Author: Swen Schillig Date: Thu Dec 2 15:16:13 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for SAN records. This patch is the continuation to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. This patch deals with all trace records of the zfcp SAN area. Signed-off-by: Swen Schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit ae0904f60fab7cb20c48d32eefdd735e478b91fb Author: Swen Schillig Date: Thu Dec 2 15:16:12 2010 +0100 [SCSI] zfcp: Redesign of the debug tracing for recovery actions. The tracing environment of the zfcp LLD has become very bulky and hard to maintain. Small changes involve a large modification process which is error-prone and not effective. This patch is the first of a set to redesign the zfcp tracing to a more straight-forward and easy to extend scheme. It removes all interpretation and visualization parts and focuses on bare logging of the information. This patch deals with all trace records of the zfcp error recovery. Signed-off-by: Swen schillig Signed-off-by: Christof Schmitt Signed-off-by: James Bottomley commit 6b57b159709dcb4d53e64738f2d1f73b36e41601 Author: Vikas Chaudhary Date: Thu Dec 2 22:13:00 2010 -0800 [SCSI] qla4xxx: Update driver version to 5.02.00-k5 Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 7d01d0698f450ed8cc9fd4557f88a3309c868d44 Author: Vikas Chaudhary Date: Thu Dec 2 22:12:51 2010 -0800 [SCSI] qla4xxx: Updated the Copyright header Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 3930b8c1f3582d43757cbcc9b7ecaf05f6b4a66e Author: Vikas Chaudhary Date: Thu Dec 2 22:12:47 2010 -0800 [SCSI] qla4xxx: do not reset hba if ql4xdontresethba is set Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit d56a1f7b39631806ee3d49445a65da6288b099b4 Author: Lalit Chandivade Date: Thu Dec 2 22:12:45 2010 -0800 [SCSI] qla4xxx: do not check for fw hung if reset retry is in progress Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit e128271b7bcb9c8955cadbf2e18f8af288979e6b Author: Prasanna Mumbai Date: Thu Dec 2 22:12:43 2010 -0800 [SCSI] qla4xxx: cache new IP address acquired via DHCP Prior to firmware state change from ACQUIRING to READY, an 0x8029 AEN is received. Added code to check previous state being ACQUIRING in order to update the ip address in the driver. Signed-off-by: Vikas Chaudhary Signed-off-by: Prasanna Mumbai Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 4cd83cbef878b5d0d4c65ac0a20d12a8bf9f551d Author: Lalit Chandivade Date: Thu Dec 2 22:12:40 2010 -0800 [SCSI] qla4xxx: Fail initialization if qla4_8xxx_pci_mem_write_2M fails Since if fw load is failing, running on incomplete fw load would be fatal. Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit fe998527e3f1f5a6eeab5baa23ac2b60ae47e96b Author: Lalit Chandivade Date: Thu Dec 2 22:12:36 2010 -0800 [SCSI] qla4xxx: put device in FAILED state for 82XX initialization failure Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit e6b07df8b0f1530a8ed606f6f464487520d74ad9 Author: Lalit Chandivade Date: Thu Dec 2 22:12:27 2010 -0800 [SCSI] qla4xxx: do not process interrupt unconditionally in mailbox command do not process interrupt unconditionally, process interrupt only in polling mode Signed-off-by: Vikas Chaudhary Signed-off-by: Lalit Chandivade Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 6790d4fecf4373016e2983f913bcc0f1cdfa8ca0 Author: Karen Higgins Date: Thu Dec 2 22:12:22 2010 -0800 [SCSI] qla4xxx: use correct fw_ddb_index in abort task Signed-off-by: Vikas Chaudhary Signed-off-by: Karen Higgins Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit a1fc26baae41e00a3ecfd99bbe91aa2435045625 Author: Swapnil Nagle Date: Thu Dec 2 22:12:15 2010 -0800 [SCSI] qla4xxx: memory wedge with peg_halt test in loop Signed-off-by: Swapnil Nagle Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 61391d314e856030b2b40b5d6ea22b93de0f1fed Author: Shyam Sundar Date: Thu Dec 2 22:12:08 2010 -0800 [SCSI] qla4xxx: initialize MSI in correct way IRQF_SHARED flag should not be set when calling request_irq for MSI since this interrupt mechanism cannot be shared like standard INTx Signed-off-by: Vikas Chaudhary Signed-off-by: Shyam Sundar Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 3e1350c4dc8900476c4db2066c00f13e9e939817 Author: Vikas Chaudhary Date: Thu Dec 2 22:12:03 2010 -0800 [SCSI] qla4xxx: Drop use of IRQF_DISABLE IRQF_DISABLE flag is deprecated and this flag is a NOOP in kernel. Signed-off-by: Vikas Chaudhary Signed-off-by: Ravi Anand Signed-off-by: James Bottomley commit 5f0e385fdafb7d6c8ded6464fa6421c735d96caf Author: Joe Eykholt Date: Tue Nov 30 16:20:18 2010 -0800 [SCSI] libfc: fix statistics for FCP input/output megabytes The statistics for InputMegabytes and OutputMegabytes are misnamed. They're accumulating bytes, not megabytes. The statistic returned via /sys must be in megabytes, however, which is what the HBA-API wants. The FCP code needs to accumulate it in bytes and then divide by 1,000,000 (not 2^20) before it presented via sysfs. This affects fcoe.ko only, not fnic. The fnic driver correctly by accumulating bytes and then converts to megabytes. I checked that libhbalinux is using the /sys file directly without conversion. BTW, qla2xxx does divide by 2^20, which I'm not fixing here. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ba9cd5d095b42271588c20ccd6ddd561d0e4cc1e Author: Joe Eykholt Date: Tue Nov 30 16:20:12 2010 -0800 [SCSI] libfcoe: change fip_select to return new FCF Neaten several calls to fip_select() by having it return the pointer to the new FCF. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 981c1154b240ee77133a478fcd3853ac18111672 Author: Joe Eykholt Date: Tue Nov 30 16:20:07 2010 -0800 [SCSI] libfcoe: reorder FCF list to put latest advertiser first When there are several FCFs to choose from, the one most likely to accept a FLOGI on certian switches is the one that last answered a multicast solicit. So, when receiving an advertisement, move the FCF to the front of the list so that it gets chosen first among those with the same priority. Without this, more FLOGIs need to be sent in a test with multiple FCFs and a switch in NPV mode, but it still eventually finds one that accepts the FLOGI. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 9069f5c433e402be5707f37f3d0dfb376659c1e4 Author: Joe Eykholt Date: Tue Nov 30 16:20:02 2010 -0800 [SCSI] libfcoe: add debug message for FCF destination MAC When multiple FCFs to the same fabric exist, the debug messages all look alike. Change the message to include the MAC address. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 794d98e77f5901ceded697f1633463e88f078038 Author: Joe Eykholt Date: Tue Nov 30 16:19:56 2010 -0800 [SCSI] libfcoe: retry rejected FLOGI to another FCF if possible Switches using multiple-FCFs may reject FLOGI in order to balance the load between multiple FCFs. Even though the FCF was available, it may have more load at the point we actually send the FLOGI. If the FLOGI fails, select a different FCF if possible, among those with the same priority. If no other FCF is available, just deliver the reject to libfc for retry. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit b69ae0ae3f322d9a6bc4e209049b5b6e193ad652 Author: Joe Eykholt Date: Tue Nov 30 16:19:51 2010 -0800 [SCSI] libfcoe: fix checking of conflicting fabrics in fcoe_ctlr_select() The check for conflicting fabrics in fcoe_ctlr_select() ignores any FCFs that aren't usable. This is a minor problem now but becomes more pronounced after later patches. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit c47036a7cd378533495d8cc06a7cf8a881072a9d Author: Joe Eykholt Date: Tue Nov 30 16:19:46 2010 -0800 [SCSI] libfcoe: move some timer code to make it reusable. Move some of the code in fcoe_ctlr_timer_work() to fcoe_ctlr_select() so that it can be shared with another function in a forthcoming patch. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 69316ee2e375c5af0cf1f8d2d30f9aa277f0b454 Author: Joe Eykholt Date: Tue Nov 30 16:19:40 2010 -0800 [SCSI] libfcoe: update FIP FCF announcements Move the announcement code to a separate function for reuse in a forthcoming patch. For messages regarding FCF timeout and selection, use the previously-announced FCF MAC address (dest_addr) in the fcoe_ctlr struct. Only print (announce) the FCF if it is new. Print MAC for timed-out or deselected FCFs. Signed-off-by: Joe Eykholt Signed-off-by: Robert Love Signed-off-by: James Bottomley commit b5fe5e953c65cd0ec4e9ffd001072700e5b89317 Author: Yi Zou Date: Tue Nov 30 16:19:35 2010 -0800 [SCSI] libfc: fix fc_tm_done not freeing the allocated fsp pkt Frame should be freed in fc_tm_done, this is an updated patch on the one initially submitted by Hillf Danton. Signed-off-by: Hillf Danton Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 3a91090fe0df10091c5612db8528ee7a822ab83d Author: Yi Zou Date: Tue Nov 30 16:19:30 2010 -0800 [SCSI] libfc: the timeout for the REC itself is 2 * R_A_TOV_els The timeout for the exchange carrying REC itself is 2 * R_A_TOV_els. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ea3e2e72eeb3e8a9440a5da965914f9b12088626 Author: Yi Zou Date: Tue Nov 30 16:19:25 2010 -0800 [SCSI] libfc: fix exchange being deleted when the abort itself is timed out Should not continue when the abort itself is being timeout since in that case the exchange will be deleted and relesased. We still want to call the associated response handler to let the layer, e.g., fcp, know the exchange itself is being timed out. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit d889b30a9196c453120ca54323fe80acb4c27b94 Author: Yi Zou Date: Tue Nov 30 16:19:20 2010 -0800 [SCSI] libfc: do not fc_io_compl on fsp w/o any scsi_cmnd associated Do not call fc_io_compl() on fsp w/o any scsi_cmnd, e.g., lun reset is built inside fc_fcp, not from a scsi command from queuecommnd from scsi-ml, so in in case target is buggy that is invalid flags in the FCP_RSP, as we have seen in some SAN Blaze target where all bits in flags are 0, we do not want to call io_compl on this fsp. [ Comment block added by Robert Love ] Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 9b90dc80ba2e566a48585174b1e5ab00e16f0456 Author: Yi Zou Date: Tue Nov 30 16:19:15 2010 -0800 [SCSI] libfc: add print of exchange id for debugging fc_fcp This is very helpful to match up the corresponding exchange to the actual I/O described by the fsp, particularly when you do a side-by-side comparison of the syslog with your trace. Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 11aa99001afdbe5fe152e833aa1fea82b85dbeda Author: Joe Perches Date: Tue Nov 30 16:19:09 2010 -0800 [SCSI] drivers/scsi/fcoe: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 0e9e3d3b155c35d5750805c2b8bb6d5b6e6a3bfb Author: Hillf Danton Date: Tue Nov 30 16:19:04 2010 -0800 [SCSI] libfc: fix memory leakage in remote port There seems rdata should get put before return. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 72e0daad555bc0ca2e7abd68593087d098d866a8 Author: Hillf Danton Date: Tue Nov 30 16:18:59 2010 -0800 [SCSI] libfc: fix memory leakage in local port There seems info should get freed when error encountered. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 2d6dfb005e24d7e3404f4c0d333a94b050059173 Author: Hillf Danton Date: Tue Nov 30 16:18:54 2010 -0800 [SCSI] libfc: fix memory leakage in local port There seems info should get freed when error encountered. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 05fee645e96e732a79ad083cab8ddd4efd108e2c Author: john fastabend Date: Tue Nov 30 16:18:49 2010 -0800 [SCSI] libfc: remove tgt_flags from fc_fcp_pkt struct We can easily remove the tgt_flags from fc_fcp_pkt struct and use rpriv->tgt_flags directly where needed. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e0883a3c3e7766b390971a49bf728004816c9520 Author: john fastabend Date: Tue Nov 30 16:18:44 2010 -0800 [SCSI] libfc: use rport timeout values for fcp recovery Use the rport value for rec_tov for timeout values when sending fcp commands. Currently, defaults are being used which may or may not match the advertised values. The default may cause i/o to timeout on networks that set this value larger then the default value. To make the timeout more configurable in the non-REC mode we remove the FC_SCSI_ER_TIMEOUT completely allowing the scsi-ml to do the timeout. This removes an unneeded timer and allows the i/o timeout to be configured using the scsi-ml knobs. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit ac17ea8d7d45d0495316edff13faa0dfd6bb2225 Author: john fastabend Date: Tue Nov 30 16:18:39 2010 -0800 [SCSI] libfc: incorrect scsi host byte codes returned to scsi-ml The fcp packet recovery handler fc_fcp_recover() is called when errors occurr in a fcp session. Currently it is generically setting the status code to FC_CMD_RECOVERY for all error types. This results in DID_BUS_BUSY errors being returned to the scsi-ml. DID_BUS_BUSY errors indicate "BUS stayed busy through time out period" according to scsi.h. Many of the error reported by fc_rcp_recovery() are pkt errors. Here we update fc_fcp_recovery to use better host byte codes. With certain FAST FAIL flags set DID_BUS_BUSY and DID_ERROR will have different behaviors this was causing dm multipath to fail quickly in some cases where a retry would be a better action. Signed-off-by: John Fastabend Signed-off-by: Robert Love Signed-off-by: James Bottomley commit e90ff5ef0aab1d40f0e92a44d66f8d45a20d8c95 Author: Hillf Danton Date: Tue Nov 30 16:18:33 2010 -0800 [SCSI] libfc: fix stats computation in fc_queuecommand() There seems accumulation needed. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 530994d69e5b6b4eca2db4a21b6d945d13646053 Author: Hillf Danton Date: Tue Nov 30 16:18:28 2010 -0800 [SCSI] libfc: fix mem leak in fc_seq_assign() There is a typo cleaned, which triggers memory leakage. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 3c2c3bf23cbef8eed6cf815715d0bece5cb7b5ec Author: Robert Love Date: Tue Nov 30 16:18:23 2010 -0800 [SCSI] libfc: Fix incorrect locking and unlocking in FCP The error handler grabs the si->scsi_queue_lock, but in the case where the fsp pointer is NULL it releases the scsi_host lock. This can lead to a variety of system hangs depending on which is used first- the scsi_host lock or the scsi_queue_lock. This patch simply unlocks the correct lock when fcp is NULL. Signed-off-by: Robert Love Tested-by: Ross Brattain Signed-off-by: James Bottomley commit 2034c19ce8f8503aa14cb1e763fbfe60316aaa8e Author: Hillf Danton Date: Tue Nov 30 16:18:17 2010 -0800 [SCSI] libfc: tune fc_exch_em_alloc() to be O(2) For allocating new exch from pool, scanning for free slot in exch array fluctuates when exch pool is close to exhaustion. The fluctuation is smoothed, and the scan looks to be O(2). Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 8236554a27af870ecd1cd588d9558ccdc212037b Author: Hillf Danton Date: Tue Nov 30 16:18:12 2010 -0800 [SCSI] libfc: fix mem leak in fc_exch_recv_seq_resp() There seems that ep should get released, or it will no longer get freed. Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 80e736f8a37bebeb5bff18f2aec31caab4104b8b Author: Yi Zou Date: Tue Nov 30 16:18:07 2010 -0800 [SCSI] libfc: fix NULL pointer dereference bug in fc_fcp_pkt_release This happens when then tearing down the fcoe interface with active I/O. The back trace shows dead000000200200 in RAX, i.e., LIST_POISON2, indicating that the fsp is already being dequeued, which is probably why no complaining was seen in fc_fcp_destroy() about outstanding fsp not freed, since we dequeue it in the end of fc_io_compl() before releasing it. The bug is due to the fact that we have already destroyed lport's scsi_pkt_pool while on-going i/o is still accessing it through fc_fcp_pkt_release(), like this trace or the similar code path from scsi-ml to fc_eh_abort, etc. This is fixed by moving the fc_fcp_destroy() after lport is detached from scsi-ml since fc_fcp_destroy is supposed to called only once where no lport lock is taken, otherwise the fc_fcp_pkt_release() would have to grab the lport lock. BUG: unable to handle kernel NULL pointer dereference at (null) ....... RIP: 0010:[<0000000000000000>] [<(null)>] (null) RSP: 0018:ffff8803270f7b88 EFLAGS: 00010282 RAX: dead000000200200 RBX: ffff880197d2fbc0 RCX: 0000000000005908 RDX: ffff880195ea6d08 RSI: 0000000000000282 RDI: ffff880180f4fec0 RBP: ffff8803270f7bc0 R08: ffff880197d2fbe0 R09: 0000000000000000 R10: ffff88032867f090 R11: 0000000000000000 R12: ffff880195ea6d08 R13: 0000000000000282 R14: ffff880180f4fec0 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffff8801b5820000(0000) knlGS:0000000000000000 CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b CR2: 0000000000000000 CR3: 00000001a6eae000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process fc_rport_eq (pid: 5278, threadinfo ffff8803270f6000, task ffff880326254ab0) Stack: ffffffffa02c39ca ffff8803270f7ba0 ffff88019331cbc0 ffff880197d2fbc0 0000000000000000 ffff8801a8c895e0 ffff8801a8c895e0 ffff8803270f7c10 ffffffffa02c4962 ffff8803270f7be0 ffffffff814c94ab ffff8803270f7c10 Call Trace: [] ? fc_io_compl+0x10a/0x530 [libfc] [] fc_fcp_complete_locked+0x72/0x150 [libfc] [] ? _spin_unlock_bh+0x1b/0x20 [] ? fc_exch_done+0x3f/0x60 [libfc] [] fc_fcp_retry_cmd+0x4f/0x60 [libfc] [] fc_fcp_recv+0x9b0/0xc30 [libfc] [] ? _call_console_drivers+0x4a/0x80 [] ? lock_timer_base+0x3c/0x70 [] ? try_to_del_timer_sync+0x7b/0xe0 [] fc_exch_mgr_reset+0x1df/0x250 [libfc] [] ? fc_fcp_recv+0x0/0xc30 [libfc] [] fc_rport_work+0xf2/0x4e0 [libfc] [] ? prepare_to_wait+0x4e/0x80 [] ? fc_rport_work+0x0/0x4e0 [libfc] [] worker_thread+0x170/0x2a0 [] ? autoremove_wake_function+0x0/0x40 [] ? worker_thread+0x0/0x2a0 [] kthread+0x96/0xa0 [] child_rip+0xa/0x20 [] ? kthread+0x0/0xa0 [] ? child_rip+0x0/0x20 Code: Bad RIP value. RIP [<(null)>] (null) RSP CR2: 0000000000000000 Signed-off-by: Yi Zou Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 12137f5c28284cc51b5f50932c8d02a5823fcd3c Author: Hillf Danton Date: Tue Nov 30 16:18:01 2010 -0800 [SCSI] libfc: remove define of fc_seq_exch in fc_exch.c The define for fc_seq_exch is unnecessary, since it also appears in scsi/libfc.h Signed-off-by: Hillf Danton Signed-off-by: Robert Love Signed-off-by: James Bottomley commit 50444a340028119ce5ba45d60b4cf44e3e6e1b32 Author: Maggie Date: Mon Nov 29 18:26:32 2010 -0800 [SCSI] bfa: fix endianess sparse check warnings First round of fix for the endianess check warnings from make C=2 CF="-D__CHECK_ENDIAN__". Signed-off-by: Maggie Signed-off-by: James Bottomley commit 52f94b6fd0d1ff9d935c52f8a6360834ed871d92 Author: Maggie Date: Mon Nov 29 18:21:32 2010 -0800 [SCSI] bfa: fix regular sparse check warnings. Fix all sparse check warnings from make C=2. Signed-off-by: Maggie Signed-off-by: James Bottomley commit 3db86353abba4549f665fbdde8572d619566afbb Author: Eddie Wai Date: Tue Nov 23 15:29:32 2010 -0800 [SCSI] bnx2i: Updated version to 2.6.2.2 Signed-off-by: Eddie Wai Signed-off-by: James Bottomley commit 11cec1e2e9d94bcda3446f52a868a2099a2eba4f Author: Eddie Wai Date: Tue Nov 23 15:29:31 2010 -0800 [SCSI] bnx2i: Updated copyright and maintainer info Signed-off-by: Eddie Wai Signed-off-by: James Bottomley commit a91031a6526441ff36552d53363037c3bbca0c5b Author: Eddie Wai Date: Tue Nov 23 15:29:30 2010 -0800 [SCSI] bnx2i: Cleaned up various error conditions in ep_connect/disconnect Various error conditions inside ep_connect and ep_disconnect were either not being handled or not being handled correctly. This patch fixes all those issues. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit bee348770dcaeafa57bbd32129ce0cb16a4342d6 Author: Eddie Wai Date: Tue Nov 23 15:29:29 2010 -0800 [SCSI] bnx2i: Added return code check for chip kwqe submission request Added the handling for cases when a chip request is made to the CNIC module but the hardware is not ready to accept. This would lead to many unnecessary wait timeouts. This code adds check in the connect establishment and destruction path. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 842158d7b7bc3b1a49c31f43ac20414234c33a8d Author: Eddie Wai Date: Tue Nov 23 15:29:28 2010 -0800 [SCSI] bnx2i: Modified the bnx2i stop path to compensate for in progress ops The stop path has been augmented to wait a max of 10s for all in progress offload and destroy activities to complete before proceeding to terminate all active connections (via iscsid or forcefully). Note that any new offload and destroy requests are now blocked and return to the caller immediately. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Benjamin Li Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 016ef69076f3e8f9e42f31152157f46812d25566 Author: Eddie Wai Date: Tue Nov 23 15:29:27 2010 -0800 [SCSI] bnx2i: Removed the dynamic registration of CNIC The code no longer needs to dynamically register and unregister the CNIC device. The CNIC device will be kept registered until module unload. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 7a2962c77ced218faeeb7b5eda48abfebc578df2 Author: Eddie Wai Date: Tue Nov 23 15:29:26 2010 -0800 [SCSI] bnx2i: Added mutex lock protection to conn_get_param Added net_dev mutex lock protection before accessing the csk parameters. Signed-off-by: Eddie Wai Reviewed-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 252e44805bcfff5de2e05dd126f69a18e0b760f0 Author: Eddie Wai Date: Tue Nov 23 15:29:25 2010 -0800 [SCSI] bnx2i: Allow to abort the connection if connect request times out In the situation where the connect completion response arrives after the connect request has already timed out, the connection was not being aborted but only the resource was being freed. This creates a problem for 5771X (10g) as the chip flags this with an assertion. This change will properly aborts the connection before freeing the resource. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 94810e824df1509ad3ba401e57f74b922fd928c5 Author: Eddie Wai Date: Tue Nov 23 15:29:24 2010 -0800 [SCSI] bnx2i: Fixed the remote TCP RST handling for the 570X (1g) Modified the handling of the remote TCP RST code so the chip can now flush the tx pipe accordingly upon a remote TCP RST reception. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 5bf3f39f9bda2750145a7da69ea9ae76d0054956 Author: Eddie Wai Date: Tue Nov 23 15:29:23 2010 -0800 [SCSI] bnx2i: Fixed a cid leak issue for 5771X (10g) A cid leak issue was found when the connect destroy request exceeded the driver's disconnection timeout. This will lead to a cid resource leak issue. The fix is to allow the cid cleanup even when this happens. Signed-off-by: Eddie Wai Acked-by: Anil Veerabhadrappa Reviewed-by: Michael Chan Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit cf464fc5eb272f3f5964560ef2b8d632333afe0d Author: Eddie Wai Date: Tue Nov 23 15:29:22 2010 -0800 [SCSI] bnx2i: Fixed the endian bug in the TMF LUN cmd send Added a be32_to_cpu call for the TMF LUN wqe. Signed-off-by: Eddie Wai Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 8eea2f55a65b9471276e78e5c86ddd19c4c0365c Author: Eddie Wai Date: Tue Nov 23 15:29:21 2010 -0800 [SCSI] bnx2i: Added fix for NOP-Out response panic from unsolicited NOP-In The patch fixes the following situations where NOP-Out pkt is called for: - local unsolicited NOP-Out requests (requesting no NOP-In response) - local NOP-Out responses to unsolicited NOP-In requests kernel panic is observed due to double session spin_lock requests; one in the bnx2i_process_nopin_local_cmpl routine in bnx2i_hwi.c and the other in the iscsi_put_task routine in libiscsi.c The proposed fix is to export the currently static __iscsi_put_task() routine and have bnx2i call it directly instead of the iscsi_put_task() routine which holds the session spin lock. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Anil Veerabhadrappa Acked-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit 5ee32576269f33b66c6dbc98144aead1e74a1e91 Author: Eddie Wai Date: Tue Nov 23 15:29:20 2010 -0800 [SCSI] bnx2i: Fixed bugs in the handling of unsolicited NOP-Ins Unsolicited NOP-Ins are placed in the receive queue of the hardware which requires to be read out regardless if the receive pipe is suspended or not. This patch adds the disposal of this RQ element under this condition. Also fixed the bug in the unsolicited NOP-In handling routine which checks for the RESERVED_ITT. Signed-off-by: Eddie Wai Reviewed-by: Michael Chan Reviewed-by: Benjamin Li Reviewed-by: Mike Christie Signed-off-by: James Bottomley commit f0cebfb0177f26e214adca3511f37c089d1317f8 Author: Kashyap, Desai Date: Sat Nov 13 04:42:28 2010 +0530 [SCSI] mpt2sas: Bump version 07.100.00.00 Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 37aaa78b8144d48d77bcd69a3353c88c0686df9e Author: Kashyap, Desai Date: Sat Nov 13 04:41:32 2010 +0530 [SCSI] mpt2sas: Debug string changes from target to device. Changing debug print to correct string. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit b41c09d1afc2708b3fab395085f538e1fce9b571 Author: Kashyap, Desai Date: Sat Nov 13 04:40:51 2010 +0530 [SCSI] mpt2sas: Sanity check for phy count is added using max phy count Fix oops loading driver when there is direct attached SEP device The driver set max phys count to the value reported in sas iounit page zero. However this page doesn't take into account additional virutal phys. When sas topology event arrives, the phy count is larger than expected, and the driver accesses memory array beyond the end of allocated space, then oops. Manufacturing page 8 contains the info on direct attached phys. For this fix will making sure that sas topology event is not processing phys greater than the expected phy count. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit a93c6b45df57332b1703e0dc6f99a1bafc17f5e3 Author: Kashyap, Desai Date: Sat Nov 13 04:39:11 2010 +0530 [SCSI] mpt2sas: change queue depth with reason argument more appropriately change_queue_depth callback API changed The change_queue_depth callback changed where there is now an additional parameter called reason, with SCSI_QDEPTH_DEFAULT, SCSI_QDEPTH_QFULL, and SCSI_QDEPTH_RAMP_UP codes. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 90d2a672250b9d6e5c700f2d2c07c19d6fad064a Author: Kashyap, Desai Date: Sat Nov 13 04:37:36 2010 +0530 [SCSI] mpt2sas: Remove code for TASK_SET_FULL from driver. remove support for MPI2_EVENT_TASK_SET_FULL This event is obsoleted, so this processing of this event needs to be removed from the driver. The controller firmware is going to handle TASK_SET_FULL, the driver doesn't need to do anything. Even though we are removing the EVENT handling, the behavour has not changed between driver versions becuase fimrware will still be handling queue throttling, and retrying of commands when the target device queues are full. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 7d061402590efc37d553a9155dbf41277675c179 Author: Kashyap, Desai Date: Sat Nov 13 04:36:14 2010 +0530 [SCSI] mpt2sas: MPI 2.0 Header updated MPI2 Rev header files. 1) Removed Task Set Full Event. Modified description of Disable SCSI Initiator Task Set Full Handling bit in the Flags field of IO Unit Page 1. Modified the descriptions for the three queue depth fields in SAS IO Unit Page 1. (2) Added new value for the Current Operation bits of the Flags field in the RAID Volume Indicator Structure to indicate that the Make Data Consistent operation is running. (3) Added a value of 0x6 to various SAS link rate fields to indicate an attached PHY that is not using any commonly supported settings. (4) Added Volume Not Consistent bit to the VolumeStatusFlags field of RAID Volume Page 0. (5) Added a new value for the IncompatibleReason field of RAID Physical Disk Page 0 to indicate an incompatible media type. (6) Added Diagnostic Data Upload tool for the Toolbox Request. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 7f6f794dee50ba33710145140f39de59f5ec764e Author: Kashyap, Desai Date: Sat Nov 13 04:35:30 2010 +0530 [SCSI] mpt2sas: Modify code to support Expander switch Issue : Switch swap doesn't work when device missing delay is enabled. (1) add support to individually add and remove phys to and from existing ports. This replaces the routine _transport_delete_duplicate_port. (2) _scsih_sas_host_refresh - was modified to change the link rate from zero to 1.5 GB rate when the firmware reports there is an attached device with zero link. (3) add new function mpt2sas_device_remove, this is wrapper function deletes some redundant code through out driver by combining into one subrountine (4) two subroutines were modified so the sas_device, raid_device, and port lists are traversed once when objects are deleted from the list. Previously it was looping back each time an object was deleted from the list. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 35f805b52c94f8e6cb22907ef32517132a15cb96 Author: Kashyap, Desai Date: Sat Nov 13 04:34:06 2010 +0530 [SCSI] mpt2sas: Create a pool of chain buffer instead of dedicated per IOs Create a pool of chain buffers, instead of dedicated per IO: This enahancment is to address memory allocation failure when asking for more than 2300 IOs per host. There is just not enough contiquious DMA physical memory to make one single allocation to hold both message frames and chain buffers when asking for more than 2300 request. In order to address this problem we will have to allocate memory for each chain buffer in a seperate individual memory allocation, placing each chain element of 128 bytes onto a pool of available chains, which can be shared amoung all request. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 6cb8ef573fd4c2bd72248f492fe336133660148d Author: Kashyap, Desai Date: Sat Nov 13 04:32:18 2010 +0530 [SCSI] mpt2sas: Added loadtime para for IOMissingDelay and DMD Ability to override/set the ReportDeviceMissingDelay and IODeviceMissingDelay from driver: Add new command line option missing_delay, this is an array, where the first element is the device missing delay, and the second element is io missing delay. The driver will program sas iounit page 1 with the new setting when the driver loads. This is programmed to the current and persistent configuration page so this takes immediately, as will be sticky across host reboots. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit dd3741d30300f9cf1adc046773a4bb87252d96ac Author: Kashyap, Desai Date: Sat Nov 13 04:31:14 2010 +0530 [SCSI] mpt2sas: Added sanity check for cb_idx and smid access. Sometime it is seen that controller firmware returns an invalid system message id (smid). the oops is occurring becuase mpt_callbacks pointer is referenced to either null or invalid virtual address. this is due to cb_idx set incorrectly from routine _base_get_cb_idx. the cb_idx was set incorrectly becuase there is no check to make sure smid is less than maxiumum anticapted smid. to fix this issue, we add a check in _base_get_cb_idx to make sure smid is not greater than ioc->hba_queue_depth. in addition, a similar check was added to make sure the reply address was less than the largest anticapated address. Newer firmware has sovled this issue, however it good to have this sanity check. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 363fa50fc35357b1361fb63b0726335de993374a Author: Kashyap, Desai Date: Sat Nov 13 04:29:20 2010 +0530 [SCSI] mpt2sas: Removed compiler warnnings when logging is disabled The compiler throws warning messages while compiling without CONFIG_SCSI_MPT2SAS_LOGGING. Set proper ifdef for CONFIG_SCSI_MPT2SAS_LOGGING to avoid warnnings. Signed-off-by: Kashyap Desai Signed-off-by: James Bottomley commit 1f768e91e1fcd9f0df657783847347a833fdc573 Author: James Smart Date: Sat Nov 20 23:12:11 2010 -0500 [SCSI] lpfc 8.3.19: Update lpfc driver version to 8.3.19 Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit eb7a339e67dceec30f70a5cbed8e2bf6d8318f20 Author: James Smart Date: Sat Nov 20 23:12:02 2010 -0500 [SCSI] lpfc 8.3.19: Change heartbeat to default to disabled Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 19ca760979e4be41a3eb215fb8d0e96637161947 Author: James Smart Date: Sat Nov 20 23:11:55 2010 -0500 [SCSI] lpfc 8.3.19: Added support for ELS RRQ command Added support for ELS RRQ command - Add new routine lpfc_set_rrq_active() to track XRI qualifier state. - Add new module parameter lpfc_enable_rrq to control RRQ operation. - Add logic to ELS RRQ completion handler and xri qualifier timeout to clear XRI qualifier state. - Use OX_ID from XRI_ABORTED_CQE for RRQ payload. - Tie abort and XRI_ABORTED_CQE andler to RRQ generation. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 76a95d75ede64e4f1684ddb8c626fdfdb641bda2 Author: James Smart Date: Sat Nov 20 23:11:48 2010 -0500 [SCSI] lpfc 8.3.19: Add SLI4 FC Discovery support Add SLI4 FC Discovery support - Replace READ_LA and READ_LA64 with READ_TOPOLOGY mailbox command. - Converted the old READ_LA structure to use bf_set/get instead of bit fields. - Rename HBA_FCOE_SUPPORT flag to HBA_FCOE_MODE. Flag now indicates function is running as SLI-4 FC or FCoE port. Make sure flag reset each time READ_REV completed as it can dynamically change. - Removed BDE union in the READ_TOPOLOGY mailbox command and added a define to define the ALPA MAP SIZE. Added FC Code for async events. - Added code to support new 16G link speed. - Define new set of values to keep track of valid user settable link speeds. - Used new link speed definitions to define link speed max and bitmap. - Redefined FDMI Port sppeds to be hax values and added the 16G value. - Added new CQE trailer code for FC Events. - Add lpfc_issue_init_vfi and lpfc_init_vfi_cmpl routines. - Replace many calls to the initial_flogi routine with lpfc_issue_init_vfi. - Add vp and vpi fields to the INIT_VFI mailbox command. - Addapt lpfc_hba_init_link routine for SLI4 use. - Use lpfc_hba_init_link call from lpfc_sli4_hba_setup. - Add a check for FC mode to register the FCFI before init link. - Convert lpfc_sli4_init_vpi to be called without a vpi (get it from vport). Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 085c647c3377c3e39c8c572278507b1e1c7e7bf7 Author: James Smart Date: Sat Nov 20 23:11:37 2010 -0500 [SCSI] lpfc 8.3.19: Add latest SLI4 Hardware initialization support - Add the Lancer FC and FCoE PCI IDs - Add new SLI4 INTF register definitions - Implement new SLI4 doorbell register Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 63e801ce685d151c5faca8f491adc2ad2e732259 Author: James Smart Date: Sat Nov 20 23:14:19 2010 -0500 [SCSI] lpfc 8.3.19: Fix critical errors and crashes Fix critical errors and crashes - Replace LOF_SECURITY with LOG_SECURITY - When calculating diag test memory size, use full size with header. - Return LS_RJT with status=UNSUPPORTED on unrecognized ELS's - Correct NULL pointer dereference when lpfc_create_vport_work_array() returns NULL. - Added code to handle CVL when port is in LPFC_VPORT_FAILED state. - In lpfc_do_scr_ns_plogi, check the nodelist for FDMI_DID and reuse the resource. - Check for generic request 64 and calculate the sgl offset for the request and reply sgls, also calculate the xmit length using only the request bde. Signed-off-by: Alex Iannicelli Signed-off-by: James Smart Signed-off-by: James Bottomley commit 98db519573e805f9f7e988fb5661da951fcb16b1 Author: James Bottomley Date: Mon Oct 25 15:53:41 2010 -0500 [SCSI] fix id computation in scsi_eh_target_reset() The current code in scsi_eh_target_reset() has an off by one error that actually sends spurious extra resets. Since there's no real need to reset the targets in numerical order, simply chunk up the command recovery list doing target resets and pulling matching targets out of the list (that also makes the loop O(N) instead of O(N^2). [mike christie found and fixed a list_splice -> list_splice_init problem] Reported-by: Hillf Danton Signed-off-by: James Bottomley commit 110def851fc823bb1a4584cb6308e30e5ffb3e05 Author: Wayne Boyer Date: Thu Nov 4 09:36:16 2010 -0700 [SCSI] ipr: fix mailbox register definition and add a delay before reading The definition for the mailbox register for new adapters was incorrect. The value has been updated to the correct offset. After an adapter reset, the mailbox register on the new adapters takes a number of seconds to stabilize. A delay has been added before reading the register. Signed-off-by: Wayne Boyer Acked-by: Brian King Signed-off-by: James Bottomley commit 0cb992eda1f7e7672775032378690baa87c0e13d Author: Wayne Boyer Date: Thu Nov 4 09:35:58 2010 -0700 [SCSI] ipr: fix lun assignment and comparison The lun value was not getting set up correctly for all devices attached to the new 64 bit adapters. The fix is to move the logic to earlier in the ipr_init_res_entry routine such that the value does get set correctly for all devices. Then the ipr_is_same_device comparison function was using the wrong lun value in the logic for the new adapters. Change this to use the correct lun value. Signed-off-by: Wayne Boyer Acked-by: Brian King Signed-off-by: James Bottomley commit 24d720b726c1a85f1962831ac30ad4d2ef8276b1 Author: Luben Tuikov Date: Fri Oct 22 21:24:36 2010 -0700 [SCSI] Retrieve the Caching mode page Some kernel transport drivers unconditionally disable retrieval of the Caching mode page. One such for example is the BBB/CBI transport over USB.  Such a restraint is too harsh as some devices do support the Caching mode page. Unconditionally enabling the retrieval of this mode page over those transports at their transport code level may result in some devices failing and becoming unusable. This patch implements a method of retrieving the Caching mode page without unconditionally enabling it in the transports which unconditionally disable it. The idea is to ask for all supported pages, page code 0x3F, and then search for the Caching mode page in the mode parameter data returned. The sd driver already asks for all the mode pages supported by the attached device by setting the page code to 0x3F in order to find out if the media is write protected by reading the WP bit in the Device Specific Parameter field. It then attempts to retrieve only the Caching mode page by setting the page code to 8 and actually attempting to retrieve it if and only if the transport allows it. The method implemented here is that if the transport doesn't allow retrieval of the Caching mode page and the device is not RBC, then we ask for all pages supported by setting the page code to 0x3F (similarly to how the WP bit is retrieved above), and then we search for the Caching mode page in the mode parameter data returned. With this patch, devices over SATA, report this (no change): Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] 976773168 512-byte logical blocks: (500 GB/465 GiB) Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: Attached scsi generic sg0 type 0 Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write Protect is off Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Mode Sense: 00 3a 00 00 Oct 22 18:45:58 localhost kernel: sd 0:0:0:0: [sda] Write cache: enabled, read cache: enabled, doesn't support DPO or FUA Smart devices report their Caching mode page. This is a change where we'd previously see the kernel making assumption about the device's cache being write-through: Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: Attached scsi generic sg2 type 0 Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] 610472646 4096-byte logical blocks: (2.50 TB/2.27 TiB) Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write Protect is off Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Mode Sense: 47 00 10 08 Oct 22 18:45:58 localhost kernel: sd 6:0:0:0: [sdb] Write cache: enabled, read cache: enabled, supports DPO and FUA And "dumb" devices over BBB, are correctly shown not to support reporting the Caching mode page: Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] 15663104 512-byte logical blocks: (8.01 GB/7.46 GiB) Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Write Protect is off Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Mode Sense: 23 00 00 00 Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] No Caching mode page present Oct 22 18:49:06 localhost kernel: sd 7:0:0:0: [sdc] Assuming drive cache: write through Signed-off-by: Luben Tuikov Signed-off-by: James Bottomley commit 00f0254ed9b19164d416dc2e3c2e81eda55a6faf Author: Dan Williams Date: Fri Oct 1 13:55:52 2010 -0700 [SCSI] libsas: fix definition of wideport, include local sas address To date libsas has only looked at the attached sas address when determining the formation of wide ports. The specification and some hardware expects that phys with different addresses will not form a wide port unless the local peer phys also match each other. Introduce a flag to select stricter behavior at sas_register_ha() time. The flag can be dropped once it is known that all libsas users expect the same behavior. Current drivers just initialize this field to zero and get the traditional behavior. Reported-by: Patrick Thomson Signed-off-by: Dan Williams Signed-off-by: James Bottomley commit 3ff5588d3f8afad65ded52ac0e4191462fe034cb Author: Alan Stern Date: Tue Sep 7 11:44:01 2010 -0400 [SCSI] sd: improve logic and efficiecy of media-change detection This patch (as1415) improves the formerly incomprehensible logic in sd_media_changed() (the current code refers to "changed" as a state, whereas in fact it is a relation between two states). It also adds a big comment so that everyone can understand what is really going on. The patch also improves efficiency by not reporting a media change when no medium was ever present. If no medium was present the last time we checked and there's still no medium, it's not necessary to tell the caller that a change occurred. Doing so merely causes the caller to attempt to revalidate a non-existent disk, which is a waste of time. Signed-off-by: Alan Stern Signed-off-by: James Bottomley commit fde52dbd7f71934aba4e150f3d1d51e826a08850 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:04 2010 +0100 perf probe: Don't always consider EOF as an error when listing source code When listing a whole file or a function which is located at the end, perf-probe -L output wrongly: "Source file is shorter than expected.". This is because show_one_line() always consider EOF as an error. This patch fixes this by not considering EOF as an error when dumping the trailing lines. Otherwise it's still an error and perf-probe still outputs its warning. Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-6-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 9d95b580a8d64ef4d1660a21a9de0658fe29f041 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:03 2010 +0100 perf probe: Fix line range description since a single file is allowed $ perf-probe -L sched.c is currently allowed but not documented. Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-5-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 44b81e929b0c00e703a31a3d634b668bb27eb1c8 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:02 2010 +0100 perf probe: Clean up redundant tests in show_line_range() It also removes some superflous parentheses. Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-4-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit befe341468f4e61ecaf337a0237f2aab76817437 Author: Franck Bui-Huu Date: Mon Dec 20 15:18:01 2010 +0100 perf probe: Rewrite show_one_line() to make it simpler Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-3-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 62c15fc49bd1b35d79b34ea96f132ab435e2215a Author: Franck Bui-Huu Date: Mon Dec 20 15:18:00 2010 +0100 perf probe: Make -L display the absolute path of the dumped file The actual file used by 'perf probe -L sched.c' is reported in the ouput of the command. But it's simply displayed as it has been given to the command (simply sched.c) which is too ambiguous to be really usefull since several sched.c files can be found into the same project and we also don't know which search path has been used. Acked-by: Masami Hiramatsu Cc: Masami Hiramatsu LKML-Reference: <1292854685-8230-2-git-send-email-fbuihuu@gmail.com> Signed-off-by: Franck Bui-Huu Signed-off-by: Arnaldo Carvalho de Melo commit 0e43e5d222095ca2d1d825dd2e4fa158bdc4cc9b Author: Masami Hiramatsu Date: Fri Dec 17 22:12:11 2010 +0900 perf probe: Cleanup messages Add new lines for error or debug messages, change dwarf related words to more generic words (or just removed). Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Srikar Dronamraju Cc: Steven Rostedt LKML-Reference: <20101217131211.24123.40437.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Masami Hiramatsu Signed-off-by: Arnaldo Carvalho de Melo commit ec5761eab318e50e69fcf8e63e9edaef5949c067 Author: David Ahern Date: Thu Dec 9 13:27:07 2010 -0700 perf symbols: Add symfs option for off-box analysis using specified tree The symfs argument allows analysis of perf.data file using a locally accessible filesystem tree with debug symbols - e.g., tree created during image builds, sshfs mount, loop mounted KVM disk images, USB keys, initrds, etc. Anything with an OS tree can be analyzed from anywhere without the need to populate a local data store with build-ids. Commiter notes: o Fixed up symfs="/" variants handling. o prefixed DSO__ORIG_GUEST_KMODULE case with symfs too, avoiding use of files outside the symfs directory. LKML-Reference: <1291926427-28846-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit eac23d1c384b55e4bbb89ea9e5a6bb77fb4d1140 Author: Ian Munsie Date: Thu Dec 9 16:33:53 2010 +1100 perf record,report,annotate,diff: Process events in order This patch changes perf report to ask for the ID info on all events be default if recording from multiple CPUs. Perf report, annotate and diff will now process the events in order if the kernel is able to provide timestamps on all events. This ensures that events such as COMM and MMAP which are necessary to correctly interpret samples are processed prior to those samples so that they are attributed correctly. Before: # perf record ./cachetest # perf report # Events: 6K cycles # # Overhead Command Shared Object Symbol # ........ ....... ................. ............................... # 74.11% :3259 [unknown] [k] 0x4a6c 1.50% cachetest ld-2.11.2.so [.] 0x1777c 1.46% :3259 [kernel.kallsyms] [k] .perf_event_mmap_ctx 1.25% :3259 [kernel.kallsyms] [k] restore 0.74% :3259 [kernel.kallsyms] [k] ._raw_spin_lock 0.71% :3259 [kernel.kallsyms] [k] .filemap_fault 0.66% :3259 [kernel.kallsyms] [k] .memset 0.54% cachetest [kernel.kallsyms] [k] .sha_transform 0.54% :3259 [kernel.kallsyms] [k] .copy_4K_page 0.54% :3259 [kernel.kallsyms] [k] .find_get_page 0.52% :3259 [kernel.kallsyms] [k] .trace_hardirqs_off 0.50% :3259 [kernel.kallsyms] [k] .__do_fault After: # perf report # Events: 6K cycles # # Overhead Command Shared Object Symbol # ........ ....... ................. ............................... # 44.28% cachetest cachetest [.] sumArrayNaive 22.53% cachetest cachetest [.] sumArrayOptimal 6.59% cachetest ld-2.11.2.so [.] 0x1777c 2.13% cachetest [unknown] [k] 0x340 1.46% cachetest [kernel.kallsyms] [k] .perf_event_mmap_ctx 1.25% cachetest [kernel.kallsyms] [k] restore 0.74% cachetest [kernel.kallsyms] [k] ._raw_spin_lock 0.71% cachetest [kernel.kallsyms] [k] .filemap_fault 0.66% cachetest [kernel.kallsyms] [k] .memset 0.54% cachetest [kernel.kallsyms] [k] .copy_4K_page 0.54% cachetest [kernel.kallsyms] [k] .find_get_page 0.54% cachetest [kernel.kallsyms] [k] .sha_transform 0.52% cachetest [kernel.kallsyms] [k] .trace_hardirqs_off 0.50% cachetest [kernel.kallsyms] [k] .__do_fault Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1291872833-839-1-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 21ef97f05a7da5bc23b26cb34d6746f83ca9bf20 Author: Ian Munsie Date: Fri Dec 10 14:09:16 2010 +1100 perf session: Fallback to unordered processing if no sample_id_all If we are running the new perf on an old kernel without support for sample_id_all, we should fall back to the old unordered processing of events. If we didn't than we would *always* process events without timestamps out of order, whether or not we hit a reordering race. In other words, instead of there being a chance of not attributing samples correctly, we would guarantee that samples would not be attributed. While processing all events without timestamps before events with timestamps may seem like an intuitive solution, it falls down as PERF_RECORD_EXIT events would also be processed before any samples. Even with a workaround for that case, samples before/after an exec would not be attributed correctly. This patch allows commands to indicate whether they need to fall back to unordered processing, so that commands that do not care about timestamps on every event will not be affected. If we do fallback, this will print out a warning if report -D was invoked. This patch adds the test in perf_session__new so that we only need to test once per session. Commands that do not use an event_ops (such as record and top) can simply pass NULL in it's place. Acked-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <1291951882-sup-6069@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 0719e1d23aab3b445c823404fd1b8b027757bb0a Author: Yann E. MORIN Date: Thu Dec 16 00:19:00 2010 +0100 Documentation/kbuild: add info that 'choice' can have a symbol name Changeset 5a1aa8a1 added the possibility to name a choice, and to have the same choice be defined multiple times. But the documentation was forgotten, so this updates it accordingly. Thanks to Arnaud Lacombe for pointing it to me in the first place: http://www.spinics.net/lists/linux-kbuild/msg03940.html Signed-off-by: "Yann E. MORIN" Cc: Roman Zippel Cc: Arnaud Lacombe Signed-off-by: Michal Marek commit fec6e5252b542e748871c88f8455e69ae73ea156 Author: Henrik Rydberg Date: Tue Dec 21 18:11:25 2010 +0100 Input: synaptics - add multi-finger and semi-mt support The Synaptics 2.7 series of touchpads support a mode for reporting two sets of X/Y/Pressure data (advanced gesture mode). By default, these devices report only single finger data, depriving userspace of the nowadays ubiquitous two-finger scroll gesture. Enabling advanced gesture mode also enables the multi-finger report, although the device does not claim that capability. Up to three fingers can be reported this way. While two or three fingers are touching, the normal packet is prepended by a reduced finger packet of lower resolution. From the two packets (which do not represent the actual fingers), the bounding rectangle of the individual contacts can be extracted. This information is sufficient to perform scaling gestures and a limited form of rotation gesture. The behavior has been coined semi-mt capability, and is signaled to userspace via the INPUT_PROP_SEMI_MT device property. Work to decode the advanced gesture packet: Takashi Iwai. Cleanup and testing of the original patch: Chase Douglas. Minor cleanup and testing: Chris Bagwell. Finalization and semi-mt support: Henrik Rydberg. Reported-by: Tobyn Bertram Signed-off-by: Takashi Iwai Signed-off-by: Chase Douglas Signed-off-by: Chris Bagwell Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit c14890a8e54977f895773d393d6a640d6d698fb8 Author: Henrik Rydberg Date: Thu Dec 16 09:52:23 2010 +0100 Input: synaptics - report clickpad property With the new input property interface, it is possible to report the special quirks of a device using ioctl/sysfs. This patch sets up the device as a pointer, and reports the clickpad functionality via the INPUT_PROP_BUTTONPAD property. Acked-by: Chase Douglas Signed-off-by: Henrik Rydberg commit 17742dc743716eebbf5892add0e0bf91f541fc39 Author: Michal Marek Date: Mon Dec 20 16:06:44 2010 +0100 kconfig: Make expr_copy() take a const argument Fixes scripts/kconfig/expr.c: In function ‘expr_get_leftmost_symbol’: scripts/kconfig/expr.c:1026:2: warning: passing argument 1 of ‘expr_copy’ discards qualifiers from pointer target type scripts/kconfig/expr.c:67:14: note: expected ‘struct expr *’ but argument is of type ‘const struct expr *’ Signed-off-by: Michal Marek commit 1137c56b7420c801147e0863845c03b07554721a Author: Arnaud Lacombe Date: Sun Sep 26 16:24:08 2010 -0400 kconfig: simplify select-with-unmet-direct-dependency warning This is an attempt to simplify the expressing printed by kconfig when a symbol is selected but still has direct unmet dependency. First, the symbol reverse dependency is split in sub-expression. Then, each sub-expression is checked to ensure that it does not contains the unmet dependency. This removes the false-positive symbols and fixed symbol which already have the correct dependency. Finally, only the symbol responsible of the "select" is printed, instead of its full dependency tree. CC: Catalin Marinas Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 1174dd1f890b7f8be8ec6a7071657fe8f59e18b7 Author: Trond Myklebust Date: Tue Dec 21 10:52:24 2010 -0500 NFSv4: Convert a few commas into semicolons... Signed-off-by: Trond Myklebust commit b3bcedadf23264c3b7afcbfbfe1965a17ef1352c Author: Joe Perches Date: Tue Dec 21 10:52:24 2010 -0500 net/sunrpc/clnt.c: Convert sprintf_symbol to %ps Signed-off-by: Joe Perches Signed-off-by: Trond Myklebust commit aa69947399a119d7f1b35bbcd62c849839b35449 Author: Stanislav Kinsbursky Date: Wed Dec 8 12:40:13 2010 +0300 NFS: suppressing showing of default mount port value in /proc fixed Update: added check for zero value as it was before (note: can't simply check mountd_port for positive value because it's typeof unsigned short) Default value for mount server port is set to NFS_UNSPEC_PORT (-1) and will not be changed during parsing mount options for mound data version 6. This default value will be showed for mountport in /proc/mounts always since current default check is for zero value. This small mistake leads to big problem, because during umount.nfs execution from old user-space utils (at least nfs-utils 1.0.9) this value will be used as the server port to connect to. This request will be rejected (since port is 65535) and thus nfs mount point can't be unmounted. Note from Chuck Lever (chuck.lever@oracle.com): this is only possible if /etc/mtab is a link to /proc/mounts. Not all systems have this configuration. Signed-off-by: Stanislav Kinsbursky Signed-off-by: Trond Myklebust commit 611c96c8f728c4bcdbadaa2387942d3c0641cadf Author: J. Bruce Fields Date: Mon Dec 13 19:05:46 2010 -0500 nfs4: fix units bug causing hang on recovery Note that cl_lease_time is in jiffies. This can cause a very long wait in the NFS4ERR_CLID_INUSE case. Signed-off-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 72895b1ac7baeda76835cddb3edb019a90d32bcb Author: Jesper Juhl Date: Thu Dec 9 23:17:15 2010 +0100 nfs: Take advantage of kmem_cache_zalloc() in nfs_page_alloc() Take advantage of kmem_cache_zalloc() in nfs_page_alloc(). Save a call to memset() and a few bytes. Before: [jj@dragon linux-2.6]$ size fs/nfs/pagelist.o text data bss dec hex filename 1765 0 8 1773 6ed fs/nfs/pagelist.o After: [jj@dragon linux-2.6]$ size fs/nfs/pagelist.o text data bss dec hex filename 1749 0 8 1757 6dd fs/nfs/pagelist.o Signed-off-by: Jesper Juhl Signed-off-by: Trond Myklebust commit c8b031ebc1246d42463c5c69df8f610ca9f48e77 Author: Tobias Klauser Date: Thu Dec 9 15:53:28 2010 +0100 NFS: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Trond Myklebust commit b080ac8ad47aeeb845d8d11924f09255cf49b5e9 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 21:34:51 2010 +0100 ARM: 6459/2: sa1100: Add nanoEngine PCI support. This patch adds nanoEngine's PCI support. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit fa87672ab30ce6564393778b8cbc67fc32712a30 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:41:29 2010 +0100 ARM: 6458/1: pcmcia: Adds nanoEngine PCMCIA support. This patch adds nanoEngine PCMCIA support, with support for two sockets. In order to have a fully functional pcmcia subsystem in a BSE nanoEngine board you should carefully read this: http://cambuca.ldhs.cetuc.puc-rio.br/nanoengine/ Acked-by: Dominik Brodowski Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 17b38ebb6a32250a220d6af77293f7e3f9c62a6e Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:39:05 2010 +0100 ARM: 6457/1: pcmcia: Fix checkpatch.pl issues in drivers/pcmcia/soc_common.c. This patch fixes checkpatch.pl issues in drivers/pcmcia/soc_common.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit d2ccb52d88dcb7eb3539d0e0c77a7028b8d46037 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 21:31:32 2010 +0100 ARM: 6455/2: Better use of the RTC framework for sa11xx. This patch uses the RTC framework to treat some common ioctl. In particular, it fixes the behaviour of rtc_irq_set_freq(), which did not work as expected because the timer was not beeing retriggered. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 47bb3b31ab2c95e275b850a291794a29aaaa31cd Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:32:48 2010 +0100 ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. This patch fixes checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 9f15d2caca102c4b79e34562296bcbf982665cb2 Author: Marcelo Roberto Jimenez Date: Thu Dec 16 20:51:30 2010 +0100 ARM: 6447/3: sa1100: Put nanoEngine support back in the kernel Adds Bright Star Engineering's nanoEngine board support to the kernel. Also: - Adds the nanoEngine memory chip to arch/arm/mach-sa1100/cpu-sa1110.c (Micron MT48LC8M16A2TG-75). - Increase in the sdram_params->name[] field length to accomodate the name of the memory chip. - Clean up of header content and order of arch/arm/mach-sa1100/cpu-sa1110.c Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 27667c996f6a0bed4ad1e10ac0a0dbb6037968db Author: Bart Van Assche Date: Tue Dec 21 15:07:45 2010 +0100 block: Clean up exit_io_context() source code. This patch fixes a spelling error in a source code comment and removes superfluous braces in the function exit_io_context(). Signed-off-by: Bart Van Assche Cc: Jens Axboe Signed-off-by: Jens Axboe commit 458350b31f4f7a4d1db0c268cf1cced5afeeb8a5 Author: Mark Brown Date: Mon Dec 20 14:35:09 2010 +0000 ASoC: Fix WM8994/58 3D stereo control definitions Cut'n'paste in the register names. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 0bb140f8d94dd683fab248a3216dd5d0e792d41f Author: Mark Brown Date: Mon Dec 20 20:53:25 2010 +0000 ASoC: Remove some unused defines from WM8903 These would have been used if we'd done manual clock divider setup, but we didn't. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 0686952458780e8a29d5a75dea03472fe2302c5a Author: Randy Dunlap Date: Tue Dec 21 22:22:40 2010 +1100 crypto: af_alg - fix af_alg memory_allocated data type Change data type to fix warning: crypto/af_alg.c:35: warning: initialization from incompatible pointer type Signed-off-by: Randy Dunlap Signed-off-by: Herbert Xu commit 215faf9c5f6e319e97edea9e178123e07825c14d Author: Joe Perches Date: Tue Dec 21 02:16:10 2010 -0800 drivers/net/*/: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 75a84eb5d144dc761e1bb0f7dcacbf2b5cee562c Author: Joe Perches Date: Tue Dec 21 02:16:09 2010 -0800 tulip: Use DEFINE_PCI_DEVICE_TABLE and static const Moves the PCI table to the right read-only section. Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 5591c75dc345d93d353d2ab2962824648a73efe4 Author: Joe Perches Date: Tue Dec 21 02:16:09 2010 -0800 usb: Use static const, consolidate code Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Consolidate duplicated code into new fix_crc_bug function and declare data in that function static const. Signed-off-by: Joe Perches commit b6bc765067ece933cc3dc7f5e95665a89100b1d5 Author: Joe Perches Date: Tue Dec 21 02:16:08 2010 -0800 drivers/net/*.c: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. Signed-off-by: Joe Perches commit 895950c2a6565d9eefda4a38b00fa28537e39fcb Author: Joe Perches Date: Tue Dec 21 02:16:08 2010 -0800 tg3: Use DEFINE_PCI_DEVICE_TABLE Moves the PCI tables to the right read-only section. Signed-off-by: Joe Perches commit 183720b8af5301e2eab7f3163f03133c5a6ad6da Author: Ben Skeggs Date: Thu Dec 9 15:17:10 2010 +1000 drm/nvc0: accelerate ttm buffer moves Signed-off-by: Ben Skeggs commit 6d86951a45013ac5b060c5e6307b11b7c685c76f Author: Ben Skeggs Date: Wed Dec 8 11:19:30 2010 +1000 drm/nvc0: initial support for tiled buffer objects Signed-off-by: Ben Skeggs commit ddbaf79a8b047dcccf766d0518626cdc0f43d58e Author: Ben Skeggs Date: Wed Nov 24 10:52:43 2010 +1000 drm/nvc0: implement fbcon acceleration Signed-off-by: Ben Skeggs commit 966a5b7daa15e152bc2e1f0407939cc721fb5995 Author: Ben Skeggs Date: Wed Nov 24 10:49:02 2010 +1000 drm/nvc0: implement pgraph engine hooks Signed-off-by: Ben Skeggs commit b2b099388fa76f0be25431794d369d251a4002dd Author: Ben Skeggs Date: Wed Nov 24 10:47:15 2010 +1000 drm/nvc0: implement pfifo engine hooks Signed-off-by: Ben Skeggs commit 529c4959129c7c425aaf3d5b6acc63edf76827ad Author: Ben Skeggs Date: Wed Nov 24 10:30:22 2010 +1000 drm/nvc0: implement fencing Just simple REF_CNT fencing for the moment. Signed-off-by: Ben Skeggs commit 96545299d7405d4c0f44b727718e263653fc11aa Author: Ben Skeggs Date: Wed Nov 24 10:26:24 2010 +1000 drm/nvc0: fix channel dma init paths Signed-off-by: Ben Skeggs commit 5216782bf8c195de3befe0742a877c987dd3c4fd Author: Ben Skeggs Date: Wed Nov 24 10:18:28 2010 +1000 drm/nvc0: skip dma object creation for drm channel Signed-off-by: Ben Skeggs commit effd6e066f406277254ad7603cf2c7465c4f114b Author: Ben Skeggs Date: Wed Nov 24 10:15:05 2010 +1000 drm/nvc0: implement channel structure initialisation Signed-off-by: Ben Skeggs commit 7460d70355eb568817296d6d3364f72d72eeba70 Author: Ben Skeggs Date: Wed Nov 24 10:10:23 2010 +1000 drm/nvc0: gpuobj_new need only check validity and init the relevant engine Signed-off-by: Ben Skeggs commit 587107b690f567690982fb504047e7b0a6590344 Author: Ben Skeggs Date: Wed Nov 24 10:07:21 2010 +1000 drm/nvc0: reject the notifier_alloc ioctl Signed-off-by: Ben Skeggs commit 99805566d93d69b7daf2373aba9fae52a62396f4 Author: Ben Skeggs Date: Tue Nov 16 14:58:42 2010 +1000 drm/nvc0: create shared channel vm Signed-off-by: Ben Skeggs commit 8984e046153eb1d6b0b24626169f9c6e58232e1b Author: Ben Skeggs Date: Mon Nov 15 11:48:33 2010 +1000 drm/nvc0: initial vm implementation, use for bar1/bar3 management Signed-off-by: Ben Skeggs commit 4c74eb7ff276813ee73943a3756b295675fb2865 Author: Ben Skeggs Date: Wed Nov 10 14:10:04 2010 +1000 drm/nvc0: import initial vm backend Signed-off-by: Ben Skeggs commit 3ee0128140eed7d32b785a335099a2ec38258283 Author: Ben Skeggs Date: Wed Dec 15 11:04:39 2010 +1000 drm/nouveau: modify vm to accomodate dual page tables for nvc0 Signed-off-by: Ben Skeggs commit 356f039822b8d802138f7121c80d2a9286976dbd Author: Nandita Dukkipati Date: Mon Dec 20 14:15:56 2010 +0000 TCP: increase default initial receive window. This patch changes the default initial receive window to 10 mss (defined constant). The default window is limited to the maximum of 10*1460 and 2*mss (when mss > 1460). draft-ietf-tcpm-initcwnd-00 is a proposal to the IETF that recommends increasing TCP's initial congestion window to 10 mss or about 15KB. Leading up to this proposal were several large-scale live Internet experiments with an initial congestion window of 10 mss (IW10), where we showed that the average latency of HTTP responses improved by approximately 10%. This was accompanied by a slight increase in retransmission rate (0.5%), most of which is coming from applications opening multiple simultaneous connections. To understand the extreme worst case scenarios, and fairness issues (IW10 versus IW3), we further conducted controlled testbed experiments. We came away finding minimal negative impact even under low link bandwidths (dial-ups) and small buffers. These results are extremely encouraging to adopting IW10. However, an initial congestion window of 10 mss is useless unless a TCP receiver advertises an initial receive window of at least 10 mss. Fortunately, in the large-scale Internet experiments we found that most widely used operating systems advertised large initial receive windows of 64KB, allowing us to experiment with a wide range of initial congestion windows. Linux systems were among the few exceptions that advertised a small receive window of 6KB. The purpose of this patch is to fix this shortcoming. References: 1. A comprehensive list of all IW10 references to date. http://code.google.com/speed/protocols/tcpm-IW10.html 2. Paper describing results from large-scale Internet experiments with IW10. http://ccr.sigcomm.org/drupal/?q=node/621 3. Controlled testbed experiments under worst case scenarios and a fairness study. http://www.ietf.org/proceedings/79/slides/tcpm-0.pdf 4. Raw test data from testbed experiments (Linux senders/receivers) with initial congestion and receive windows of both 10 mss. http://research.csc.ncsu.edu/netsrv/?q=content/iw10 5. Internet-Draft. Increasing TCP's Initial Window. https://datatracker.ietf.org/doc/draft-ietf-tcpm-initcwnd/ Signed-off-by: Nandita Dukkipati Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit eda83e3b63e88351310c13c99178eb4634f137b2 Author: Eric Dumazet Date: Mon Dec 20 12:54:58 2010 +0000 net_sched: sch_sfq: better struct layouts Here is a respin of patch. I'll send a short patch to make SFQ more fair in presence of large packets as well. Thanks [PATCH v3 net-next-2.6] net_sched: sch_sfq: better struct layouts This patch shrinks sizeof(struct sfq_sched_data) from 0x14f8 (or more if spinlocks are bigger) to 0x1180 bytes, and reduce text size as well. text data bss dec hex filename 4821 152 0 4973 136d old/net/sched/sch_sfq.o 4627 136 0 4763 129b new/net/sched/sch_sfq.o All data for a slot/flow is now grouped in a compact and cache friendly structure, instead of being spreaded in many different points. struct sfq_slot { struct sk_buff *skblist_next; struct sk_buff *skblist_prev; sfq_index qlen; /* number of skbs in skblist */ sfq_index next; /* next slot in sfq chain */ struct sfq_head dep; /* anchor in dep[] chains */ unsigned short hash; /* hash value (index in ht[]) */ short allot; /* credit for this slot */ }; Signed-off-by: Eric Dumazet Cc: Jarek Poplawski Cc: Patrick McHardy Signed-off-by: David S. Miller commit c324acd5032f516b8188da99d2ce05cf8d1294d6 Author: Alex Deucher Date: Wed Dec 8 22:13:06 2010 -0500 drm/radeon/kms: parse the extended LCD info block This block may contain various additional LCD info such as physical size and a stored EDID. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7a868e18a4907dc8f1f05d99bcb9fd3fa8881ee4 Author: Alex Deucher Date: Wed Dec 8 22:13:05 2010 -0500 drm/radeon/kms: use LCD physical size from vbios tables if available Some systems have the LCD width and height in mm available in the LCD info table. Use this info if there is no EDID to provide it. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 000fa7cf46479238f7b9f2d7763e41af5268b16a Author: Mario Kleiner Date: Fri Dec 10 16:00:19 2010 +0100 drm-vblank: Always return true vblank count of scheduled vblank event. This patch tries to make sure that the vbl.reply.sequence vblank count for a queued or emitted vblank event always corresponds to the true vblank count of queueing/emission, so the ddx can rely on the returned target_msc for consistency checks and implementation of swap_intervals in glXSwapBuffers(). Without this there is a small race-condition between the userspace ddx queueing a vblank event and the vblank counter incrementing before the event gets queued in the kernel. Signed-off-by: Mario Kleiner Acked-by: Jesse Barnes Signed-off-by: Dave Airlie commit 4584acc3ee236424b5d0b52f143d980cae3c2be5 Merge: f0c61d3 c7d3e9e b89cd71 Author: Tony Lindgren Date: Mon Dec 20 19:13:40 2010 -0800 Merge branches 'devel-iommu-mailbox' and 'devel-l2x0' into omap-for-linus commit 3ce05168907c9b1358492a73badb0ff1603fb81d Author: David Fries Date: Sun Dec 12 12:39:22 2010 -0600 drm/kms: load fbcon from drm_kms_helper Kconfig says fbcon is required by drm_kms_helper. If radeon, fbcon, and drm_kms_helper are all modules, radeon is auto loaded (by PCI id?), drm_kms_helper is loaded because of the module dependency, but fbcon isn't loaded leaving the console unusable. Since fbcon is required and there isn't an explicit module dependency, request the module to be loaded from drm_kms_helper. Signed-off-by: David Fries Cc: David Airlie Cc: dri-devel@lists.freedesktop.org Signed-off-by: Dave Airlie commit 7d6aa80c35bb1f706e2894100dcc51e19a83f913 Author: Alex Deucher Date: Mon Dec 20 11:21:43 2010 -0500 drm/radeon/kms/atom: clean up op_mask handler Readability cleanup and fix debugging output, no functional change. Reported-by: Frank Huang Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b61c99de8e7905916d1508ba7c9a9c08656e169d Author: Alex Deucher Date: Thu Dec 16 18:40:29 2010 -0500 drm/radeon/kms: fix DCE4.1 dig routing (v2) Works more like DCE4.0 despite what the docs say. This fixes blank screen issues when changing crtc routing due to incorrect crtc to dig mapping. v2: only two DIGx blocks, routing is hardcoded based on link. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 48c36c8f9a3e881953bb72deb55623a53795a684 Author: Marek Olšák Date: Sat Dec 18 11:41:49 2010 +0100 drm/radeon/kms: allow r500 US_FORMAT regs in the CS checker add to the 2.8 bump for pageflip The purpose of these regs is to work around a TX hw bug in R520. Signed-off-by: Marek Olšák Signed-off-by: Dave Airlie commit 21719b398b0e49d21c0b9083cffd552ba28ed4af Author: Tijl Coosemans Date: Tue Dec 21 12:54:52 2010 +1000 drm/radeon: Definition of R_0003C2_GENMO_WT seems wrong In drivers/gpu/drm/radeon/r100d.h R_0003C2_GENMO_WT is defined as 0x3C0. I think this should be 0x3C2. Signed-off-by: Dave Airlie commit 57084d05379fe5c081d024006129b0565a11855f Author: James Simmons Date: Mon Dec 20 19:10:39 2010 +0000 drm/fb: Don't expose mmio for fbdev emulation layer For the fbdev api if the struct fb_var_screeninfo accel_flags field is set to FB_ACCELF_TEXT then userland applications can not mmap the mmio region. Since it is a bad idea for DRM drivers to expose the mmio region via the fbdev layer we always set the accel_flags to prevent this. Please apply. Signed-off-by: James Simmons Signed-off-by: Dave Airlie commit f0c61d3d3c319def8feebb99682ae0223a41dffe Author: Jarkko Nikula Date: Sat Dec 18 18:17:10 2010 +0000 omap: rx51: Switch rx51_tpa6130a2_data __initdata to__initdata_or_module If the TPA6130 is compiled as module the id and power_gpio values are arbitrary at module probing time since the rx51_tpa6130a2_data was marked as __initdata. Fix this by using __initdata_or_module. Then __initdata is defined only if the kernel is built without CONFIG_MODULES and omitted otherwise. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit f861fc1766888858db6abd57adae3af7abc286ca Author: Grazvydas Ignotas Date: Sun Dec 19 22:33:36 2010 +0000 omap: pandora: fix wifi support After commit ed919b0 "mmc: sdio: fix runtime PM anomalies by introducing MMC_CAP_POWER_OFF_CARD" it is required to specify MMC_CAP_POWER_OFF_CARD to have runtime PM support. As the wl1251 driver expects card to be powered down when it's not used, wifi will no longer work after interface is brought down at least once without functioning runtime PM. Fix this by declaring MMC_CAP_POWER_OFF_CARD for MMC3. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit d920e52020bcad791b12137deea341665160b974 Author: Raghuveer Murthy Date: Fri Dec 17 18:15:07 2010 -0800 OMAP4: Pandaboard: Add omap_reserve functionality This patch adds omap_reserve functionality to board-omap4panda.c. Helps in the reserving boot time memory in SDRAM, used here for framebuffer allocation. This patch is in similar lines to commit id 71ee7dad9b6991, from Russell king Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Raghuveer Murthy [tony@atomide.com: fixed to be before .map_io as pointed out by Russell King] Signed-off-by: Tony Lindgren commit f389f4cb46e69fe2cea81e21fd01efc4daf07c8e Author: Hemanth V Date: Fri Dec 17 18:15:08 2010 -0800 omap4: Add platform changes for PWM LED Register TWL6030 PWM, which is used as charging LED Signed-off-by: Hemanth V Signed-off-by: Tony Lindgren commit d048aca2e2e023204c10ca6b705642c1de54d95c Author: Hemanth V Date: Fri Dec 17 18:15:08 2010 -0800 omap4: Add platform changes for Ambient Light sensor Register BH1780GLI Ambient light sensor, which is an I2C device for 4430SDP board. Signed-off-by: Hemanth V Signed-off-by: Tony Lindgren commit 70e77760639625e6ec4564c262552e6002eb5ba6 Author: Laurent Pinchart Date: Fri Dec 17 18:15:08 2010 -0800 omap3: igepv2: LED gpio-led:green:d1 is active low Make sure the LED is turned off at boot time, and configure the GPIO LED device as active low. Signed-off-by: Laurent Pinchart Acked-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 62d8e9e2613032c6c8397b554b5f789131bb3d60 Author: Laurent Pinchart Date: Fri Dec 17 18:15:07 2010 -0800 omap3: igepv2: Don't call gpio_set_value right aftergpio_direction_output gpio_direction_output() has a value argument, there's no need to call gpio_set_value() explicitly right after. Signed-off-by: Laurent Pinchart Acked-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 65dd4c1626b396af839881708fdf3bc726a16f73 Author: Tony Lindgren Date: Fri Dec 17 18:37:08 2010 -0800 omap1: Fix innovator FPGA init for multi-omap No need to call this early from init_irq. Also recent changes initialize GPIO now later, so calling gpio_request from init_irq will make it fail. While at it, also remove the unnecessary EXPORT_SYMBOL. Signed-off-by: Tony Lindgren commit da07c0cff295d887427ad2519e452ee3c27e47ff Author: Marc Zyngier Date: Mon Dec 20 18:48:16 2010 -0800 Fix IGEPv2 second MMC channel power supply Commit 72f381ba056 (omap3: Remove VMMC2 regulator on IGEP v2) removed an unused regulator entry, but left the second MMC channel (used by the Libertas WLAN module) without link to power regulator. This causes the SDIO module to fail being detected. This patch adds the two regulators that actually feed the WLAN module (1v8 from the TWL4030 VIO LDO, and a fixed 3v3). With that patch, the second channel is properly detected. Details of the power supply implementation were kindly provided by Enric Balletbo i Serra. Also change vmmc1 to use symbolic names instead of direct device reference. Tested on an IGEPv2 Rev-B. Signed-off-by: Marc Zyngier Acked-by: Enric Balletbo i Serra Cc: Tony Lindgren Signed-off-by: Tony Lindgren commit cd303e1712e3ebdf174bb378bb8df851eac2701a Author: Anand Gadiyar Date: Mon Dec 20 18:48:16 2010 -0800 omap2430: hwmod: remove stray declaration Patch "OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430" in linux-next as of 20101203 introduced the following build warning - fix this by removing the stray i2c_dev_attr. arch/arm/mach-omap2/omap_hwmod_2430_data.c:483: warning: 'i2c_dev_attr' defined but not used Signed-off-by: Anand Gadiyar Cc: Kevin Hilman Signed-off-by: Tony Lindgren commit 60d24eeda7c7e3b0551f5a349224c7cc721206bd Author: Srikar Date: Mon Dec 20 18:48:16 2010 -0800 Added video data to support tvout on rx51 To support tvout on rx51,added Intilization data, tvout as display device and enabled venc through gpio on rx51 Signed-off-by: Srikar Signed-off-by: Tony Lindgren commit caeeb4aadfbff8d8efbb055594c0459cff94adad Author: Jarkko Nikula Date: Mon Dec 20 18:48:16 2010 -0800 omap: rx51: Add supplies and data for codec b part ofTLV320AIC34 Upcoming ASoC core and tlv320aic3x changes makes possible to take b part of TLV320AIC34 into use on RX51/N900. Prepare to this by adding virtual supplies and platform data for b part of the codec. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 91db7b2985555bd0456ad30440dd615c985fc9c6 Author: Jarkko Nikula Date: Mon Dec 20 18:48:15 2010 -0800 omap: rx51: Remove extra tlv320aic3x.h inclusion Remove second tlv320aic3x.h inclusion that came along the commit f0fba2a "ASoC: multi-component - ASoC Multi-Component Support". Signed-off-by: Jarkko Nikula Cc: Liam Girdwood Signed-off-by: Tony Lindgren commit 5690597fc648c92b94771993a56c7e4f614874bf Author: Aaro Koskinen Date: Mon Dec 20 18:48:15 2010 -0800 arm: mach-omap2: Kconfig: fix incorrect option There is no MFD config option, MFD_SUPPORT should be selected instead. This will prevent build errors when trying out different configurations. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 434c23a7ef48763fd8d4adfb0edebb4237770f9d Author: Aaro Koskinen Date: Mon Dec 20 18:48:15 2010 -0800 arm: mach-omap2: hsmmc_reset: fix clk_get() error handling clk_get() return value should be checked with IS_ERR(). Furthermore, clocks should be put and disabled properly. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit f31cc9622d75c1c6f041d786698daa425c0425c2 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP: DMA: Convert DMA library into platform driver Convert DMA library into DMA platform driver and make use of platform data provided by hwmod data base for OMAP2+ onwards. For OMAP1 processors, the DMA driver in mach-omap uses resource structures for getting platform data. Thanks to Tony Lindgren for fixing various omap1 issues and testing the same on OSK5912 board. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 59de3cf1ce9a961ba9ab657707727db2111e72fa Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP2+: DMA: hwmod: Device registration Prepare OMAP2+ DMA to use hwmod infrastructure so that DMA can register as platform device. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 6568f7c43a72f9631910e26092ef3ecf67cc99eb Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP1: DMA: Implement in platform device model Implement OMAP1 DMA as platform device and add support for registering through platform device layer using resource structures. Signed-off-by: G, Manjunath Kondaiah Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 531ce0d57caf7e49073608873de6976558fd7e4f Author: Benoit Cousson Date: Mon Dec 20 18:27:19 2010 -0800 OMAP4: hwmod data: add system DMA Add OMAP4 DMA hwmod data. In addition to original dma hwmod data, the following changes are added. 1. DMA device attributes structure is introduced for diffenrenciating OMAP cpu's based on DMA features. Signed-off-by: Benoit Cousson Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 01438ab6a49b63ef02b2eb44b63345a09792f982 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:19 2010 -0800 OMAP3: hwmod data: add system DMA Add OMAP3 DMA hwmod data Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 82cbd1aebafd126f40a8ed0725a6feb6ed710576 Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP2430: hwmod data: add system DMA Add OMAP2430 DMA hwmod data and also add required DMA device attributes. Signed-off-by: G, Manjunath Kondaiah Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 745685df95961ebbf0bcafcf28f31217a75070ae Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP2420: hwmod data: add system DMA Add OMAP2420 DMA hwmod data and also add required DMA device attributes. Signed-off-by: G, Manjunath Kondaiah Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit d3c9be2f42223f256d06b2b69ed26afdcb02f64a Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:18 2010 -0800 OMAP: DMA: Introduce errata handling feature Implement errata handling to use flags instead of cpu_is_* and cpu_class_* in the code. The errata flags are initialized at init time and during runtime we are using the errata variable (via the IS_DMA_ERRATA macro) to execute the required errata workaround. Reused errata handling patch from: Peter Ujfalusi https://patchwork.kernel.org/patch/231191/ Changes to above patch: 1. Changes are done for converting all the existing errata work arounds to use this feature. 2. Detailed description for each errata is added. 3. Fixed bug in SET_DMA_ERRATA macro 4. Bit shifting in macro definitions are replaced with BIT() macro Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit a4c537c7f60704691efc5f833b3d440252275c3b Author: G, Manjunath Kondaiah Date: Mon Dec 20 18:27:17 2010 -0800 OMAP: DMA: Replace read/write macros with functions Prepare DMA library to get converted into DMA driver using platform device model and hwmod infrastucture(for omap2+, resource structures for omap1) The low level read/write macros are replaced with static inline functions and register offsets are handled through static register offset tables mapped through enumeration constants. These low level read/write functions along with static register offset tables will be moved to respective mach-omap dma files in the later patches of this series. There are no functionality changes with these changes except change in logic for handling 16bit registers of OMAP1. Signed-off-by: G, Manjunath Kondaiah Tested-by: Kevin Hilman Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit f7bb0d9ab29e3159e22c3bfc843bd37c7d3c91a0 Author: Benoit Cousson Date: Thu Dec 9 14:24:16 2010 +0000 I2C: i2c-omap: Change device name: i2c_omap -> omap_i2c The convention for omap device naming is omap_XXX. Rename the device and driver name in order to stick to this naming convention. Change device name in clock nodes as well. Signed-off-by: Benoit Cousson Cc: Kevin Hilman Cc: Rajendra Nayak Cc: Ben Dooks Acked-by: Paul Walmsley Acked-by: Ben Dooks Signed-off-by: Tony Lindgren commit 05f185c774992f1d9edb646a3ecfdabdc8e358f3 Author: Marek Belisko Date: Mon Dec 6 13:23:48 2010 +0000 omap1: pm_bus: Fix compilation warning Fix following compilation warning: arch/arm/mach-omap1/pm_bus.c: In function 'omap1_pm_runtime_resume': arch/arm/mach-omap1/pm_bus.c:51: warning: unused variable 'ret' Signed-off-by: Marek Belisko Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 16c8a3b0c193dca0826dde77423ec4f7a81ed9f6 Author: Marek Belisko Date: Mon Dec 6 12:49:05 2010 +0000 omap1: htc_herald: Fix compilation warning Patch fix following compilation warning: arch/arm/mach-omap1/board-htcherald.c:442: warning: large integer implicitly truncated to unsigned type Hopefully this is just a typo. Signed-off-by: Marek Belisko Signed-off-by: Tony Lindgren commit 374b8cfd61f33b3c1dd4b0f4c2b1bb20079d3090 Author: Benoit Cousson Date: Thu Dec 9 14:24:17 2010 +0000 omap: serial: Change device name: omap-hsuart -> omap_uart The naming convention for omap_device is omap_XXX. Rename the device and driver name in order to stick to this naming convention. Remove the hs prefix that is implicit for every OMAP uarts. Signed-off-by: Benoit Cousson Acked-by: Govindraj Raja Cc: Paul Walmsley Cc: Kevin Hilman Signed-off-by: Tony Lindgren commit d0eb2f38b250b7d6c993adf81b0e4ded0565497e Author: Dave Chinner Date: Tue Dec 21 12:29:14 2010 +1100 xfs: convert grant head manipulations to lockless algorithm The only thing that the grant lock remains to protect is the grant head manipulations when adding or removing space from the log. These calculations are already based on atomic variables, so we can already update them safely without locks. However, the grant head manpulations require atomic multi-step calculations to be executed, which the algorithms currently don't allow. To make these multi-step calculations atomic, convert the algorithms to compare-and-exchange loops on the atomic variables. That is, we sample the old value, perform the calculation and use atomic64_cmpxchg() to attempt to update the head with the new value. If the head has not changed since we sampled it, it will succeed and we are done. Otherwise, we rerun the calculation again from a new sample of the head. This allows us to remove the grant lock from around all the grant head space manipulations, and that effectively removes the grant lock from the log completely. Hence we can remove the grant lock completely from the log at this point. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 3f16b9850743b702380f098ab5e0308cd6af1792 Author: Dave Chinner Date: Tue Dec 21 12:29:01 2010 +1100 xfs: introduce new locks for the log grant ticket wait queues The log grant ticket wait queues are currently protected by the log grant lock. However, the queues are functionally independent from each other, and operations on them only require serialisation against other queue operations now that all of the other log variables they use are atomic values. Hence, we can make them independent of the grant lock by introducing new locks just to protect the lists operations. because the lists are independent, we can use a lock per list and ensure that reserve and write head queuing do not contend. To ensure forced shutdowns work correctly in conjunction with the new fast paths, ensure that we check whether the log has been shut down in the grant functions once we hold the relevant spin locks but before we go to sleep. This is needed to co-ordinate correctly with the wakeups that are issued on the ticket queues so we don't leave any processes sleeping on the queues during a shutdown. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit d9993be65a77f500ae926176baa264816bfe3816 Merge: c426626 aa3e219 Author: David S. Miller Date: Mon Dec 20 13:24:14 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit c4266263249f22479eb1abb1a1709c38240b1597 Author: Eric Dumazet Date: Wed Dec 15 08:18:36 2010 +0000 net_sched: sch_sfq: add backlog info in sfq_dump_class_stats() We currently return for each active SFQ slot the number of packets in queue. We can also give number of bytes accounted for these packets. tc -s class show dev ifb0 Before patch : class sfq 11:3d9 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 0b 3p requeues 0 allot 1266 After patch : class sfq 11:3e4 parent 11: (dropped 0, overlimits 0 requeues 0) backlog 4380b 3p requeues 0 allot 1212 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit ba119204ff6ff722dcec387b305d9c2d23380726 Merge: cf7d7e5 0c521cc Author: David Brown Date: Mon Dec 20 13:11:10 2010 -0800 Merge branches 'msm-core' and 'msm-mmc' into for-next * msm-core: (28 commits) msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables msm: iommu: Don't flush page tables if no devices attached msm: iommu: Mark functions with the right section names msm: iommu: Support for the 2nd GFX core's IOMMU msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings msm: iommu: Use more consistent naming in platform data msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU ... * msm-mmc: (33 commits) mmc: msm_sdcc: Check for only DATA_END interrupt to end a request mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned mmc: msm_sdcc: Reset SDCC in case of data transfer errors mmc: msm_sdcc: Add prog done interrupt support mmc: msm_sdcc: Fix possible circular locking dependency warning msm: initial framebuffer support msm: add handling for clocks tagged as CLK_MINMAX msm: trout: change name of pmdh_clk to mddi_clk msm: add CLK_MINMAX to pmdh_clk msm: trout: add gpio_to_irq msm: iommu: Use the correct memory allocation flag msm_serial: Remove redundant unlikely() msm: iommu: Miscellaneous code cleanup msm: iommu: Support cache-coherent memory access msm: iommu: Definitions for extended memory attributes msm: iommu: Kconfig dependency for the IOMMU API msm: iommu: Check if device is already attached msm: iommu: Kconfig item for cacheable page tables msm: iommu: Don't flush page tables if no devices attached msm: iommu: Mark functions with the right section names ... commit 0c521ccbd0c9ad5623ff9b37b20b3ff9d4ad65a7 Author: Sahitya Tummala Date: Wed Dec 8 15:03:07 2010 +0530 mmc: msm_sdcc: Check for only DATA_END interrupt to end a request The current code checks for both DATA_END and DATA_BLK_END bits in MCI_STATUS register and ends a request only if both are set at a time. The hardware doesn't always set DATA_BLK_END when DATA_END is set. But DATA_END status itself is sufficient condition from hardware that data transfer is done and hence, check for only DATA_END interrupt in software to end a request. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 71dd9106af54de0f758875fa4b595af42a327448 Author: Sahitya Tummala Date: Wed Dec 8 15:03:06 2010 +0530 mmc: msm_sdcc: Fix bug in PIO mode when data size is not word aligned The current code for PIO doesn't transfer whole data when data size is not in multiple of 4 bytes. The last few bytes are not written to the card resulting in no DATAEND interrupt from SDCC. This patch allows data transfer for non-aligned data size in PIO mode. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit b08bb35d1a5ee5426198eb3a2861008c2e9e6fc4 Author: Sahitya Tummala Date: Wed Dec 8 15:03:05 2010 +0530 mmc: msm_sdcc: Reset SDCC in case of data transfer errors SDCC uses an asynchronous FIFOs for data synchronization (one for TX and one for RX). For any error when DPSM (Data path state machine) is involved the transfer is terminated with the remaining data stuck inside FIFOs. Reset the controller in case of data errors to ensure that any left over data in FIFOs is flushed out and DPSM is in good state. The following problems are observed without this reset functionality - 1. After the card is removed in an unsafe way (removed when there is an on going data transfer), the card will not be detected upon its next insertion. This is because the controller wouldn't respond to few initialization commands. 2. When an error occurs for a data transfer in non-DMA mode, sometimes we get spurious PIO interrupt after the request is processed. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit d5137bdd91b8267ada3973806443013f4bf079f6 Author: Sahitya Tummala Date: Wed Dec 8 15:03:04 2010 +0530 mmc: msm_sdcc: Add prog done interrupt support Enable prog done interrupt for stop command(CMD12) that is sent after a multi-block write(CMD25). The PROG_DONE bit is set when the card has finished its programming and is ready for next data. After every write request the card will be polled for ready status using CMD13. For a multi-block write(CMD25) before sending CMD13, stop command (CMD12) will be sent. If we enable prog done interrupt for CMD12, then CMD13 polling can be avoided. The prog done interrupt means that the card is done with its programming and is ready for next request. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 62612cf9d97068dc75b48a7a3044ee907a3283ec Author: Sahitya Tummala Date: Wed Dec 8 15:03:03 2010 +0530 mmc: msm_sdcc: Fix possible circular locking dependency warning In the context of request processing thread, data mover lock is acquired after the host lock. In another context, in the completion handler of data mover the locks are acquired in the reverse order, resulting in possible circular lock dependency warning. Hence, schedule a tasklet to process the dma completion so as to avoid nested locks. Signed-off-by: Sahitya Tummala Signed-off-by: David Brown commit 147dc38e976f4dd6d888d585649e724a3e82a9b2 Author: Ben Skeggs Date: Thu Dec 16 13:32:36 2010 +1000 drm/nv50: add missing license header to nv50_fbcon.c Signed-off-by: Ben Skeggs commit 910d1b3a8cec4fef20f11eb39e9ec6ac6e964b0e Author: Ben Skeggs Date: Tue Dec 21 11:15:44 2010 +1000 drm/nv50: fix smatch warning in nv50_vram.c Reported-by: Dan Carpenter Signed-off-by: Ben Skeggs commit d095e23206e6291cbde4b2937d1316a42d9e6440 Author: Dan Carpenter Date: Mon Dec 20 12:26:26 2010 +0300 drm/nouveau: sizeof() vs ARRAY_SIZE() ARRAY_SIZE() was intended here, sizeof() is too large. Signed-off-by: Dan Carpenter Signed-off-by: Ben Skeggs commit 3d986b25b5faa50ba6afd94f60f270b6c3061e5e Author: John W. Linville Date: Thu Dec 16 14:59:49 2010 -0500 rtlwifi: use alloc_workqueue create_workqueue is deprecated. The workqueue usage does not seem to demand any special treatment, so do not set any flags either. Signed-off-by: John W. Linville Tested-by: Larry Finger Acked-by: Tejun Heo commit d4d5dc3d6f86cc70f08e45b840f3e681588d2718 Author: Felix Fietkau Date: Sun Dec 19 00:31:55 2010 +0100 ath9k: do not limit the chainmask to 1 for legacy mode Restricting the chainmask to 1 for legacy mode disables useful features such as MRC, and it reduces the available transmit power. I can't think of a good reason to do this in legacy mode, so let's just get rid of that code. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f1a8abb0459e96765bd1d300f434256d8dfac73d Author: Felix Fietkau Date: Sun Dec 19 00:31:54 2010 +0100 ath9k_hw: fix PA predistortion HT40 mask The commit 'ath9k_hw: Disable PAPRD for rates with low Tx power' changed the code that sets the PAPRD rate masks to use only either the HT20 mask or the HT40 mask. This is wrong, as the hardware can still use HT20 rates even when configured for HT40, and the operating channel mode does not affect PAPRD operation. The register for the HT40 rate mask is applied as a mask on top of the other registers to selectively disable PAPRD for specific rates on HT40 packets only. This patch changes the code back to the old behavior which matches the intended use of these registers. While with current cards this should not make any practical difference (according to Atheros, the HT20 and HT40 mask should always be equal), it is more correct that way, and maybe the HT40 mask will be used for some rare corner cases in the future. Cc: Vasanthakumar Thiagarajan Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f8a0a781488ec7288d1049e5d2022850aa98f7b6 Author: Felix Fietkau Date: Sat Dec 18 19:30:50 2010 +0100 mac80211: fix potentially redundant skb data copying When an skb is shared, it needs to be duplicated, along with its data buffer. If the skb does not have enough headroom, using skb_copy might cause the data buffer to be copied twice (once by skb_copy and once by pskb_expand_head). Fix this by using skb_clone initially and letting ieee80211_skb_resize sort out the rest. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4cd06a344db752f513437138953af191cbe9a691 Author: Felix Fietkau Date: Sat Dec 18 19:30:49 2010 +0100 mac80211: skip unnecessary pskb_expand_head calls If the skb is not cloned and we don't need any extra headroom, there is no point in reallocating the skb head. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 489ee9195a7de9e6bc833d639ff6b553ffdad90e Author: Felix Fietkau Date: Sat Dec 18 19:30:48 2010 +0100 mac80211: fix initialization of skb->cb in ieee80211_subif_start_xmit The change 'mac80211: Fix BUG in pskb_expand_head when transmitting shared skbs' added a check for copying the skb if it's shared, however the tx info variable still points at the cb of the old skb Signed-off-by: Felix Fietkau Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit ae29fbb189c7a80677500c718c9ce08095ccde01 Author: Dan Carpenter Date: Sat Dec 18 11:52:10 2010 +0300 wl1251: wl12xx_get_platform_data() returns an ERR_PTR wl12xx_get_platform_data() returns an ERR_PTR on failure and it never returns a NULL. Signed-off-by: Dan Carpenter Acked-by: Kalle Valo Signed-off-by: John W. Linville commit d704300fa546a613ec3821b908528b20685cb92a Author: Larry Finger Date: Fri Dec 17 19:36:25 2010 -0600 rtlwifi: Fix use of mutex in interrupt code A previous conversion from semaphoreto mutexes missed the fact that one of the semaphores was used in interrupt code. Fixed by changing to a spinlock. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f0b3e4b7307f02a203029441b0473a84aebc6435 Author: Larry Finger Date: Fri Dec 17 16:04:11 2010 -0600 MAINTAINERS: Fix typo in rtl8192ce entry Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit b1c1d0003d6d07c3b269340b8ac3fd2b42fd5ebe Author: Mohammed Shafi Shajakhan Date: Fri Dec 17 20:44:36 2010 +0530 ath9k: Properly initialize channel table for 2GHz ath9k channel table for 2Ghz does not seems to initialize the 'band' parameter.Though it does not seems to cause any visible issue it looks odd when we initialize the 'band' parameter for 5Ghz channel table while not so for 2Ghz. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 18db45c46eae31cee7cfdfd7e671b0201dcdbcd8 Author: Anisse Astier Date: Fri Dec 17 11:45:01 2010 +0100 rtl8192ce: Fix typo in Kconfig description Signed-off-by: Anisse Astier Signed-off-by: John W. Linville commit 55821324dc6a10fab36871534a322bad159fad79 Author: Felix Fietkau Date: Fri Dec 17 00:57:01 2010 +0100 ath9k_hw: remove baseband rfsilent support When rfkill is enabled, ath9k_hw unnecessarily configured the baseband to turn off based on GPIO input, however that code was hardcoded to GPIO 0 instead of ah->rfkill_gpio. Since ath9k uses software rfkill anyway, this code is completely unnecessary and should be removed in case anything else ever uses GPIO 0. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4b3ba66a47311770b21e7aba481f4f2a90ba3084 Author: Felix Fietkau Date: Fri Dec 17 00:57:00 2010 +0100 ath9k: fix queue depth check for forming new aggregates To improve aggregation length, there should not be more than two fully formed A-MPDU frames in the hardware queue. To ensure this, the code checks the tx queue length before forming new A-MPDUs. This can reduce the throughput (or maybe even starve out A-MPDU traffic) when too many non-aggregated frames are in the queue. Fix this by keeping track of pending A-MPDU frames (even when they're sent out as single frames), but exclude rate control probing frames to improve performance. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5c405b5c3e435fd332058c59ee58eaa1ac9c513a Author: John W. Linville Date: Thu Dec 16 15:43:36 2010 -0500 rtl8192ce: drop 'rtl8192c-' prefix from files Signed-off-by: John W. Linville Tested-by: Larry Finger commit 61ad5394590c5c5338ab4ec50553d809a9996d50 Author: Javier Cardona Date: Thu Dec 16 17:23:34 2010 -0800 mac80211: Remove unused third address from mesh address extension header. The Mesh Control header only includes 0, 1 or 2 addresses. If there is one address, it should be interpreted as Address 4. If there are 2, they are interpreted as Addresses 5 and 6 (Address 4 being the 4th address in the 802.11 header). The address extension used to hold up to 3 addresses instead of the current 2. I'm not sure which draft version changed this, but it is very unlikely that it will change again given the state of the approval process of this draft. See section 7.1.3.6.3 in current draft (8.0). Also, note that the extra address that I'm removing was not being used, so this change has no effect on over-the-air frame formats. But I thought I better remove it before someone does start using it. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 3de135dba9341a3d10a7a5b9533ce11cb77d4f4d Author: Bruno Randolf Date: Thu Dec 16 11:30:33 2010 +0900 ath5k: Set available antenna information for cfg80211 Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 39fd5de4472b7b222c6cec78d72b069133f694e4 Author: Bruno Randolf Date: Thu Dec 16 11:30:28 2010 +0900 nl80211: Export available antennas Export the information which antennas are available for configuration as TX or RX antennas via nl80211. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 7f531e03abf0162df3966c4fa5fa6fdd9302cb6b Author: Bruno Randolf Date: Thu Dec 16 11:30:22 2010 +0900 cfg80211: Separate available antennas for RX and TX As has been pointed out by Daniel Halperin some devices (e.g. Intel IWL5100) can only TX from a subset of RX antennas, so use separate availability masks for RX and TX. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c7108a7111cd9e592d6ad498be37276dbea75d2b Author: Javier Cardona Date: Thu Dec 16 17:37:50 2010 -0800 mac80211: Send mesh non-HWMP path selection frames to userspace Let path selection frames for protocols other than HWMP be sent to userspace via NL80211_CMD_REGISTER_FRAME. Also allow userspace to send and receive mesh path selection frames. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit c80d545da3f7c0e534ccd4a780f322f80a92cff1 Author: Javier Cardona Date: Thu Dec 16 17:37:49 2010 -0800 mac80211: Let userspace enable and configure vendor specific path selection. Userspace will now be allowed to toggle between the default path selection algorithm (HWMP, implemented in the kernel), and a vendor specific alternative. Also in the same patch, allow userspace to add information elements to mesh beacons. This is accordance with the Extensible Path Selection Framework specified in version 7.0 of the 802.11s draft. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit 24bdd9f4c9af75b33b438d60381a67626de0128d Author: Javier Cardona Date: Thu Dec 16 17:37:48 2010 -0800 mac80211: Rename mesh_params to mesh_config to prepare for mesh_setup Mesh parameters can be to setup a mesh or to configure it. This patch renames the ambiguous name mesh_params to mesh_config in preparation for mesh_setup. Signed-off-by: Javier Cardona Signed-off-by: John W. Linville commit f955e1415f381c7fa6ebe8630cd1fe5a694e8f4a Author: Dan Carpenter Date: Mon Dec 20 03:03:15 2010 +0000 vmxnet3: locking problems in xmit There were several paths that didn't release their locks. Signed-off-by: Dan Carpenter Signed-off-by: Bhavesh Davda Signed-off-by: David S. Miller commit 6561a3b12d62ed5317e6ac32182d87a03f62c8dc Author: David S. Miller Date: Sun Dec 19 21:11:20 2010 -0800 ipv4: Flush per-ns routing cache more sanely. Flush the routing cache only of entries that match the network namespace in which the purge event occurred. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit 782615aea84e57dc7f2f922cea823df3de635a78 Author: Breno Leitao Date: Mon Dec 20 10:35:25 2010 -0800 ehea: Fixing some message level Currently there are some info message that is set as error, and an error message that is set as debug. This patch just fixes it. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit c8efcc2589464ac70255bb83e10cad61c7c6d295 Author: Tejun Heo Date: Mon Dec 20 19:32:04 2010 +0100 workqueue: allow chained queueing during destruction Currently, destroy_workqueue() makes the workqueue deny all new queueing by setting WQ_DYING and flushes the workqueue once before proceeding with destruction; however, there are cases where work items queue more related work items. Currently, such users need to explicitly flush the workqueue multiple times depending on the possible depth of such chained queueing. This patch updates the queueing path such that a work item can queue further work items on the same workqueue even when WQ_DYING is set. The flush on destruction is automatically retried until the workqueue is empty. This guarantees that the workqueue is empty on destruction while allowing chained queueing. The flush retry logic whines if it takes too many retries to drain the workqueue. Signed-off-by: Tejun Heo Cc: James Bottomley commit 53320fe3bb1b1eef1aaff8dd47aae530ebeeb1e5 Author: Sven Eckelmann Date: Mon Dec 20 10:32:03 2010 -0800 batman-adv: Return hna count on local buffer fill hna_local_fill_buffer must return the number of added hna entries and not the last checked hash bucket. Signed-off-by: Sven Eckelmann Signed-off-by: David S. Miller commit 58231186c4532821cb815a3a3248ca02ce5f6f0d Author: Joe Perches Date: Mon Dec 20 10:30:06 2010 -0800 pktgen: Remove unnecessary prefix from pr_ Remove "pktgen: " prefix string from one pr_info. pr_fmt adds it, so this is a duplicate. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit faabfa0816916b0a7cfc93f6a9be382830658c80 Author: Russell King Date: Mon Dec 20 16:58:19 2010 +0000 ARM: SMP: ensure frame pointer is reinitialized for soft-CPU hotplug When we soft-CPU hotplug a CPU, we reset the stack pointer and jump back to start_secondary(). This allows us to restart as if the CPU was actually reset. However, we weren't resetting the frame pointer, which could cause problems with backtracing. Reset the frame pointer to zero (which means no parent frame) just like the early assembly code also does. Signed-off-by: Russell King commit 1d3f33d541312acd34bd2fa780396d111a0f73b1 Author: Shawn Guo Date: Mon Dec 13 20:55:03 2010 +0800 ARM: mxs: Add build configuration for mxs Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 4afbbb7c1b20dc10513c522849735a3293243af8 Author: Shawn Guo Date: Sat Dec 18 21:39:35 2010 +0800 ARM: mxs: Add initial mx28evk support Add initial mx28evk support with duart and fec0. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 55cf4183d371e00cf4a2fc4fb9a25ae3d806ff87 Author: Shawn Guo Date: Mon Dec 20 22:57:44 2010 +0800 ARM: mxs: Add initial mx23evk support Add initial mx23evk support with duart. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit b9a2ada8ff2ace20b1518a18872319d8619fe1ab Author: Shawn Guo Date: Thu Dec 9 23:12:47 2010 +0800 ARM: mxs: Dynamically allocate fec devices Dynamically allocate fec devices for MX28, which gets dual fec interface. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit dc38ad4052a50b9e73fdcc970ecdd4f69ee9d97a Author: Shawn Guo Date: Thu Dec 9 23:12:46 2010 +0800 ARM: mxs: Dynamically allocate duart devices Dynamically allocate duart devices for MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit faff3dc947738ce7c905a4a2936a089d3fa9ddda Author: Shawn Guo Date: Thu Dec 9 23:12:45 2010 +0800 ARM: mxs: Add static memory mapping Create static memory mapping for MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 30a7585ff7464ceb1dceb941700654923becb769 Author: Shawn Guo Date: Sat Dec 18 21:39:33 2010 +0800 ARM: mxs: Add clock support Add clock for MXS-based SoCs, MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit bf985969e27b507f734435a99df8bf745a3dbb2b Author: Shawn Guo Date: Mon Dec 20 22:57:43 2010 +0800 ARM: mxs: Add iomux support MXS-based SoCs implements iomux functions in block PINCTRL. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit fba311fcf0987396f2760553fbe01ab61ec67139 Author: Shawn Guo Date: Sat Dec 18 21:39:31 2010 +0800 ARM: mxs: Add gpio support MXS-based SoCs implement gpio support in block PINCTRL. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 4e472096fa4ef751e7ea90e304d971843a1e350d Author: Shawn Guo Date: Sat Dec 18 21:39:30 2010 +0800 ARM: mxs: Add timer support There are 2 versions of the timrot on Freescale MXS-based SoCs. The v1 on MX23 only gets 16 bits counter, while v2 on MX28 extends the counter to 32 bits. The implementation uses two timers, one for clock_event and another for clocksource. MX28 uses timrot 0 and 1, while MX23 uses 0 and 2. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 41fa75bc09d31c47d6606233b60f595524c28cd4 Author: Shawn Guo Date: Mon Dec 20 22:57:42 2010 +0800 ARM: mxs: Add low-level debug UART support - DEBUG_LL support, which is incompatible with multi-soc MXS image because of different DUART base address on MX23 and MX28 - uncompress message support Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 623eb15647fc35c5a8cd38985d5958240eb072c1 Author: Alexey Charkov Date: Mon Dec 20 16:09:57 2010 +0300 fbdev: Modify vsync timing calculation in wm8505fb This removes the '+1' in vsync timing calculation for wm8505fb to directly use values provided from the board setup code. Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit a7f53284e97af9670a68993c31f61a4e62a19ea5 Author: Alexey Charkov Date: Mon Dec 20 16:03:14 2010 +0300 fbdev: Minor cleanup in WM8505-related code This replaces the last remaining driver name reference with the macro for uniformity in wm8505fb. In addition, the error return path in wmt_ge_rops.c is made more uniform by getting rid of goto's in remaining places. Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit 521bc83b0fcda6f323f1de0e7bf137401a8145a2 Author: Andres Salomon Date: Fri Dec 17 19:00:13 2010 -0800 s1d13xxxfb: drop unused code Silence warnings such as - drivers/video/s1d13xxxfb.c:421: warning: ‘bltbit_wait_bitset’ defined but not used Just drop the unused code. Signed-off-by: Andres Salomon Signed-off-by: Paul Mundt commit 4959212c18669f254daa0ae796ad676b67939ba2 Author: Jingoo Han Date: Fri Dec 17 16:45:46 2010 +0900 s3c-fb: add support for runtime pm This patch adds support for runtime pm using the functions. - pm_runtime_get_sync() - pm_runtime_put_sync() pm_runtime_get_sync() and pm_runtime_put_sync() are called when open or release function of framebufer driver is called to inform the system if hardware is idle or not. Signed-off-by: Jingoo Han Signed-off-by: Paul Mundt commit 55f88eccf9c288eed2f93f9ca7d7fe4dd2da762e Author: Asbjoern Sloth Toennesen Date: Sun Dec 12 17:39:40 2010 +0000 kbuild, deb-pkg: support overriding userland architecture Usefull if building for sparc64 userland, because the sparc and sparc64 userlands use the same 64-bit kernel, making it impossible to always select the correct userland architecture for the resulting debian package. Might also be usefull, if you want a i386 userland with a amd64 kernel. Example usage: make KBUILD_DEBARCH=i386 deb-pkg LKML-reference: Signed-off-by: Asbjoern Sloth Toennesen Reviewed-by: WANG Cong Acked-by: maximilian attems Signed-off-by: Michal Marek commit 8bcee1832d23869c2cdb6886ae5210b0143256f0 Merge: 5ce2a2d 1cf215a Author: Paul Mundt Date: Tue Dec 21 00:40:51 2010 +0900 Merge branch 'rmobile/urgent' into rmobile-latest Conflicts: arch/arm/mach-shmobile/include/mach/entry-macro.S Signed-off-by: Paul Mundt commit 5ce2a2ddb5d75d5e2371e58011fc21351bf278cb Author: Magnus Damm Date: Mon Dec 20 11:00:19 2010 +0000 ARM: mach-shmobile: Bump up NR_IRQS to 1024 Increase NR_IRQS from 512 to 1024 on SH-Mobile ARM. Needed to support vectors in the sh73a0 INTCS block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6155f77d09b968f591876f368d4843168910449e Author: Magnus Damm Date: Mon Dec 20 11:04:50 2010 +0000 ARM: mach-shmobile: Clean up headsmp.S Use PAGE_OFFSET and PHYS_OFFSET for secondary_startup entry point as recommended by Russell King. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 56e78dafc4137f86abf6f5f07282afa39ead4056 Author: Yusuke Goda Date: Mon Dec 20 01:06:04 2010 +0000 ARM: mach-shmobile: mackerel: Add GPS support Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 59bdd133561a432c4655146e283caf85fa64c2fb Author: Marek Vasut Date: Tue Oct 19 17:06:49 2010 +0200 ARM: pxa: Add Balloon3 NAND ready check Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 1b9169d8a0fe2b41fbbb8d152c8108190865f3cf Author: Marek Vasut Date: Tue Oct 19 16:19:32 2010 +0200 ARM: pxa: Update Balloon3 for new FPGA firmware The new FPGA firmware in Balloon3 uses different methods to control it's bus control lines. In the new version, there are separate registers to set/clear bus control lines. This patch updates affected places. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit e60f137b715b0a19b84502c23a09c5af9107399d Author: Marek Vasut Date: Tue Oct 19 16:17:24 2010 +0200 ARM: pxa: Fix number of IRQs on Balloon3 Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 03b505eae6a276b8c38b6222694afb6cea10b1cc Author: Russell King Date: Mon Dec 20 14:44:32 2010 +0000 ARM: SMP: split out software TLB maintainence broadcasting smp.c is becoming too large, so split out the TLB maintainence broadcasting into a separate smp_tlb.c file. Signed-off-by: Russell King commit 10034aabca9032246762daaca3152f3e79380ea0 Author: Russell King Date: Mon Dec 20 14:28:02 2010 +0000 ARM: localtimer: clean up local timer on hot unplug When a CPU is hot unplugged, the generic tick code cleans up the clock event device, but fails to call down to the device's set_mode function to actually shut the device down. To work around this, we've historically had a local_timer_stop() callback out of the hotplug code. However, this adds needless complexity when we have the clock event device itself available. Explicitly call the clock event device's set_mode function with CLOCK_EVT_MODE_UNUSED, so that the hardware can be cleanly shutdown without any special external callbacks. When/if the generic code is fixed, percpu_timer_stop() can be killed off. Signed-off-by: Russell King commit e3d9c625f5e4158014e041f492b46e38ad10987e Author: Russell King Date: Sun Dec 19 11:36:33 2010 +0000 ARM: CPU hotplug: fix hard-coded control register constants Use the definition we've provided in asm/system.h rather than numeric constants. Signed-off-by: Russell King commit e9882777d992b76e0b80deadd66ad886c25f5d1f Author: Russell King Date: Sun Dec 19 11:33:12 2010 +0000 ARM: CPU hotplug: add Versatile Express hotplug CPU support Signed-off-by: Russell King commit d4450261e546953c4a1ce8b48e29164a57c6ed33 Author: Russell King Date: Sun Dec 19 11:30:43 2010 +0000 ARM: CPU hotplug: fix reporting of spurious wakeups The original scheme for reporting spurious wakeups was broken - it tried to use printk() from a context which wasn't coherent with the other CPUs, which risks corrupting the printk() data. Fix this by noting the number spurious wakeups, and only report them when we are properly woken - when we will be coherent with the rest of the system. Signed-off-by: Russell King commit 58613cd1d4f8c2d5f25b6c57ad7fbed80e75a67b Author: Russell King Date: Sat Dec 18 12:34:39 2010 +0000 ARM: smp: improve CPU bringup failure diagnostics We used to print a bland error message which gave no clue as to the failure when we failed to bring up a secondary CPU. Resolve this by separating the two failure cases. If boot_secondary() fails, we print a message indicating the returned error code from boot_secondary(): "CPU%u: failed to boot: %d\n", cpu, ret. However, if boot_secondary() succeeded, but the CPU did not appear to mark itself online within the timeout, indicate that it failed to come online: "CPU%u: failed to come online\n", cpu Signed-off-by: Russell King commit 90b44199e83ec780d6def11a602d825dc68438e3 Author: Russell King Date: Sat Dec 18 10:59:49 2010 +0000 ARM: VFP: re-initialize VFP coprocessor access enables on CPU hotplug We can not guarantee that VFP will be enabled when CPU hotplug brings a CPU back online from a reset state. Add a hotplug CPU notifier to ensure that the VFP coprocessor access is enabled whenever a CPU comes back online. Signed-off-by: Russell King commit 3705ff6da538aff6dba535e2e9cbcbb9456d0d53 Author: Russell King Date: Sat Dec 18 10:53:12 2010 +0000 ARM: Fix subtle race in CPU pen_release hotplug code There is a subtle race in the CPU hotplug code, where a CPU which has been offlined can online itself before being requested, which results in things going astray on the next online/offline cycle. What happens in the normal online/offline/online cycle is: CPU0 CPU3 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 ... requests CPU3 offline ... ... dies ... checks pen_release, reads -1 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 However, as the write of -1 of pen_release is not fully flushed back to memory, and the checking of pen_release is done with caches disabled, this allows CPU3 the opportunity to read the old value of pen_release: CPU0 CPU3 requests boot of CPU3 pen_release = 3 flush cache line checks pen_release, reads 3 starts boot pen_release = -1 ... requests CPU3 offline ... ... dies ... checks pen_release, reads 3 starts boot pen_release = -1 requests boot of CPU3 pen_release = 3 flush cache line Fix this by grouping the write of pen_release along with its cache line flushing code to ensure that any update to pen_release is always pushed out to physical memory. Signed-off-by: Russell King commit ed3768a8d9dc2d345d4f27eb44ee1e4825056c08 Author: Dave Martin Date: Wed Dec 1 15:39:23 2010 +0100 ARM: 6516/1: Allow SMP_ON_UP to work with Thumb-2 kernels. * __fixup_smp_on_up has been modified with support for the THUMB2_KERNEL case. For THUMB2_KERNEL only, fixups are split into halfwords in case of misalignment, since we can't rely on unaligned accesses working before turning the MMU on. No attempt is made to optimise the aligned case, since the number of fixups is typically small, and it seems best to keep the code as simple as possible. * Add a rotate in the fixup_smp code in order to support CPU_BIG_ENDIAN, as suggested by Nicolas Pitre. * Add an assembly-time sanity-check to ALT_UP() to ensure that the content really is the right size (4 bytes). (No check is done for ALT_SMP(). Possibly, this could be fixed by splitting the two uses ot ALT_SMP() (ALT_SMP...SMP_UP versus ALT_SMP...SMP_UP_B) into two macros. In the first case, ALT_SMP needs to expand to >= 4 bytes, not == 4.) * smp_mpidr.h (which implements ALT_SMP()/ALT_UP() manually due to macro limitations) has not been modified: the affected instruction (mov) has no 16-bit encoding, so the correct instruction size is satisfied in this case. * A "mode" parameter has been added to smp_dmb: smp_dmb arm @ assumes 4-byte instructions (for ARM code, e.g. kuser) smp_dmb @ uses W() to ensure 4-byte instructions for ALT_SMP() This avoids assembly failures due to use of W() inside smp_dmb, when assembling pure-ARM code in the vectors page. There might be a better way to achieve this. * Kconfig: make SMP_ON_UP depend on (!THUMB2_KERNEL || !BIG_ENDIAN) i.e., THUMB2_KERNEL is now supported, but only if !BIG_ENDIAN (The fixup code for Thumb-2 currently assumes little-endian order.) Tested using a single generic realview kernel on: ARM RealView PB-A8 (CONFIG_THUMB2_KERNEL={n,y}) ARM RealView PBX-A9 (SMP) Signed-off-by: Dave Martin Acked-by: Nicolas Pitre Signed-off-by: Russell King commit 86e62b93368cffca9111996e3ed9e5b7bf6f0af3 Author: Russell King Date: Tue Nov 30 18:24:57 2010 +0000 ARM: SMP: remove smp_mpidr.h With "ARM: CPU hotplug: remove bug checks in platform_cpu_die()", we now do not use hard_smp_processor_id(), we no longer need to read the hardware processor ID. Remove the include providing this function. Signed-off-by: Russell King commit f36d340122ae8744e64af0a92a6f77b97542c0a4 Author: Russell King Date: Tue Nov 30 12:21:30 2010 +0000 ARM: CPU hotplug: ensure correct ordering of unplug Don't call idle_task_exit() with interrupts disabled, and ensure that we have a memory barrier after interrupts are disabled but before signalling that this CPU has shut down. Signed-off-by: Russell King commit bbc81fd4327f9ed4480b05981e38acd48b1d184a Author: Russell King Date: Tue Nov 30 11:12:30 2010 +0000 ARM: CPU hotplug: remove bug checks in platform_cpu_die() platform_cpu_die() is entered from the CPU's own idle thread, which can not be migrated to other CPUs. Moreover, the 'cpu' argument comes from the thread info, which will always be the 'current' CPU. So remove this useless bug check. Signed-off-by: Russell King commit 3c030beabf937b1d3b4ecaedfd1fb2f1e2aa0c70 Author: Russell King Date: Tue Nov 30 11:07:35 2010 +0000 ARM: CPU hotplug: move cpu_killed completion to core code We always need to wait for the dying CPU to reach a safe state before taking it down, irrespective of the requirements of the platform. Move the completion code into the ARM SMP hotplug code rather than having each platform re-implement this. Signed-off-by: Russell King commit 2c0136dba4e43b0916ccc9ecc7f11e6d6b73f046 Author: Russell King Date: Fri Dec 3 15:00:49 2010 +0000 ARM: SMP: consolidate trace_hardirqs_off() into common SMP code All platforms call trace_hardirqs_off() in their secondary startup code, so move this into the core SMP code - it doesn't need to be in the per-platform code. Signed-off-by: Russell King commit 05c74a6cbcfb416286a947668ba32f63d99fe74a Author: Russell King Date: Fri Dec 3 11:09:48 2010 +0000 ARM: SMP: consolidate the common parts of smp_prepare_cpus() There is a certain amount of smp_prepare_cpus() which doesn't belong in the platform support code - that is, code which is invariant to the SMP implementation. Move this code into arch/arm/kernel/smp.c, and add a platform_ prefix to the original function. Signed-off-by: Russell King commit aec66ba1f75c2030cf66f5a21d1c81aa83aa5d95 Author: Russell King Date: Thu Dec 2 19:10:01 2010 +0000 ARM: SMP: get rid of references to poke_milo and Milo Milo is an old boot loader, which is no longer relevant for these platforms. References to it are misleading. Move the code out of poke_milo(), and remove references to milo in comments. Signed-off-by: Russell King commit fd778f0ad7dda1108281410ddca0d07936256d3c Author: Russell King Date: Thu Dec 2 18:09:37 2010 +0000 ARM: SMP: get rid of get_core_count() We don't need this small function as well as scu_get_core_count() Signed-off-by: Russell King commit 8975b6c0fdd57e061f4d1040163778ceaf340ad8 Author: Russell King Date: Fri Dec 3 19:29:53 2010 +0000 ARM: SMP: Clean up ncores sanity checks scu_get_core_count() never returns zero cores, so we don't need to check and correct if ncores is zero. Tegra was missing the check against NR_CPUS, leading to a potential bitfield overflow if this becomes the case. Signed-off-by: Russell King commit bbc3d14e9aca023bb98e580aa1c9350af8effdb1 Author: Russell King Date: Fri Dec 3 10:42:58 2010 +0000 ARM: SMP: move CPU number sanity checks to smp_init_cpus() Ensure that the number of CPUs is sanity checked before setting the number of possible CPUs. This avoids any chance of overflowing the cpu_possible bitmap. Signed-off-by: Russell King commit 28e18293cf0f8d23a0950d7b1d2212d11af494dc Author: Russell King Date: Thu Dec 2 09:53:54 2010 +0000 ARM: SMP: ensure smp_send_stop() waits for CPUs to stop Wait for CPUs to indicate that they've stopped, after sending the stop IPI, rather than blindly continuing on and hoping that they've stopped in time. Print a warning if we fail to stop the other CPUs. Signed-off-by: Russell King commit 0eb0511d176534674600a1986c3c766756288908 Author: Russell King Date: Mon Nov 22 12:06:28 2010 +0000 ARM: SMP: use more sane register allocation for __fixup_smp_on_up Use r0,r3-r6 rather than r0,r3,r4,r6,r7, which makes it easier to understand which registers can be modified. Also document which registers hold values which must be preserved. Signed-off-by: Russell King commit b54992fe1b4bad7b7488d58b8696e4e8974fdab0 Author: Russell King Date: Mon Nov 15 14:46:46 2010 +0000 ARM: SMP: collect IPI and local timer IRQs for /proc/stat The IPI and local timer interrupts weren't being properly accounted for in /proc/stat. Collect them from the irq_stat structure, and return their sum. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 4a88abd7b48e8ec8084b1252d0f5ebdab43c2508 Author: Russell King Date: Mon Nov 15 14:40:29 2010 +0000 ARM: SMP: provide individual IPI interrupt statistics This separates out the individual IPI interrupt counts from the total IPI count, which allows better visibility of what IPIs are being used for. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 3534cccd26afdfd3ce0915a4942afca185f2a39b Author: Bjorn Forsman Date: Wed Nov 3 00:46:04 2010 +0100 ARM: pxa/colibri: setup pins for USB host port 3 Tested on a Colibri Evaluation Board Rev.2.1 with a Colibri PXA310 module. Signed-off-by: Bjorn Forsman Signed-off-by: Marek Vasut commit e97d0fac8492dd6566f71f9c81ed453c2105f459 Author: Mark F. Brown Date: Mon Dec 13 22:56:59 2010 -0500 ARM: mmp: refactored 5V regulator support using fixed-regulator Signed-off-by: Mark F. Brown Reviewed-by: Mark Brown Signed-off-by: Eric Miao commit a8fb0b55314144a37755729d3b40b027b0020e3c Author: Eric Miao Date: Sat Dec 18 21:57:07 2010 +0800 ARM: mmp: correct the naming of GPIOxx_GPIO definitions Signed-off-by: Eric Miao commit 5fe2acce127638ccf1123e8a079ca12e8db5b7c1 Author: Marek Vasut Date: Mon Aug 9 06:13:06 2010 +0200 ARM: pxa: Add gpio-leds and vibrator support to PalmTC Signed-off-by: Marek Vasut Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4c6a832d2841a3bacc3327380dfc0660c22a71fb Author: Marek Vasut Date: Mon Aug 9 05:01:45 2010 +0200 ARM: pxa: Modularize Palm Tungsten|C Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit fd62999bad9fc3b176ef6bc9d2a71be940efd908 Author: Marek Vasut Date: Wed Aug 11 05:04:53 2010 +0200 ARM: pxa: Colibri PXA320 PCMCIA driver Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit c085052bc52d7caaca1172aabbedc06777253961 Author: Eric Miao Date: Mon Nov 29 22:56:00 2010 +0800 ARM: pxa: add clock for static memory controller Signed-off-by: Eric Miao commit a3172e5413a06af772c6ad34c0f68a2ebbdbcf86 Author: Marek Vasut Date: Thu Aug 12 01:45:05 2010 +0200 ARM: pxa: Rename Colibri evalboard Rename colibri-pxa270-evalboard to colibri-evalboard as this board is used with all Colibri modules. Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 072e1ae73c65496355279505de378b33c916e364 Author: Marek Vasut Date: Thu Aug 12 01:30:39 2010 +0200 ARM: pxa: Add M41T00 RTC support into Colibri evalboard Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 9b6956f45132f9bf696e9f6c2e457bdfa8e08721 Author: Marek Vasut Date: Thu Aug 12 01:18:38 2010 +0200 ARM: pxa: Push Colibri evalboard MFP into module files This change -- pushing the MFP configuration back into Module files -- is necessary because some evalboards can be used with multiple modules, where MFP differs from module to module. Therefore MFP isn't board-specific, but module-specific and the module should preconfigure itself for the board. (And there is also the C preprocesor limitation and conflicting #define-s) Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit 960c0acaabf603e39b121ae5c0580aaca6f8aa7b Author: Marek Vasut Date: Wed Aug 11 03:32:53 2010 +0200 ARM: pxa: Toradex Colibri PXA270 CF support This driver also contains structures to eventually support PXA320. This is planned to be added in a later patch. Signed-off-by: Marek Vasut Acked-by: Daniel Mack Signed-off-by: Eric Miao commit a4257af5b0c5479bb81597579841e9daaeccd7f6 Author: Marek Vasut Date: Wed Nov 3 16:26:42 2010 +0100 ARM: pxa: Add pxa320 PCMCIA check On PXA320, there's only one PCMCIA slot available. Check for cases where the user would want to register multiple. Also, rework failpath. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit ef6c84454f8567d4968c210d7d194fb711ed3739 Author: Haojian Zhuang Date: Wed Nov 24 11:54:25 2010 +0800 ARM: pxa: add iwmmx support for PJ4 iwmmxt is used in XScale, XScale3, Mohawk and PJ4 core. But the instructions of accessing CP0 and CP1 is changed in PJ4. Append more files to support iwmmxt in PJ4 core. Signed-off-by: Zhou Zhu Signed-off-by: Haojian Zhuang Acked-by: Nicolas Pitre Signed-off-by: Eric Miao commit f13cd4170ee789f63b3c9585c1ae34e028bd549d Author: Russell King Date: Mon Nov 15 14:33:51 2010 +0000 ARM: fix /proc/interrupts formatting As per x86, align the initial column according to how many IRQs we have. Also, provide an english explaination for the 'LOC:' and 'IPI:' lines. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit cab8c6f3053c1b147bba825844c8e208f8b3b9f4 Author: Russell King Date: Mon Nov 15 14:20:41 2010 +0000 ARM: SMP: move ipi_count into irq_stat structure Move the ipi_count into irq_stat, which allows the ipi_data structure to be entirely removed. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit 46c48f222f568decb881a552caa1c8f9c96c521e Author: Russell King Date: Mon Nov 15 14:15:03 2010 +0000 ARM: SMP: provide accessors for irq_stat data Provide __inc_irq_stat() and __get_irq_stat() to increment and read the irq stat counters. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit ec405ea9fe5fdeb40824edba7082803b3e98f176 Author: Russell King Date: Mon Nov 15 13:38:06 2010 +0000 ARM: include local timer irq stats only when local timers configured Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit e3fbb087650df130788d8e3ac29875ee56819249 Author: Russell King Date: Mon Dec 20 14:47:19 2010 +0000 ARM: SMP: remove send_ipi_message() send_ipi_message() does nothing except call smp_cross_call(). As this is a static function, nothing external to this file calls it, so we can easily clean up this now unnecessary indirection. Signed-off-by: Russell King commit 6e5f6856427abe5418f535cb46c454ae8ea7f8e7 Author: Geert Uytterhoeven Date: Wed Aug 25 12:22:40 2010 +0200 checksyscalls: Fix stand-alone usage The usage help in the comments - refers to the wrong script name, - doesn't mention that $srctree must be set. Hence correct the script name, and derive the source tree path from the script path, so we no longer need to rely on $srctree being set by the caller. Signed-off-by: Geert Uytterhoeven Acked-by: Sam Ravnborg Signed-off-by: Michal Marek commit 22f075a8d8bb5a8d203392df809739c1817e578f Author: Henrik Rydberg Date: Mon Dec 20 15:09:27 2010 +0100 input: mt: Document interface updates This patch documents the recent input-mt interface changes. Signed-off-by: Henrik Rydberg commit 10528020d7323778b60c2de04754a2615a88d002 Author: David Henningsson Date: Mon Dec 20 14:50:59 2010 +0100 ALSA: HDA: Rename "e-Mic" and "i-Mic" to "Mic" and "Internal Mic" Change non-standard mic control names to standard control names to clean up the namespace. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 8607f7c4245bc1737989d908e9c5adbfe4f5d06d Author: David Henningsson Date: Mon Dec 20 14:43:54 2010 +0100 ALSA: HDA: Rename "Ext Mic" and "External Mic" to "Mic" Usually external microphones are just labelled "Mic", so rename "Ext Mic" and "External Mic" to "Mic" to clear up the namespace. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 28c4edb71d21623f1e47422194d865d2b6712fd4 Author: David Henningsson Date: Mon Dec 20 14:24:29 2010 +0100 ALSA: HDA: Rename "Int Mic" to "Internal Mic" "Int Mic" and "Internal Mic" both mean the same thing, so rename the former to the latter in order to clean up the namespace a little. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 96657d33b9ba4e7bd3728ee319ed96ed3f09c40b Author: Jassi Brar Date: Mon Dec 20 11:05:57 2010 +0900 ASoC: SMDKV310: Add I2S support Add ASoC machine driver for SMDKV310/C210 boards that have a WM8994 attached to I2S-0. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4d81acff4099ae5eccd113f10e8038b65b1fc638 Author: Jassi Brar Date: Mon Dec 20 11:05:56 2010 +0900 ASoC: SMDKV310: Enable AC97 device Enable AC97 audio device on SMDKV310/C210. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 40d2482993d39f3b99973b6e94b358fa1e1f0679 Author: Jassi Brar Date: Mon Dec 20 11:05:55 2010 +0900 ASoC: SMDKC110: Enable I2S device Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e3bd3e182d0b936923445e03aa259b1d50d83a20 Author: Jassi Brar Date: Mon Dec 20 11:05:53 2010 +0900 ASoC: SMDKV210: Enable I2S device Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dc6ee063937f7d2e79cd1ae1596a6fe896ffa3f9 Author: Jassi Brar Date: Mon Dec 20 11:05:52 2010 +0900 ASoC: SMDK6442: Enable I2S device Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit de4987ab104da973deeb651166960d4aae19812d Author: Jassi Brar Date: Mon Dec 20 11:05:51 2010 +0900 ASoC: SMDK6450: Enable I2S device Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c6ccc596cafd99b46ba1db8b7c81c7fb0ead90d6 Author: Jassi Brar Date: Mon Dec 20 11:05:50 2010 +0900 ASoC: SMDK6440: Enable I2S device Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 72685f27b1aed0d104e9356e30343506a4e09c30 Author: Jassi Brar Date: Mon Dec 20 11:05:48 2010 +0900 ASoC: SMDK_WM8580: Make I2S0 as default dai Since most newer SMDKs have I2S0 routed to the WM8580's Primary DAI, future changes can be minimized if the default CPU DAIs are set to 0, rather than 2. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 775bc97131c3dcf62d29cdb33e00db8f827eac35 Author: Jassi Brar Date: Mon Dec 20 11:05:47 2010 +0900 ASoC: Samsung: I2S: Flush FIFO after stop Flush the FIFO while stopping the channel rather than starting. This saves time during stream start and keeps the FIFOs clean when the channel is idling. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6ce534aac29ca177749000d76e4ecc8a326c852d Author: Jassi Brar Date: Mon Dec 20 11:05:46 2010 +0900 ASoC: Samsung: Set default rclk source rate Since the rclk_srcrate is cleared upon startup, it should be initialized upon second and later 'open' calls to the device with same root-clock source. The bug is otherwise visible in Codec-Slave mode. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 763eef8b5b64dbbfc0f6273af9a57024069785a9 Author: Vincent Guittot Date: Fri Dec 3 18:18:39 2010 +0100 ux500: add debugfs support for powerdebug Signed-off-by: Vincent Guittot Signed-off-by: Linus Walleij commit abda3a24a99998279fe890ea8a789ebe4d605d78 Author: Samuel Ortiz Date: Mon Dec 20 13:01:30 2010 +0100 mfd: Use dummy_irq_chip for tc3589x This also converts tc3589x to the new irq API. Cc: Rabin Vincent Signed-off-by: Samuel Ortiz Signed-off-by: Linus Walleij commit b72143ab3ed566a12560fa4411a1f02c276dcc39 Author: Theodore Ts'o Date: Mon Dec 20 07:26:59 2010 -0500 ext4: Add error checking to kmem_cache_alloc() call in ext4_free_blocks() Signed-off-by: "Theodore Ts'o" commit 5909a77ac62cc042f94bd262016cf468a2f96022 Author: Chris Wilson Date: Mon Dec 20 09:45:15 2010 +0000 drm/i915: Undo "Uncouple render/power ctx before suspending" Manaul revert of 0cdab21f9a1fca50dd27e488839f5a6578e333b2, just to remove the call to disable the clock gatings and powerctx before suspend. Peter Clifton bisected a suspend failure on his gme45 and found this to be the culprit. As this was intended to be a fix for a similar suspend failure for Ironlake (it didn't work), undoing this patch should have no other side-effects. Reported-and-tested-by: Peter Clifton Signed-off-by: Chris Wilson commit 72bfa19c8deb4d1db5ad068c34fd580cb295cbe8 Author: Chris Wilson Date: Sun Dec 19 11:42:05 2010 +0000 drm/i915: Allow the application to choose the constant addressing mode The relative-to-general state default is useless as it means having to rewrite the streaming kernels for each batch. Relative-to-surface is more useful, as that stream usually needs to be rewritten for each batch. And absolute addressing mode, vital if you start streaming state, is also only available by adjusting the register... Signed-off-by: Chris Wilson commit 289569f902dc70fc42b8c7cab627f9d615a720f1 Author: Shawn Guo Date: Sat Dec 18 21:39:28 2010 +0800 ARM: mxs: Add interrupt support Add Interrupt Collector (ICOLL) support for MXS-based. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 65d7d94405dcc1845ad2680eeb6af43ced74fdc4 Author: Shawn Guo Date: Sat Dec 18 21:39:27 2010 +0800 ARM: mxs: Add reset routines - The mxs wdog is implemented in RTC block. - There is a generic software reset routine for most modules on mxs. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit 67c6dc4df1ecdc434260898d5a4163e78c36b240 Merge: 30fac30 022c92b Author: Takashi Iwai Date: Mon Dec 20 10:28:51 2010 +0100 Merge branch 'fix/hda' into topic/hda commit fcd3027abbbcc26248714eddae40af3fb3c8a82e Author: Henrik Rydberg Date: Sat Dec 18 20:28:26 2010 +0100 Input: fix double equality sign in uevent Looking at the uevent stream for input devices, all properties are on the form "A=B" except the bitmap values, which are on the form "A==B". This bug has been around at least since 2007, and the input uevent code has been untouched since. The recent addition of device properties suggests this is a good time for a remedy. Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 85b7720039fc000b561c20fe2aaa3b54cddae4a7 Author: Henrik Rydberg Date: Sat Dec 18 20:51:13 2010 +0100 Input: introduce device properties Today, userspace sets up an input device based on the data it emits. This is not always enough; a tablet and a touchscreen may emit exactly the same data, for instance, but the former should be set up with a pointer whereas the latter does not need to. Recently, a new type of touchpad has emerged where the buttons are under the pad, which changes logic without changing the emitted data. This patch introduces a new ioctl, EVIOCGPROP, which enables user access to a set of device properties useful during setup. The properties are given as a bitmap in the same fashion as the event types, and are also made available via sysfs, uevent and /proc/bus/input/devices. Acked-by: Ping Cheng Acked-by: Chase Douglas Acked-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit b0f259e9afe0f694f90e800e2534db4703db3d11 Merge: 10c9376 3603b8e Author: Jens Axboe Date: Mon Dec 20 09:17:35 2010 +0100 Merge branch 'for-2.6.38/core' into for-next commit 3603b8eaccc8e41d3f355b3cadd662a3dd6699fd Author: Jens Axboe Date: Mon Dec 20 09:15:19 2010 +0100 Fix compile warnings due to missing removal of a 'ret' variable Commit a8adbe3 forgot to remove the return variable, kill it. drivers/block/loop.c: In function 'lo_splice_actor': drivers/block/loop.c:398: warning: unused variable 'ret' [...] fs/nfsd/vfs.c: In function 'nfsd_splice_actor': fs/nfsd/vfs.c:848: warning: unused variable 'ret' Reported-by: Stephen Rothwell Signed-off-by: Jens Axboe commit 4c306a9291a077879fc3e933326caac3bc319caa Author: Shan Wei Date: Sun Dec 19 21:59:35 2010 -0800 net: kill unused macros These macros never be used, so remove them. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit ba27d85c96c57111ae8acfa959643e5ce8e4bcbe Author: Tejun Heo Date: Wed Dec 15 04:03:29 2010 +0000 vxge: add missing flush of reset_task Commit 6e07ebd84 (drivers/net: remove unnecessary flush_scheduled_work() calls) incorrectly removed the flush call without replacing it with the appropriate work specific operation. Fix it by flushing vdev->reset_task explicitly. Pointed out by Jon Mason. Signed-off-by: Tejun Heo Cc: Jon Mason Acked-by: Jon Mason Signed-off-by: David S. Miller commit 71d9dec24dce548bf699815c976cf063ad9257e2 Author: Changli Gao Date: Wed Dec 15 19:57:25 2010 +0000 net: increase skb->users instead of skb_clone() In dev_queue_xmit_nit(), we have to clone skbs as we need to mangle skbs, however, we don't need to clone skbs for all the packet_types. Except for the first packet_type, we increase skb->users instead of skb_clone(). Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 1a75972c61f2c224eb5283c183f9f6b17fb09b6b Author: Eric Dumazet Date: Tue Dec 14 22:39:58 2010 +0000 ifb: use netif_receive_skb() instead of netif_rx() In ri_tasklet(), we run from softirq, so can directly handle packet through netif_receive_skb() instead of netif_rx(). There is no risk of recursion. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 0ff2ea7d84e31176a046a1eabea59d6e4eecd998 Author: Joe Perches Date: Sun Dec 19 22:43:19 2010 -0500 ext4: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. In function __ext4_grp_locked_error also added KERN_CONT to some printks. Signed-off-by: Joe Perches Signed-off-by: "Theodore Ts'o" commit 94de56ab2062be59d80e2efb7c0dc60ecf616075 Author: Joe Perches Date: Sun Dec 19 22:21:02 2010 -0500 ext4: Use vzalloc in ext4_fill_flex_info() Signed-off-by: Joe Perches Signed-off-by: "Theodore Ts'o" commit af0b44a1970fed1cda31d2969c99c46ffc515160 Author: Eric Sandeen Date: Sun Dec 19 22:10:31 2010 -0500 ext4: zero out nanosecond timestamps for small inodes When nanosecond timestamp resolution isn't supported on an ext4 partition (inode size = 128), stat() appears to be returning uninitialized garbage in the nanosecond component of timestamps. EXT4_INODE_GET_XTIME should zero out tv_nsec when EXT4_FITS_IN_INODE evaluates to false. Reported-by: Jordan Russell Signed-off-by: Eric Sandeen Signed-off-by: "Theodore Ts'o" commit cad3f00763dcf9dfc62cbddf4bd714ab5a71a0eb Author: Theodore Ts'o Date: Sun Dec 19 22:07:02 2010 -0500 ext4: optimize ext4_check_dir_entry() with unlikely() annotations 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. Signed-off-by: "Theodore Ts'o" commit b17b35ec13adfeb0346d4b329110b14adc509327 Author: Jesper Juhl Date: Sun Dec 19 21:41:55 2010 -0500 ext4: use kmem_cache_zalloc() in ext4_init_io_end() Use advantage of kmem_cache_zalloc() to remove a memset() call in ext4_init_io_end() and save a few bytes. Before: [jj@dragon linux-2.6]$ size fs/ext4/page-io.o text data bss dec hex filename 3016 0 624 3640 e38 fs/ext4/page-io.o After: [jj@dragon linux-2.6]$ size fs/ext4/page-io.o text data bss dec hex filename 3000 0 624 3624 e28 fs/ext4/page-io.o Signed-off-by: Jesper Juhl Signed-off-by: "Theodore Ts'o" commit 6ca7b13dea385484e2fcc89790b8030697c5014a Author: Tobias Klauser Date: Sun Dec 19 21:38:46 2010 -0500 ext4: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: "Theodore Ts'o" commit 3c5728edbeb44819dba25a3c1b56702c87c9e419 Author: Jonas Aaberg Date: Wed Dec 15 08:36:02 2010 +0100 ux500: platsmp: Fix section mismatch Signed-off-by: Jonas Aaberg Signed-off-by: Linus Walleij commit 556fb03869ad4d14e5336093a7a8565456a26c21 Author: Sundar Iyer Date: Fri Dec 3 20:35:38 2010 +0530 mach-ux500: add STMPE1601 platform data Signed-off-by: Sundar Iyer [Minor fixups to GPIO enumerators] Signed-off-by: Linus Walleij commit e43abe6f98641e40460d74a002f09c7751db48f9 Author: Sundar Iyer Date: Fri Dec 3 20:35:36 2010 +0530 mach-ux500: move keymaps to new file Move keylayouts to a dedicated file and plug these keylayouts for input platform data. This will make addition of new and custom keylayouts localized. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 593e9d70fb0f1ece1cf2a61c701dec35d8e41f8d Author: Sundar Iyer Date: Mon Dec 13 09:33:18 2010 +0530 mfd/tc3589x: add suspend/resume support Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 523bc3820f023169671e9726b8dc075669d14bec Author: Sundar Iyer Date: Mon Dec 13 09:33:17 2010 +0530 mfd/tc3589x: undo gpio module reset during chip init Skip putting the GPIO module into a reset during the chip init. This makes sure to preserve any existing GPIO configurations done by pre-kernel boot code. Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit bd77efd0cea80865d4cfcc1e4b62789c51a74b2d Author: Sundar Iyer Date: Mon Dec 13 09:33:16 2010 +0530 mfd/tc3589x: fix random interrupt misses On the TC35892, a random delayed interrupt clear (GPIO IC) write locks up the child interrupts. In such a case, the original interrupt is active and not yet acknowledged. Re-check the IRQST bit for any pending interrupts and handle those. Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 611b7590afa6e6c6b0942b1d3efef17fbb348ef5 Author: Sundar Iyer Date: Mon Dec 13 09:33:15 2010 +0530 mfd/tc3589x: add block identifier for multiple child devices Add block identifier to be able to add multiple mfd clients to the mfd core Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 20406ebff4a298e6e3abbc1717a90bb3e55dc820 Author: Sundar Iyer Date: Mon Dec 13 09:33:14 2010 +0530 mfd/tc3589x: rename tc35892 structs/registers to tc359x Most of the register layout, client IRQ numbers on the TC35892 is shared also by other variants. Make this generic as tc3589x Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit f4e8afdc7ab1b5a0962be02a9dd15d29a81f4c53 Author: Sundar Iyer Date: Mon Dec 13 09:33:13 2010 +0530 mfd/tc35892: rename tc35892 core driver to tc3589x Rename the tc35892 core/gpio drivers to tc3589x to include new variants in the same mfd core Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit c6eda6c5eeb357ff231121619fb49d2bc0605faf Author: Sundar Iyer Date: Mon Dec 13 09:33:12 2010 +0530 mfd/tc35892: rename tc35892 header to tc3589x Rename the header file to include further variants within the same mfd core driver Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit d5d228158e77998a1659c1783fb204f275fab93b Author: Sundar Iyer Date: Mon Dec 13 09:33:11 2010 +0530 mach-ux500: deprecate spi support for ab8500 Acked-by: Samuel Ortiz Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit 991a86e182203913b71607f0695955d7e23075d7 Author: Linus Walleij Date: Fri Dec 10 09:35:53 2010 +0100 ARM: 6530/1: mmci: partially revert clock divisor code I misread the datasheet as if bypass mode was not available at all on the ux500's, I was wrong. It is there, the datasheet just states that you should not have to use it. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit b70a67f938e4a7544ca4dea2856b88f3c47669ff Author: Linus Walleij Date: Mon Dec 6 09:24:14 2010 +0100 ARM: 6526/1: mmci: corrected calculation of clock div for ux500 The Ux500 variant of this block has a different divider. The value used right now is too big and which means a loss in performance. This fix corrects it. Also expand the math comments a bit so it's clear what's happening. Further the Ux500 variant does not like if we use the BYPASS bit, instead we are supposed to set the clock divider to zero. Signed-off-by: Ulf Hansson Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 132b16325fae0742a02075894af16197e83febe8 Author: Russell King Date: Mon Dec 13 13:14:55 2010 +0000 ARM: AT91: update clock source registration In d7e81c2 (clocksource: Add clocksource_register_hz/khz interface) new interfaces were added which simplify (and optimize) the selection of the divisor shift/mult constants. Switch over to using this new interface. Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Russell King commit 40cc52440073903f3b7477a3391c4ca0761445d0 Author: Russell King Date: Sun Dec 19 15:43:34 2010 +0000 ARM: clockevents: fix IOP clock events initialization Ensure that no interrupt is pending before registering the clock event device, and properly initialize the periodic tick in the ->set_mode callback. Signed-off-by: Russell King commit 19e5eebb8eaa5ca3ff8aa18cb57ccb7a9f67277d Author: Paul Turner Date: Wed Dec 15 19:10:18 2010 -0800 sched: Fix interactivity bug by charging unaccounted run-time on entity re-weight Mike Galbraith reported poor interactivity[*] when the new shares distribution code was combined with autogroups. The root cause turns out to be a mis-ordering of accounting accrued execution time and shares updates. Since update_curr() is issued hierarchically, updating the parent entity weights to reflect child enqueue/dequeue results in the parent's unaccounted execution time then being accrued (vs vruntime) at the new weight as opposed to the weight present at accumulation. While this doesn't have much effect on processes with timeslices that cross a tick, it is particularly problematic for an interactive process (e.g. Xorg) which incurs many (tiny) timeslices. In this scenario almost all updates are at dequeue which can result in significant fairness perturbation (especially if it is the only thread, resulting in potential {tg->shares, MIN_SHARES} transitions). Correct this by ensuring unaccounted time is accumulated prior to manipulating an entity's weight. [*] http://xkcd.com/619/ is perversely Nostradamian here. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra Cc: Mike Galbraith Cc: Linus Torvalds LKML-Reference: <20101216031038.159704378@google.com> Signed-off-by: Ingo Molnar commit 43365bd7ff37979d2afdccbe953299ed64a4649b Author: Paul Turner Date: Wed Dec 15 19:10:17 2010 -0800 sched: Move periodic share updates to entity_tick() Long running entities that do not block (dequeue) require periodic updates to maintain accurate share values. (Note: group entities with several threads are quite likely to be non-blocking in many circumstances). By virtue of being long-running however, we will see entity ticks (otherwise the required update occurs in dequeue/put and we are done). Thus we can move the detection (and associated work) for these updates into the periodic path. This restores the 'atomicity' of update_curr() with respect to accounting. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101216031038.067028969@google.com> Signed-off-by: Ingo Molnar commit ca680888d5d0d03862ec311a83c6a1c7a1e00a01 Merge: 40dc11f b0c3844 Author: Ingo Molnar Date: Sun Dec 19 16:35:08 2010 +0100 Merge commit 'v2.6.37-rc6' into sched/core Merge reason: Update to the latest -rc. Signed-off-by: Ingo Molnar commit c16714704bb35165e5b85d927873dcc643772648 Author: Stefan Richter Date: Fri Dec 17 22:22:33 2010 +0100 firewire: net: set carrier state at ifup At ifup, carrier status would be shown on even if it actually was off. Also add an include for ethtool_ops rather than to rely on the one from netdevice.h. Note, we can alas not use fwnet_device_mutex to serialize access to dev->peer_count (as I originally wanted). This would cause a lock inversion: - fwnet_probe | takes fwnet_device_mutex + register_netdev | takes rtnl_mutex - devinet_ioctl | takes rtnl_mutex + fwnet_open | ...must not take fwnet_device_mutex Hence use the dev->lock spinlock for serialization. Signed-off-by: Stefan Richter commit 18bb36f9fab5980efeff063755c037a622f0231c Author: Maxim Levitsky Date: Wed Dec 8 04:22:57 2010 +0200 firewire: net: add carrier detection To make userland, e.g. NetworkManager work with firewire, we need to detect whether cable is plugged or not. Simple and correct way of doing that is just counting number of peers. No peers - no link and vice versa. Signed-off-by: Stefan Richter commit da169f5df2764a6a937cb3b07562e269edfb1c0e Author: Robert Richter Date: Fri Sep 24 15:54:43 2010 +0200 oprofile, x86: Add support for 6 counters (AMD family 15h) This patch adds support for up to 6 hardware counters for AMD family 15h cpus. There is a new MSR range for hardware counters beginning at MSRC001_0200 Performance Event Select (PERF_CTL0). Signed-off-by: Robert Richter commit 30570bced107243d5227527dd5317b22883dcf0c Author: Robert Richter Date: Tue Aug 31 10:44:38 2010 +0200 oprofile, x86: Add support for AMD family 15h This patch adds support for AMD family 15h (Interlagos/Valencia/ Zambezi) cpus. Signed-off-by: Robert Richter commit d03a5d888fb688c832d470b749acc5ed38e0bc1d Author: Tetsuo Handa Date: Sun Dec 19 12:54:22 2010 +0900 MAINTAINERS: Add tomoyo-dev-en ML. MAINTAINERS: Add tomoyo-dev-en ML. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit d1ed113f1669390da9898da3beddcc058d938587 Author: stephen hemminger Date: Thu Dec 16 17:42:54 2010 +0000 ipv6: remove duplicate neigh_ifdown When device is being set to down, neigh_ifdown was being called twice. Once from addrconf notifier and once from ndisc notifier. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit bc3ef6605ea325e41b586a76aadc3f731c317504 Author: stephen hemminger Date: Thu Dec 16 17:42:40 2010 +0000 ipv6: fib6_ifdown cleanup Remove (unnecessary) casts to make code cleaner. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b7271b0a39947f757d7969f6150dcb16c1976b91 Author: Theodore Ts'o Date: Sat Dec 18 13:39:38 2010 -0500 jbd2: simplify return path of journal_init_common Signed-off-by: "Theodore Ts'o" commit 9a4f6271b68b9693290963b97b320d2e6e6f3446 Author: Theodore Ts'o Date: Sat Dec 18 13:36:33 2010 -0500 jbd2: move debug message into debug #ifdef This is a port to jbd2 of a patch which Namhyung Kim originally made to fs/jbd. Signed-off-by: "Theodore Ts'o" commit ae00b267f3827ba88309fb74bdf7527396f0acf9 Author: Theodore Ts'o Date: Sat Dec 18 13:34:20 2010 -0500 jbd2: remove unnecessary goto statement This is a port to jbd2 of a patch which Namhyung Kim originally made to fs/jbd. Signed-off-by: "Theodore Ts'o" commit a1dd53318409ed6a27a8ce4fecf52e1326a100c0 Author: Theodore Ts'o Date: Sat Dec 18 13:13:40 2010 -0500 jbd2: use offset_in_page() instead of manual calculation This is a port to jbd2 of a patch which Namhyung Kim originally made to fs/jbd. Signed-off-by: "Theodore Ts'o" commit cfef2c6a559b1e37cbc7e7c1b51f82d26abf24ec Author: Theodore Ts'o Date: Sat Dec 18 13:07:34 2010 -0500 jbd2: Fix a debug message in do_get_write_access() 'buffer_head' should be 'journal_head' This is a port of a patch which Namhyung Kim made to fs/jbd to jbd2. Signed-off-by: "Theodore Ts'o" commit b89cd71a159b5edca4c429687e4af01708eb1b26 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:06 2010 +0530 omap4: l2x0: Enable early BRESP bit The AXI protocol specifies that the write response can only be sent back to an AXI master when the last write data has been accepted. This optimization enables the PL310 to send the write response of certain write transactions as soon as the store buffer accepts the write address. This behavior is not compatible with the AXI protocol and is disabled by default. You enable this optimization by setting the Early BRESP Enable bit in the Auxiliary Control Register (bit [30]). Signed-off-by: Santosh Shilimkar Signed-off-by: Mans Rullgard Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit b0f20ff9d7e347c284ea7718597c978a2969ad7b Author: Santosh Shilimkar Date: Fri Nov 19 23:01:05 2010 +0530 omap4: l2x0: Set share override bit Clearing bit 22 in the PL310 Auxiliary Control register (shared attribute override enable) has the side effect of transforming Normal Shared Non-cacheable reads into Cacheable no-allocate reads. Coherent DMA buffers in Linux always have a Cacheable alias via the kernel linear mapping and the processor can speculatively load cache lines into the PL310 controller. With bit 22 cleared, Non-cacheable reads would unexpectedly hit such cache lines leading to buffer corruption Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 11e0264046e00544eb044fafc27125babd105e41 Author: Mans Rullgard Date: Fri Nov 19 23:01:04 2010 +0530 omap4: l2x0: enable instruction and data prefetching Enabling L2 prefetching improves performance as shown on Panda ES2.1 board with mem test, and it has measurable impact on performances. I think we should consider it, even though it damages "writes" a bit. (rebased to k.org) Usually the prefetch is used at both levels together L1 + L2, however, to enable the CP15 prefetch engines, these are under security, and on GP devices, we cannot enable it(e.g. on PandaBoard). However, just enabling PL310 prefetch seems to provide performance improvement, as shown in the data below (from Ubuntu) and would be a great thing to pull in. What prefetch does is enable automatic next line prefetching. With this enabled, whenever the PL310 receives a cachable read request, it automatically prefetches the following cache line as well. Measurement Data: == STOCK 10.10 WITHOUT PATCH ======================== ~# ./memspeed size 8388608 8192k 8M offset 8388608, 0 buffers 0x2aaad000 0x2b2ad000 copy libc 133 MB/s copy Android v5 273 MB/s copy Android NEON 235 MB/s copy INT32 116 MB/s copy ASM ARM 187 MB/s copy ASM VLDM 64 204 MB/s copy ASM VLDM 128 173 MB/s copy ASM VLD1 216 MB/s read ASM ARM 286 MB/s read ASM VLDM 242 MB/s read ASM VLD1 286 MB/s write libc 1947 MB/s write ASM ARM 1943 MB/s write ASM VSTM 1942 MB/s write ASM VST1 1935 MB/s 10.10 + PATCH ============= ~# ./memspeed size 8388608 8192k 8M offset 8388608, 0 buffers 0x2ab17000 0x2b317000 copy libc 129 MB/s copy Android v5 256 MB/s copy Android NEON 356 MB/s copy INT32 127 MB/s copy ASM ARM 321 MB/s copy ASM VLDM 64 337 MB/s copy ASM VLDM 128 321 MB/s copy ASM VLD1 350 MB/s read ASM ARM 496 MB/s read ASM VLDM 470 MB/s read ASM VLD1 488 MB/s write libc 1701 MB/s write ASM ARM 1682 MB/s write ASM VSTM 1693 MB/s write ASM VST1 1681 MB/s Signed-off-by: Mans Rullgard Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 1773e60a816b28f4084810f96e9195aaaa7fb8c3 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:03 2010 +0530 omap4: l2x0: Construct the AUXCTRL value using defines This patch removes the hardcoded value of auxctrl value and construct it using bitfields Bit 25 is reserved and is always set to 1. Same value of this bit is retained in this patch Signed-off-by: Santosh Shilimkar Tested-by: Nishanth Menon Signed-off-by: Tony Lindgren commit 0aaa6f8f1da195ae1a993d3e9c80d600480cf947 Author: Santosh Shilimkar Date: Fri Nov 19 23:01:02 2010 +0530 ARM: l2x0: Add aux control register bitfields This patch adds the PL310 Auxiliary Control Register bitfields so that SOC's can use these bit fields to construct the AUXCTRL value to be passed/programmed instead of hardcoding it. Signed-off-by: Santosh Shilimkar Acked-by: Catalin Marinas Signed-off-by: Tony Lindgren commit 7c83912062c801738d7d19acaf8f7fec25ea663c Author: Christoph Lameter Date: Tue Dec 14 10:28:46 2010 -0600 vmstat: User per cpu atomics to avoid interrupt disable / enable Currently the operations to increment vm counters must disable interrupts in order to not mess up their housekeeping of counters. So use this_cpu_cmpxchg() to avoid the overhead. Since we can no longer count on preremption being disabled we still have some minor issues. The fetching of the counter thresholds is racy. A threshold from another cpu may be applied if we happen to be rescheduled on another cpu. However, the following vmstat operation will then bring the counter again under the threshold limit. The operations for __xxx_zone_state are not changed since the caller has taken care of the synchronization needs (and therefore the cycle count is even less than the optimized version for the irq disable case provided here). The optimization using this_cpu_cmpxchg will only be used if the arch supports efficient this_cpu_ops (must have CONFIG_CMPXCHG_LOCAL set!) The use of this_cpu_cmpxchg reduces the cycle count for the counter operations by %80 (inc_zone_page_state goes from 170 cycles to 32). Signed-off-by: Christoph Lameter commit 20b876918c065818b3574a426d418f68b4f8ad19 Author: Christoph Lameter Date: Tue Dec 14 10:28:45 2010 -0600 irq_work: Use per cpu atomics instead of regular atomics The irq work queue is a per cpu object and it is sufficient for synchronization if per cpu atomics are used. Doing so simplifies the code and reduces the overhead of the code. Before: christoph@linux-2.6$ size kernel/irq_work.o text data bss dec hex filename 451 8 1 460 1cc kernel/irq_work.o After: christoph@linux-2.6$ size kernel/irq_work.o text data bss dec hex filename 438 8 1 447 1bf kernel/irq_work.o Cc: Peter Zijlstra Signed-off-by: Christoph Lameter commit 05c2d088d0eb904e50460b04d77324c26cef4637 Merge: 3ea9f68 8270137 Author: Tejun Heo Date: Sat Dec 18 15:54:36 2010 +0100 Merge branch 'this_cpu_ops' into for-2.6.38 commit 8270137a0d50507a5b40f880db636527045b8466 Author: Christoph Lameter Date: Tue Dec 14 10:28:47 2010 -0600 cpuops: Use cmpxchg for xchg to avoid lock semantics Use cmpxchg instead of xchg to realize this_cpu_xchg. xchg will cause LOCK overhead since LOCK is always implied but cmpxchg will not. Baselines: xchg() = 18 cycles (no segment prefix, LOCK semantics) __this_cpu_xchg = 1 cycle (simulated using this_cpu_read/write, two prefixes. Looks like the cpu can use loop optimization to get rid of most of the overhead) Cycles before: this_cpu_xchg = 37 cycles (segment prefix and LOCK (implied by xchg)) After: this_cpu_xchg = 11 cycle (using cmpxchg without lock semantics) Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 7296e08abac0a22a2534a4f6e493c764f2c77583 Author: Christoph Lameter Date: Tue Dec 14 10:28:44 2010 -0600 x86: this_cpu_cmpxchg and this_cpu_xchg operations Provide support as far as the hardware capabilities of the x86 cpus allow. Define CONFIG_CMPXCHG_LOCAL in Kconfig.cpu to allow core code to test for fast cpuops implementations. V1->V2: - Take out the definition for this_cpu_cmpxchg_8 and move it into a separate patch. tj: - Reordered ops to better follow this_cpu_* organization. - Renamed macro temp variables similar to their existing neighbours. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 2b7124428561c7c3cfa4a58cc4c6feea53f3148e Author: Christoph Lameter Date: Sat Dec 18 15:54:04 2010 +0100 percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support Generic code to provide new per cpu atomic features this_cpu_cmpxchg this_cpu_xchg Fallback occurs to functions using interrupts disable/enable to ensure correct per cpu atomicity. Fallback to regular cmpxchg and xchg is not possible since per cpu atomic semantics include the guarantee that the current cpus per cpu data is accessed atomically. Use of regular cmpxchg and xchg requires the determination of the address of the per cpu data before regular cmpxchg or xchg which therefore cannot be atomically included in an xchg or cmpxchg without segment override. tj: - Relocated new ops to conform better to the general organization. - This patch contains a trivial comment fix. Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 9326845f45650f6af9953a4b6a31e89b54fab82f Merge: 2f841ed 5af244f Author: Russell King Date: Sat Dec 18 14:28:31 2010 +0000 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable commit 2f841ed13b9f10037e25ddf417d01700ecd886d0 Merge: 961ec6d 8fbf397 Author: Russell King Date: Sat Dec 18 14:27:55 2010 +0000 Merge branch 'hw-breakpoint' of git://repo.or.cz/linux-2.6/linux-wd into devel-stable commit a79a9ad94acdbd0106491f5a444167636562460f Author: Haojian Zhuang Date: Wed Nov 24 11:54:22 2010 +0800 ARM: pxa: sanitize IRQ registers access based on offset Signed-off-by: Eric Miao Signed-off-by: Haojian Zhuang commit 3f408fa071418183742110f7314d6b596916e31e Author: Haojian Zhuang Date: Wed Nov 24 11:54:21 2010 +0800 ARM: mmp: select CPU_PJ4 Since CPU_PJ4 is shared between PXA95x and MMP2, select CPU_PJ4 in MMP2 configuration. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit c9b5ef47dc9d154a79f320eeaddc4bc9684ae1ea Author: Haojian Zhuang Date: Wed Nov 24 11:54:20 2010 +0800 ARM: pxa: support saarb platform Saarb platform is a handheld platform that supports Marvell PXA955 silicon. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit a4553358d94b4a1f3e6f24aacfd076022ac14855 Author: Haojian Zhuang Date: Wed Nov 24 11:54:19 2010 +0800 ARM: pxa: support pxa95x The core of PXA955 is PJ4. Add new PJ4 support. And add new macro CONFIG_PXA95x. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit aae8224ddd72e045bb92eaf6b73b89282c771c69 Author: Eric Miao Date: Tue Nov 23 17:07:48 2010 +0800 ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 3b8d8d91d51c7d15cda51052624169edf7b6dbc6 Author: Jesse Barnes Date: Fri Dec 17 14:19:02 2010 -0800 drm/i915: dynamic render p-state support for Sandy Bridge Add an interrupt handler for switching graphics frequencies and handling PM interrupts. This should allow for increased performance when busy and lower power consumption when idle. Signed-off-by: Jesse Barnes Signed-off-by: Chris Wilson commit 4dd295a73e80b55c3fec25555bf0a5d253023740 Author: Andy Ross Date: Thu Dec 16 15:53:19 2010 -0800 hid: egalax: Add support for Wetab (726b) This patch adds support for another Wetab device (726b), and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Andy Ross Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit c7d3e9e801d72e86eb8a0f311453192a84f14412 Merge: 28257f7 1cd25df Author: Tony Lindgren Date: Fri Dec 17 19:19:50 2010 -0800 Merge branch 'for_2.6.38' of git://gitorious.org/iommu_mailbox/iommu_mailbox into devel-iommu-mailbox commit 6bc56aaecce78113500b150f1f1506029145a370 Author: Anand Gadiyar Date: Fri Dec 3 17:26:56 2010 +0000 omap: remove dead wdt code in plat-omap/devices.c Commit f2ce62312650 (OMAP: WDT: Split OMAP1 and OMAP2PLUS device registration) removed omap_init_wdt and related structures from plat-omap/devices.c. However a subsequent commit or merge seems to have reintroduced these by accident. The caller of omap_init_wdt was also removed by that commit, and this did not get restored. So we have the following build warning now: CC arch/arm/plat-omap/devices.o arch/arm/plat-omap/devices.c:252: warning: 'omap_init_wdt' defined but not used Fix this by removing this dead code. Signed-off-by: Anand Gadiyar Cc: Tony Lindgren Signed-off-by: Tony Lindgren commit fe297dde5ae8f8bf67d3a87759289a99b48ecb2c Author: John Rigby Date: Wed Dec 1 05:57:51 2010 +0000 OMAP4: enable smc instruction in new assembler versions New assemblers need -march=armv7-a+sec on command line or .arch_extension sec inline to enable use of the smc instruction. This patch uses as-instr to check the latter to conditionally enable the former in AFLAGS for files that use smc. Checked on both old and new binutils to verify that it does not break old versions. Signed-off-by: John Rigby Signed-off-by: Tony Lindgren commit 1a6b59232bbaf612265e364c9e06ba1d15bbe7e0 Author: Bryan Wu Date: Wed Dec 8 02:41:25 2010 +0000 omap: kill all section mismatch warning for omap2plus_defconfig This patch will kill following section mismatch warnings: WARNING: vmlinux.o(.text+0x24a00): Section mismatch in reference from the function zoom_twl_gpio_setup() to the (unknown reference) .init.data:(unknown) The function zoom_twl_gpio_setup() references the (unknown reference) __initdata (unknown). This is often because zoom_twl_gpio_setup lacks a __initdata annotation or the annotation of (unknown) is wrong. WARNING: vmlinux.o(.text+0x24bfc): Section mismatch in reference from the function cm_t35_twl_gpio_setup() to the (unknown reference) .init.data:(unknown) The function cm_t35_twl_gpio_setup() references the (unknown reference) __initdata (unknown). This is often because cm_t35_twl_gpio_setup lacks a __initdata annotation or the annotation of (unknown) is wrong. WARNING: vmlinux.o(.data+0x1d3e0): Section mismatch in reference from the variable h4_config to the (unknown reference) .init.data:(unknown) The variable h4_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+0x1dc08): Section mismatch in reference from the variable sdp2430_config to the (unknown reference) .init.data:(unknown) The variable sdp2430_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+0x1e1d8): Section mismatch in reference from the variable apollon_config to the (unknown reference) .init.data:(unknown) The variable apollon_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, Signed-off-by: Bryan Wu Cc: Paul Walmsley Signed-off-by: Tony Lindgren commit 7c50152f0851e44ef7491546a29fddbbea47735b Author: Ohad Ben-Cohen Date: Wed Nov 24 10:04:50 2010 +0000 omap: boards w/ wl12xx should select REGULATOR_FIXED_VOLTAGE Power to the wl12xx wlan device is controlled by a fixed regulator. Boards that have the wl12xx should select REGULATOR_FIXED_VOLTAGE so users will not be baffled. Signed-off-by: Ohad Ben-Cohen Signed-off-by: Tony Lindgren commit 447b8da5d78ac8f2815a7824c0eb4ad66ba3e11e Author: Jean Pihet Date: Wed Nov 17 17:52:11 2010 +0000 OMAP3: add comments for erratas i540 and i478 workarounds Add comments and IDs for the following erratas: - i540: MPU cannot exit from Standby, - i478: Unexpected Cold-Reset is generated when device is coming back from OFF mode Signed-off-by: Jean Pihet Signed-off-by: Tony Lindgren commit fea83f6a9b0a90fefca16ac3534e308f6c34144b Merge: df127ee 2d20066 Author: Tony Lindgren Date: Fri Dec 17 15:14:02 2010 -0800 Merge branch 'devel-board' into omap-for-linus commit 2d200665c37f544f648d77a05a06ab63328f0d3a Author: Aaro Koskinen Date: Fri Dec 17 15:13:47 2010 -0800 arm: omap: add minimal support for RM-680 Add minimal support for Nokia RM-680 board. Tested with omap2plus_defconfig. Signed-off-by: Aaro Koskinen [tony@atomide.com: updated to remove omap_gpio_init Signed-off-by: Tony Lindgren commit 20dbeb1081327aefaac7044d9908c97bf445858c Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: add 97.6/195.2 MHz timing data Introduce 97.6/195.2 MHz memory timing data. Based on patches by Eduardo Valentin, Igor Dmitriev and Juha Keski-Saari. Signed-off-by: Aaro Koskinen Cc: Eduardo Valentin Cc: Igor Dmitriev Signed-off-by: Tony Lindgren commit 15d24e118d51601a5cc2f021005aa7354b03b1c8 Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: delete redundant timing data 41.5 MHz SDRAM clock is not usable. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 2b1af87ace4776f0d0c3513923a79529fc1b5a00 Author: Aaro Koskinen Date: Fri Dec 17 15:13:46 2010 -0800 arm: omap: sdram-nokia: improve error handling Actually check for errors: print an error log and return NULL. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit e5f5b5422d064b7a393e39332da31af68e975f91 Author: Aaro Koskinen Date: Fri Dec 17 15:13:45 2010 -0800 arm: omap: sdram-nokia: use array to list timings Use an array to make it easier to add new values. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit fbd208e9772005c193459d1a0575c0787ad52f69 Author: Aaro Koskinen Date: Fri Dec 17 15:13:45 2010 -0800 arm: omap: sdram-nokia: prepare for new memory timings Rename the current timings to indicate they're for 166 MHz. Based on patches by Eduardo Valentin and Juha Keski-Saari. Signed-off-by: Aaro Koskinen Cc: Eduardo Valentin Signed-off-by: Tony Lindgren commit fcd8d84633902fd1717d80f36a38b8a4305ca3d4 Author: Aaro Koskinen Date: Fri Dec 17 15:13:44 2010 -0800 arm: omap: add sdram-nokia.h Add a header file for Nokia SDRAM functions. Based on patches by Juha Keski-Saari. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 6c3bc4eb5608665b7330b3d2044fca976cbd1a50 Author: Aaro Koskinen Date: Fri Dec 17 15:13:44 2010 -0800 arm: omap: rename board-rx51-sdram.c to sdram-nokia.c Rename the file and functions so that it can be reused by future Nokia boards. Based on patches by Juha Keski-Saari. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 04f4ad16b231abbfde34c762697ad035a3af0b5f Author: J. Bruce Fields Date: Thu Dec 16 09:51:13 2010 -0500 nfsd4: implement secinfo_no_name Implementation of this operation is mandatory for NFSv4.1. Signed-off-by: J. Bruce Fields commit 0ff7ab46719a9c1e264b8d8e85416d59737ff13c Author: J. Bruce Fields Date: Thu Dec 16 10:06:27 2010 -0500 nfsd4: move guts of nfsd4_lookupp into helper We'll reuse this code in secinfo_no_name. Signed-off-by: J. Bruce Fields commit 56560b9ae0c2d07bb5bbcec16f799d7bf756d3de Author: J. Bruce Fields Date: Thu Dec 16 09:57:15 2010 -0500 nfsd4: 4.1 SECINFO should consume filehandle See the referenced spec language; an attempt by a 4.1 client to use the current filehandle after a secinfo call should result in a NOFILEHANDLE error. Signed-off-by: J. Bruce Fields commit f3c0ceea83ba3741226ea04eb1804d254da2642f Author: Joe Perches Date: Sun Nov 14 18:08:11 2010 -0800 net/sunrpc/auth_gss/gss_krb5_crypto.c: Use normal negative error value return And remove unnecessary double semicolon too. No effect to code, as test is != 0. Signed-off-by: Joe Perches Signed-off-by: J. Bruce Fields commit 66c941f4aa8aef397a757001af61073db23b39e5 Author: Shan Wei Date: Wed Dec 15 14:47:20 2010 +0800 net: sunrpc: kill unused macros These macros never be used for several years. Signed-off-by: Shan Wei Signed-off-by: J. Bruce Fields commit 5b6a599f0da3722dea9ecc01d97f54061662ce49 Author: bookjovi@gmail.com Date: Sat Dec 11 00:21:17 2010 -0500 nfs: add missed CONFIG_NFSD_DEPRECATED these pieces of code only make sense when CONFIG_NFSD_DEPRECATED enabled Signed-off-by: Jovi Zhang fs/nfsd/nfsctl.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) Signed-off-by: J. Bruce Fields commit 3942302ea9e1dffa933021b20bf1642046e7641b Author: NeilBrown Date: Mon Nov 15 11:27:01 2010 +1100 sunrpc: svc_sock_names should hold ref to socket being closed. Currently svc_sock_names calls svc_close_xprt on a svc_sock to which it does not own a reference. As soon as svc_close_xprt sets XPT_CLOSE, the socket could be freed by a separate thread (though this is a very unlikely race). It is safer to hold a reference while calling svc_close_xprt. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 7c96aef75949a56ec427fc6a2522dace2af33605 Author: NeilBrown Date: Mon Nov 15 11:27:01 2010 +1100 sunrpc: remove xpt_pool The xpt_pool field is only used for reporting BUGs. And it isn't used correctly. In particular, when it is cleared in svc_xprt_received before XPT_BUSY is cleared, there is no guarantee that either the compiler or the CPU might not re-order to two assignments, just setting xpt_pool to NULL after XPT_BUSY is cleared. If a different cpu were running svc_xprt_enqueue at this moment, it might see XPT_BUSY clear and then xpt_pool non-NULL, and so BUG. This could be fixed by calling smp_mb__before_clear_bit() before the clear_bit. However as xpt_pool isn't really used, it seems safest to simply remove xpt_pool. Another alternate would be to change the clear_bit to clear_bit_unlock, and the test_and_set_bit to test_and_set_bit_lock. Signed-off-by: NeilBrown Signed-off-by: J. Bruce Fields commit 18b631f83810e95eeb2e1839889b27142bd8d6d8 Author: J. Bruce Fields Date: Mon Nov 29 15:28:10 2010 -0500 nfsd: fix offset printk's in nfsd3 read/write Thanks to dysbr01@ca.com for noticing that the debugging printk in the v3 write procedure can print >2GB offsets as negative numbers: https://bugzilla.kernel.org/show_bug.cgi?id=23342 Signed-off-by: J. Bruce Fields commit e203d506bd221bfa5b3acbb7336ae7b7646636a4 Author: J. Bruce Fields Date: Wed Nov 24 17:30:54 2010 -0500 nfsd4: fix mixed 4.0/4.1 handling, 4.1 reboot Instead of failing to find client entries which don't match the minorversion, we should be finding them, then either erroring out or expiring them as appropriate. This also fixes a problem which would cause the 4.1 server to fail to recognize clients after a second reboot. Reported-by: Casey Bodley Reviewed-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 6e5f15c93dc745d46c2bb9e4597b44463203844b Author: J. Bruce Fields Date: Wed Nov 24 17:17:34 2010 -0500 nfsd4: replace unintuitive match_clientid_establishment Reviewed-by: Benny Halevy Signed-off-by: J. Bruce Fields commit 3c2dcf2aed5ea22ecf65a9a871c4963faec421b3 Author: Paul E. McKenney Date: Wed Dec 15 21:12:15 2010 -0800 rcu: remove unused __list_for_each_rcu() macro Signed-off-by: Paul E. McKenney commit 8a9c1cee26c0ece23b38c45b92b724438878f842 Author: Mariusz Kozlowski Date: Wed Dec 15 23:11:12 2010 +0100 rculist: fix borked __list_for_each_rcu() macro This restores parentheses blance. Signed-off-by: Mariusz Kozlowski Signed-off-by: Paul E. McKenney commit b52573d2796274f7f31cfeff7185c320adcd4f12 Author: Paul E. McKenney Date: Tue Dec 14 17:36:02 2010 -0800 rcu: reduce __call_rcu()-induced contention on rcu_node structures When the current __call_rcu() function was written, the expedited APIs did not exist. The __call_rcu() implementation therefore went to great lengths to detect the end of old grace periods and to start new ones, all in the name of reducing grace-period latency. Now the expedited APIs do exist, and the usage of __call_rcu() has increased considerably. This commit therefore causes __call_rcu() to avoid worrying about grace periods unless there are a large number of RCU callbacks stacked up on the current CPU. Signed-off-by: Paul E. McKenney commit 0209f6490b030f35349a2bb71294f3fd75b0f36d Author: Paul E. McKenney Date: Tue Dec 14 16:07:52 2010 -0800 rcu: limit rcu_node leaf-level fanout Some recent benchmarks have indicated possible lock contention on the leaf-level rcu_node locks. This commit therefore limits the number of CPUs per leaf-level rcu_node structure to 16, in other words, there can be at most 16 rcu_data structures fanning into a given rcu_node structure. Prior to this, the limit was 32 on 32-bit systems and 64 on 64-bit systems. Note that the fanout of non-leaf rcu_node structures is unchanged. The organization of accesses to the rcu_node tree is such that references to non-leaf rcu_node structures are much less frequent than to the leaf structures. Signed-off-by: Paul E. McKenney commit 121dfc4b3eba9e2f3c42d35205a3510cc65b9931 Author: Paul E. McKenney Date: Fri Dec 10 15:02:47 2010 -0800 rcu: fine-tune grace-period begin/end checks Use the CPU's bit in rnp->qsmask to determine whether or not the CPU should try to report a quiescent state. Handle overflow in the check for rdp->gpnum having fallen behind. Signed-off-by: Paul E. McKenney commit 5ff8e6f0535fe730e921ca347bc38dcb9e01791a Author: Frederic Weisbecker Date: Fri Dec 10 22:11:11 2010 +0100 rcu: Keep gpnum and completed fields synchronized When a CPU that was in an extended quiescent state wakes up and catches up with grace periods that remote CPUs completed on its behalf, we update the completed field but not the gpnum that keeps a stale value of a backward grace period ID. Later, note_new_gpnum() will interpret the shift between the local CPU and the node grace period ID as some new grace period to handle and will then start to hunt quiescent state. But if every grace periods have already been completed, this interpretation becomes broken. And we'll be stuck in clusters of spurious softirqs because rcu_report_qs_rdp() will make this broken state run into infinite loop. The solution, as suggested by Lai Jiangshan, is to ensure that the gpnum and completed fields are well synchronized when we catch up with completed grace periods on their behalf by other cpus. This way we won't start noting spurious new grace periods. Suggested-by: Lai Jiangshan Signed-off-by: Frederic Weisbecker Cc: Paul E. McKenney Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Steven Rostedt commit 20377f32dcb77941d450728da18cce5b1a7faec5 Author: Frederic Weisbecker Date: Fri Dec 10 22:11:10 2010 +0100 rcu: Stop chasing QS if another CPU did it for us When a CPU is idle and others CPUs handled its extended quiescent state to complete grace periods on its behalf, it will catch up with completed grace periods numbers when it wakes up. But at this point there might be no more grace period to complete, but still the woken CPU always keeps its stale qs_pending value and will then continue to chase quiescent states even if its not needed anymore. This results in clusters of spurious softirqs until a new real grace period is started. Because if we continue to chase quiescent states but we have completed every grace periods, rcu_report_qs_rdp() is puzzled and makes that state run into infinite loops. As suggested by Lai Jiangshan, just reset qs_pending if someone completed every grace periods on our behalf. Suggested-by: Lai Jiangshan Signed-off-by: Frederic Weisbecker Cc: Paul E. McKenney Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Steven Rostedt Signed-off-by: Paul E. McKenney commit e27fc9641e8ddc8146f8e01f06e5eba2469698de Author: Tejun Heo Date: Mon Nov 22 21:36:11 2010 -0800 rcu: increase synchronize_sched_expedited() batching The fix in commit #6a0cc49 requires more than three concurrent instances of synchronize_sched_expedited() before batching is possible. This patch uses a ticket-counter-like approach that is also not unrelated to Lai Jiangshan's Ring RCU to allow sharing of expedited grace periods even when there are only two concurrent instances of synchronize_sched_expedited(). This commit builds on Tejun's original posting, which may be found at http://lkml.org/lkml/2010/11/9/204, adding memory barriers, avoiding overflow of signed integers (other than via atomic_t), and fixing the detection of batching. Signed-off-by: Tejun Heo Signed-off-by: Paul E. McKenney commit b4aa9e05a61b845541fa6f5b1d246976922601f0 Merge: 1dc0f3c 4b8fe66 Author: David S. Miller Date: Fri Dec 17 12:27:22 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x.h drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h drivers/vhost/vhost.c commit 1dc0f3c54ce1df957f99c17b145488fd03eb1a59 Author: Rajesh Borundia Date: Thu Dec 16 22:59:02 2010 +0000 qlcnic: reset pci function unconditionally during probe Some boot code drivers dont have cleanup routine, so pci function remains in unknown state prior to driver load. So during driver load issue FLR unconditionally. Update driver version to 5.0.14. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b5006dcb10a4b19e86f413b46787c55bd0d1277b Author: Rajesh Borundia Date: Thu Dec 16 22:59:01 2010 +0000 qlcnic: fix ocm window register offset calculation OCM window register offset was calculated incorrectly for pci function greater than zero. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit c75822a3091a899d982d59cd2b4454fe7c3e0318 Author: Sucheta Chakraborty Date: Thu Dec 16 22:59:00 2010 +0000 qlcnic: fix LED test when interface is down. When interface is down, create temporary context to config LED. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit ec66ee3797e5848356cf593c6ec7aabf30a00cf1 Merge: 1205065 b0c3844 Author: J. Bruce Fields Date: Fri Dec 17 13:29:07 2010 -0500 Merge commit 'v2.6.37-rc6' into for-2.6.38 commit 67c7efad9a64e9d58a6259332c344ab433f706eb Merge: 24ff33a 991e02b Author: Mark Brown Date: Fri Dec 17 17:37:28 2010 +0000 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38 commit 24ff33ac696802e478714480f505c00a50a89c75 Author: Dimitris Papastamos Date: Thu Dec 16 15:53:39 2010 +0000 ASoC: soc-dapm: Introduce the new snd_soc_dapm_virt_mux type This new type is a virtual version of snd_soc_dapm_mux. It is used when a backing register value is not necessary for deciding which input path to connect. A simple virtual enumeration control e.g. SOC_DAPM_ENUM_VIRT() can be exposed to userspace which will be used to choose which path to connect. The snd_soc_dapm_virt_mux type ensures that during the initial path setup, the first (which is also the default) input path will be connected. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 670be5a78ac7c80f0d6009d648c84c65a03f373a Author: Theodore Ts'o Date: Fri Dec 17 10:44:16 2010 -0500 jbd2: Use pr_notice_ratelimited() in journal_alloc_journal_head() We had an open-coded version of printk_ratelimited(); use the provided abstraction to make the code cleaner and easier to understand. Based on a similar patch for fs/jbd from Namhyung Kim Signed-off-by: "Theodore Ts'o" commit 991e02b4469c2e92cc98aa5b04fbde981671b74c Merge: 465d7fc 1bf8475 Author: Takashi Iwai Date: Fri Dec 17 16:43:17 2010 +0100 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc commit a8901d34872dafcafa23efa0865dcecfd4fddf8c Author: Theodore Ts'o Date: Fri Dec 17 10:40:47 2010 -0500 ext4: Use pr_warning_ratelimited() instead of printk_ratelimit() printk_ratelimit() is deprecated since it is a global instead of a per-printk ratelimit. Signed-off-by: "Theodore Ts'o" commit 403047754cf690b012369b8fb563b738b88086e6 Author: Tejun Heo Date: Fri Dec 17 15:47:04 2010 +0100 percpu,x86: relocate this_cpu_add_return() and friends - include/linux/percpu.h: this_cpu_add_return() and friends were located next to __this_cpu_add_return(). However, the overall organization is to first group by preemption safeness. Relocate this_cpu_add_return() and friends to preemption-safe area. - arch/x86/include/asm/percpu.h: Relocate percpu_add_return_op() after other more basic operations. Relocate [__]this_cpu_add_return_8() so that they're first grouped by preemption safeness. Signed-off-by: Tejun Heo Cc: Christoph Lameter commit 3ea9f6833c8f865a221b59ce37d7650dcf3b3e17 Author: Christoph Lameter Date: Wed Dec 8 17:42:23 2010 +0100 connector: Use this_cpu operations The patch was originally in the use cpuops patchset but it needs an inc_return and is therefore dependent on an extension of the cpu ops. Fixed up and verified that it compiles. get_seq can benefit from this_cpu_operations. Address calculation is avoided and the increment is done using an xadd. Cc: Scott James Remnant Cc: Mike Frysinger Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b2e4ae69757cdfef4c612a04f097c1e20489a565 Author: Christoph Lameter Date: Mon Dec 6 11:40:07 2010 -0600 xen: Use this_cpu_inc_return __this_cpu_inc_return reduces code and simplifies code. Cc: Jeremy Fitzhardinge Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter commit cd85fc58cd71bf6b89612efafb9a84e655ed7d66 Author: Christoph Lameter Date: Wed Dec 8 17:42:22 2010 +0100 taskstats: Use this_cpu_ops Use this_cpu_inc_return in one place and avoid ugly __raw_get_cpu in another. V3->V4: - Fix off by one. V4-V4f: - Use &listener_array Cc: Michael Holzheu Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b29c617af3b09d150d3889836c24d39564b39180 Author: Christoph Lameter Date: Mon Dec 6 11:40:06 2010 -0600 random: Use this_cpu_inc_return __this_cpu_inc can create a single instruction to do the same as __get_cpu_var()++. Cc: Richard Kennedy Cc: Matt Mackall Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit ee1be8626355e6a1f3f8c44e2351ff2661c5998d Author: Christoph Lameter Date: Mon Dec 6 11:40:05 2010 -0600 fs: Use this_cpu_inc_return in buffer.c __this_cpu_inc can create a single instruction with the same effect as the _get_cpu_var(..)++ construct in buffer.c. Cc: Wu Fengguang Cc: Christoph Hellwig Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit cfb824349556904b319464139be5c75fce983b0d Author: Christoph Lameter Date: Mon Dec 6 11:40:03 2010 -0600 highmem: Use this_cpu_xx_return() operations Use this_cpu operations to optimize access primitives for highmem. The main effect is the avoidance of address calculations through the use of a segment prefix. V3->V4 - kmap_atomic_idx: Do not return a value. - Use __this_cpu_dec without HIGHMEM_DEBUG Cc: Peter Zijlstra Cc: Catalin Marinas Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 908ee0f122bf2a67414854af5b90c6621d186a71 Author: Christoph Lameter Date: Mon Dec 6 11:40:02 2010 -0600 vmstat: Use this_cpu_inc_return for vm statistics this_cpu_inc_return() saves us a memory access there. Code size does not change. V1->V2: - Fixed the location of the __per_cpu pointer attributes - Sparse checked V2->V3: - Move fixes to __percpu attribute usage to earlier patch Reviewed-by: Pekka Enberg Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 275c8b93288ef0c2281e414e069ea8ed4bad03f7 Merge: 909ea96 8f1d97c Author: Tejun Heo Date: Fri Dec 17 15:16:46 2010 +0100 Merge branch 'this_cpu_ops' into for-2.6.38 commit 8f1d97c79eb65de1d05799d6b81d79cd94169114 Author: Christoph Lameter Date: Mon Dec 6 11:40:00 2010 -0600 x86: Support for this_cpu_add, sub, dec, inc_return Supply an implementation for x86 in order to generate more efficient code. V2->V3: - Cleanup - Remove strange type checking from percpu_add_return_op. tj: - Dropped unused typedef from percpu_add_return_op(). - Renamed ret__ to paro_ret__ in percpu_add_return_op(). - Minor indentation adjustments. Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit a663ffff1d2e94a7c549a37d08ed9169ce83bdd6 Author: Christoph Lameter Date: Mon Dec 6 11:39:59 2010 -0600 percpu: Generic support for this_cpu_add, sub, dec, inc_return Introduce generic support for this_cpu_add_return etc. The fallback is to realize these operations with simpler __this_cpu_ops. tj: - Reformatted __cpu_size_call_return2() to make it more consistent with its neighbors. - Dropped unnecessary temp variable ret__ from __this_cpu_generic_add_return(). Reviewed-by: Tejun Heo Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 909ea96468096b07fbb41aaf69be060d92bd9271 Author: Christoph Lameter Date: Wed Dec 8 16:22:55 2010 +0100 core: Replace __get_cpu_var with __this_cpu_read if not used for an address. __get_cpu_var() can be replaced with this_cpu_read and will then use a single read instruction with implied address calculation to access the correct per cpu instance. However, the address of a per cpu variable passed to __this_cpu_read() cannot be determined (since it's an implied address conversion through segment prefixes). Therefore apply this only to uses of __get_cpu_var where the address of the variable is not used. Cc: Pekka Enberg Cc: Hugh Dickins Cc: Thomas Gleixner Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 780f36d8b3fa9572f731d4fb85067b2e45e6f993 Author: Christoph Lameter Date: Mon Dec 6 11:16:29 2010 -0600 xen: Use this_cpu_ops Use this_cpu_ops to reduce code size and simplify things in various places. V3->V4: Move instance of this_cpu_inc_return to a later patchset so that this patch can be applied without infrastructure changes. Cc: Jeremy Fitzhardinge Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit c7b92516a9c68fa5403879225a5a19974a801ef6 Author: Christoph Lameter Date: Mon Dec 6 11:16:28 2010 -0600 fs: Use this_cpu_xx operations in buffer.c Optimize various per cpu area operations through these new percpu operations. These operations avoid address calculations through the use of segment prefixes and multiple memory references through RMW instructions etc. Reduces code size: Before: christoph@linux-2.6$ size fs/buffer.o text data bss dec hex filename 19169 80 28 19277 4b4d fs/buffer.o After: christoph@linux-2.6$ size fs/buffer.o text data bss dec hex filename 19138 80 28 19246 4b2e fs/buffer.o V3->V4: - Move the use of this_cpu_inc_return into a later patch so that this one can go in without percpu infrastructure changes. Cc: Wu Fengguang Cc: Christoph Hellwig Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 5309665dcc1143d659d82568da8d00f0e08a58f9 Author: Christoph Lameter Date: Mon Dec 6 11:16:26 2010 -0600 fakekey: Simplify speakup_fake_key_pressed through this_cpu_ops The whole function can be expressed as a simple this_cpu_read() operation. The function overhead is now likely multiple times that of the single instruction that is executed in it. Sedat: fixed compile failure caused by an extra ')'. Cc: William Hubbs Cc: Sedat Dilek Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit b76834bc1b6db0a0923eed85c81b1113021b0612 Author: Christoph Lameter Date: Mon Dec 6 11:16:25 2010 -0600 kprobes: Use this_cpu_ops Use this_cpu ops in various places to optimize per cpu data access. Cc: Jason Baron Cc: Namhyung Kim Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 4a6f4fe8377720e5a279fdbb769946c242e936d3 Author: Christoph Lameter Date: Mon Dec 6 11:16:24 2010 -0600 drivers: Replace __get_cpu_var with __this_cpu_read if not used for an address. __get_cpu_var() can be replaced with this_cpu_read and will then use a single read instruction with implied address calculation to access the correct per cpu instance. However, the address of a per cpu variable passed to __this_cpu_read() cannot be determed (since its an implied address conversion through segment prefixes). Therefore apply this only to uses of __get_cpu_var where the addres of the variable is not used. V3->V4: - Move one instance of this_cpu_inc_return to a later patch so that this one can go in without percpu infrastructrure changes. Sedat: fixed compile failure caused by an extra ')'. Cc: Neil Horman Cc: Martin Schwidefsky Cc: Sedat Dilek Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 12938a9220a38d555e38dc9b40021e664b99a1f1 Author: Christoph Lameter Date: Mon Dec 6 11:16:20 2010 -0600 vmstat: Optimize zone counter modifications through the use of this cpu operations this cpu operations can be used to slightly optimize the function. The changes will avoid some address calculations and replace them with the use of the percpu segment register. If one would have this_cpu_inc_return and this_cpu_dec_return then it would be possible to optimize inc_zone_page_state and dec_zone_page_state even more. V1->V2: - Fix __dec_zone_state overflow handling - Use s8 variables for temporary storage. V2->V3: - Put __percpu annotations in correct places. Reviewed-by: Pekka Enberg Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit 819a72af8d6653daa48334f24ce0a935ccdd33c7 Author: Christoph Lameter Date: Mon Dec 6 11:16:19 2010 -0600 percpucounter: Optimize __percpu_counter_add a bit through the use of this_cpu() options. The this_cpu_* options can be used to optimize __percpu_counter_add a bit. Avoids some address arithmetic and saves 12 bytes. Before: 00000000000001d3 <__percpu_counter_add>: 1d3: 55 push %rbp 1d4: 48 89 e5 mov %rsp,%rbp 1d7: 41 55 push %r13 1d9: 41 54 push %r12 1db: 53 push %rbx 1dc: 48 89 fb mov %rdi,%rbx 1df: 48 83 ec 08 sub $0x8,%rsp 1e3: 4c 8b 67 30 mov 0x30(%rdi),%r12 1e7: 65 4c 03 24 25 00 00 add %gs:0x0,%r12 1ee: 00 00 1f0: 4d 63 2c 24 movslq (%r12),%r13 1f4: 48 63 c2 movslq %edx,%rax 1f7: 49 01 f5 add %rsi,%r13 1fa: 49 39 c5 cmp %rax,%r13 1fd: 7d 0a jge 209 <__percpu_counter_add+0x36> 1ff: f7 da neg %edx 201: 48 63 d2 movslq %edx,%rdx 204: 49 39 d5 cmp %rdx,%r13 207: 7f 1e jg 227 <__percpu_counter_add+0x54> 209: 48 89 df mov %rbx,%rdi 20c: e8 00 00 00 00 callq 211 <__percpu_counter_add+0x3e> 211: 4c 01 6b 18 add %r13,0x18(%rbx) 215: 48 89 df mov %rbx,%rdi 218: 41 c7 04 24 00 00 00 movl $0x0,(%r12) 21f: 00 220: e8 00 00 00 00 callq 225 <__percpu_counter_add+0x52> 225: eb 04 jmp 22b <__percpu_counter_add+0x58> 227: 45 89 2c 24 mov %r13d,(%r12) 22b: 5b pop %rbx 22c: 5b pop %rbx 22d: 41 5c pop %r12 22f: 41 5d pop %r13 231: c9 leaveq 232: c3 retq After: 00000000000001d3 <__percpu_counter_add>: 1d3: 55 push %rbp 1d4: 48 63 ca movslq %edx,%rcx 1d7: 48 89 e5 mov %rsp,%rbp 1da: 41 54 push %r12 1dc: 53 push %rbx 1dd: 48 89 fb mov %rdi,%rbx 1e0: 48 8b 47 30 mov 0x30(%rdi),%rax 1e4: 65 44 8b 20 mov %gs:(%rax),%r12d 1e8: 4d 63 e4 movslq %r12d,%r12 1eb: 49 01 f4 add %rsi,%r12 1ee: 49 39 cc cmp %rcx,%r12 1f1: 7d 0a jge 1fd <__percpu_counter_add+0x2a> 1f3: f7 da neg %edx 1f5: 48 63 d2 movslq %edx,%rdx 1f8: 49 39 d4 cmp %rdx,%r12 1fb: 7f 21 jg 21e <__percpu_counter_add+0x4b> 1fd: 48 89 df mov %rbx,%rdi 200: e8 00 00 00 00 callq 205 <__percpu_counter_add+0x32> 205: 4c 01 63 18 add %r12,0x18(%rbx) 209: 48 8b 43 30 mov 0x30(%rbx),%rax 20d: 48 89 df mov %rbx,%rdi 210: 65 c7 00 00 00 00 00 movl $0x0,%gs:(%rax) 217: e8 00 00 00 00 callq 21c <__percpu_counter_add+0x49> 21c: eb 04 jmp 222 <__percpu_counter_add+0x4f> 21e: 65 44 89 20 mov %r12d,%gs:(%rax) 222: 5b pop %rbx 223: 41 5c pop %r12 225: c9 leaveq 226: c3 retq Reviewed-by: Pekka Enberg Reviewed-by: Tejun Heo Reviewed-by: Mathieu Desnoyers Acked-by: H. Peter Anvin Signed-off-by: Christoph Lameter Signed-off-by: Tejun Heo commit e72df0b847adf064e64bcbd5141f0031524e723e Author: Tejun Heo Date: Fri Dec 10 17:02:49 2010 +0100 MAINTAINERS: Add percpu allocator entry Add me and Christoph Lameter as maintainers for the percpu memory allocator. Signed-off-by: Tejun Heo Cc: Christoph Lameter Acked-by: Christoph Lameter commit 1ec9bc35a6a01555836fa1e4d0f00a3501835b0b Author: Kuninori Morimoto Date: Fri Dec 17 12:55:22 2010 +0900 ASoC: sh: fsi: Add over/under run counter Current FSI driver had printed under/over run error if status register have its error bit. But runtime print cause the next error because print out is slow. This patch add error counter and print error when sound stop Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9e261bbcba087b98b9d60a78e60845d5df488aa3 Author: Kuninori Morimoto Date: Fri Dec 17 12:52:56 2010 +0900 ASoC: sh: fsi: move fsi_irq_enable function to fsi_dai_trigger Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 97404f2e0386ac147cec00fc5d89ea475b04bd78 Author: Mark Brown Date: Tue Dec 14 16:13:57 2010 +0000 ASoC: Do DAPM control updates in the middle of DAPM sequences Attempt to minimise audible effects from mixer and mux updates by implementing the actual register changes between powering down widgets that have become unused and powering up widgets that are newly used. This means that we're making the change with the minimum set of widgets powered, that the input path is connected when we're powering up widgets (so things like DC offset correction can run with their signal active) and that we bring things down to cold before switching away. Since hardware tends to be designed for the power on/off case more than for dynamic reconfiguration this should minimise pops and clicks during reconfiguration while active. Signed-off-by: Mark Brown Acked-by: Peter Ujfalusi Tested-by: Peter Ujfalusi Acked-by: Liam Girdwood commit 9c3d2f7ffac34c62fea0b73e607707168a6f09b1 Author: Chris Wilson Date: Fri Dec 17 10:54:26 2010 +0000 drm/i915: Enable EI mode for RCx decision making on Sandybridge And no I have no idea what the difference is either, just that is the recommendation. Signed-off-by: Chris Wilson commit 41491b9adc6ba47b73100991e9295ae70c58db0f Author: Yusuke Goda Date: Wed Dec 15 08:31:04 2010 +0000 ARM: mach-shmobile: mackerel: Add mmcif support v2 Add comment of J22 and OCR field. Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 03aa18f550900855c1d3d17ac83c14a3d668d344 Author: Paul Mundt Date: Fri Dec 17 19:16:10 2010 +0900 dma: shdma: NMI support. Presently DMA transfers are interrupted and aborted by the NMI. This implements some basic logic for more gracefully handling and clearing each controller's NMIF flag via the NMI die chain, needed to resume transfers post-NMI. Reported-by: Michael Szafranek Signed-off-by: Paul Mundt commit 76496f8f2e104b8bb08db09c063a6817d18829a6 Author: Paul Mundt Date: Fri Dec 17 18:58:04 2010 +0900 sh: mach-sdk7786: Handle baseboard NMI source selection. The on-board NMI switch is routed through and mangled by the FPGA prior to its delivery to the NMI pin, so add some glue for the various configuration options. The default is to unmask it and enable all input sources. Signed-off-by: Paul Mundt commit 10c937604b9d7752fe2e4ef9125da3865a36b229 Merge: f3c1e66 e61eb2e Author: Jens Axboe Date: Fri Dec 17 09:00:46 2010 +0100 Merge branch 'for-2.6.38/core' into for-next commit e61eb2e93fe86931d46831752a82dab25a5335ca Author: Yang Zhang Date: Fri Dec 17 09:00:18 2010 +0100 fs/block: type signature of major_to_index(int) to major_to_index(unsigned) The major/minor device numbers are always defined and used as `unsigned'. Signed-off-by: Yang Zhang Signed-off-by: Jens Axboe commit b9f985b6e05ebd7af2aaef0eb3ae369390ef191f Author: Yang Zhang Date: Fri Dec 17 08:58:36 2010 +0100 block: convert !IS_ERR(p) && p to !IS_ERR_NOR_NULL(p) Signed-off-by: Yang Zhang Signed-off-by: Jens Axboe commit 7278c9c19bd85cf33213a2e0b538a18d3ac8ad00 Author: Gui Jianfeng Date: Fri Dec 17 08:57:14 2010 +0100 cfq-iosched: don't check cfqg in choose_service_tree() When cfq_choose_cfqg() is called in select_queue(), there must be at least one backlogged CFQ queue waiting for dispatching, hence there must be at least one backlogged CFQ group on service tree. So we never call choose_service_tree() with cfqg == NULL. Signed-off-by: Gui Jianfeng Reviewed-by: Jeff Moyer Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit a8adbe378b56acd5945df70753c7e8f6fe223304 Author: Michał Mirosław Date: Fri Dec 17 08:56:44 2010 +0100 fs/splice: Pull buf->ops->confirm() from splice_from_pipe actors This patch pulls calls to buf->ops->confirm() from all actors passed (also indirectly) to splice_from_pipe_feed(). Is avoiding the call to buf->ops->confirm() while splice()ing to /dev/null is an intentional optimization? No other user does that and this will remove this special case. Against current linux.git 6313e3c21743cc88bb5bd8aa72948ee1e83937b6. Signed-off-by: Michał Mirosław Signed-off-by: Jens Axboe commit b7b8de087384cc1954a8cd075af3f9e5977caa2e Author: Werner Fink Date: Fri Dec 3 12:48:23 2010 +0100 TTY: Add tty ioctl to figure device node of the system console. This has been in the SuSE kernels for a very long time. Signed-off-by: Werner Fink Signed-off-by: Greg Kroah-Hartman commit fbc92a3455577ab17615cbcb91826399061bd789 Author: Kay Sievers Date: Wed Dec 1 18:51:05 2010 +0100 tty: add 'active' sysfs attribute to tty0 and console device tty: add 'active' sysfs attribute to tty0 and console device Userspace can query the actual virtual console, and the configured console devices behind /dev/tt0 and /dev/console. The last entry in the list of devices is the active device, analog to the console= kernel command line option. The attribute supports poll(), which is raised when the virtual console is changed or /dev/console is reconfigured. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman index 0000000..b138b66 commit 63d5e5a727240b317b0c2fa2abeb32b367aea196 Author: Sven Eckelmann Date: Thu Dec 16 23:28:17 2010 +0100 Staging: batman-adv: Remove batman-adv from staging batman-adv is now moved to net/batman-adv/ and can be removed from staging. Signed-off-by: Sven Eckelmann Cc: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 7edc3453e54432a9f1c636b6481f1107c9db19bd Author: Eric Dumazet Date: Wed Dec 15 23:52:55 2010 +0000 ifb: fix a lockdep splat After recent ifb changes, we must use lockless __skb_dequeue() since lock is not anymore initialized. Signed-off-by: Eric Dumazet Cc: Jamal Hadi Salim Cc: Changli Gao Acked-by: Changli Gao Signed-off-by: David S. Miller commit 0d0b16727f24f8258eeb33818347ca0f4557f982 Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Fix drivers advertising HW_CSUM feature to use csum_start Some drivers are using skb_transport_offset(skb) instead of skb->csum_start for NETIF_F_HW_CSUM offload. This does not matter now, but if someone implements checksumming of encapsulated packets then this will break silently. TSO output paths are left as they are, since they are for IP+TCP only (might be worth converting though). Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 55508d601dab7df5cbcc7a63f4be8620eface204 Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Use skb_checksum_start_offset() Replace skb->csum_start - skb_headroom(skb) with skb_checksum_start_offset(). Note for usb/smsc95xx: skb->data - skb->head == skb_headroom(skb). Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit 04fb451eff978ca059399eab83d5594b073caf6f Author: Michał Mirosław Date: Tue Dec 14 15:24:08 2010 +0000 net: Introduce skb_checksum_start_offset() Introduce skb_checksum_start_offset() to replace repetitive calculation. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit bc2ce894e113ed95b92541134b002fdc641e8080 Author: Eric Dumazet Date: Thu Dec 16 14:08:34 2010 -0800 tcp: relax tcp_paws_check() Some windows versions have wrong RFC1323 implementations, with SYN and SYNACKS messages containing zero tcp timestamps. We relaxed in commit fc1ad92dfc4e363 the passive connection case (Windows connects to a linux machine), but the reverse case (linux connects to a Windows machine) has an analogue problem when tsvals from windows machine are 'negative' (high order bit set) : PAWS triggers and we drops incoming messages. Fix this by making zero ts_recent value special, allowing frame to be processed. Based on a report and initial patch from Dmitiy Balakin Bugzilla reference : https://bugzilla.kernel.org/show_bug.cgi?id=24842 Reported-by: dmitriy.balakin@nicneiron.ru Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 1121584f5db8a99a7ad94c6c5d62431b3187ad98 Author: H.J. Lu Date: Wed Dec 15 17:11:22 2010 -0800 modpost: Put .zdebug* section on white list "as --compress-debug-sections" will generate compressed debug sections with section names ".zdebug*". This patch puts .zdebug* section on white list. Signed-off-by: H.J. Lu Signed-off-by: Michal Marek commit 443457242beb6716b43db4d62fe148eab5515505 Author: Octavian Purdila Date: Mon Dec 13 12:44:07 2010 +0000 net: factorize sync-rcu call in unregister_netdevice_many Add dev_close_many and dev_deactivate_many to factorize another sync-rcu operation on the netdevice unregister path. $ modprobe dummy numdummies=10000 $ ip link set dev dummy* up $ time rmmod dummy Without the patch With the patch real 0m 24.63s real 0m 5.15s user 0m 0.00s user 0m 0.00s sys 0m 6.05s sys 0m 5.14s Signed-off-by: Octavian Purdila Signed-off-by: David S. Miller commit 5155e2c70fc50bc475911dab5dba2f80130523c7 Author: Pavankumar Kondeti Date: Wed Dec 8 13:37:08 2010 +0530 MSM: Add USB support for MSM7x30 Add USB OTG, peripheral and host devices. This patch also adds usb_phy_clk which is required for resetting the PHY. VBUS power up and shutdown routines depends on PMIC module. As PMIC driver is unavailable, configure USB in peripheral only mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: David Brown commit 7032d512cff979319f308e02223d0cf39b6e9a91 Author: Pavankumar Kondeti Date: Wed Dec 8 13:37:07 2010 +0530 MSM: Add USB suport for QSD8x50 OTG driver takes care of putting hardware into low power mode. Hence make peripheral and host devices as children of OTG device and let runtime PM takes care of notifying peripheral and host state to OTG device. VBUS power up and shutdown routines are implemented by modem processor. As RPC infrastructure is not available, configure USB in peripheral only mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: David Brown commit c6c8fea29769d998d94fcec9b9f14d4b52b349d3 Author: Sven Eckelmann Date: Mon Dec 13 11:19:28 2010 +0000 net: Add batman-adv meshing protocol B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. The networks may be wired or wireless. See http://www.open-mesh.org/ for more information and user space tools. Signed-off-by: Sven Eckelmann Signed-off-by: David S. Miller commit c466cd2bb9cee2e576fc9663b828f51e322d7b4b Author: Greg Kroah-Hartman Date: Thu Dec 16 13:40:42 2010 -0800 USB: serial: ftdi_sio: add support for TIOCSERGETLSR Willem-Jan noticed that the ftdi_sio driver did not support the TIOCSERGETLSR ioctl, and some userspace programs rely on it. This patch adds the support. Reported-by: Willem-Jan de Hoog Tested-by: Willem-Jan de Hoog Signed-off-by: Greg Kroah-Hartman commit 225db7d35c33f076115a583abec238a696f4467e Author: Theodore Ts'o Date: Thu Dec 16 16:38:26 2010 -0500 ext4: Fix up comments in inode.c This fixes up some broken argument descriptions that Namhyung Kim had originally submitted for ext3. This fixes the comments that were still applicable in ext4. Signed-off-by: "Theodore Ts'o" commit 0247a7bcd4273fa10c4aba9b3f567c659bab2d2b Author: Fabio Estevam Date: Wed Dec 15 22:31:28 2010 -0200 USB: ehci-mxc: Setup portsc register prior to accessing OTG viewport In order to read/write to the i.MX OTG viewport register it is necessary to setup the PORTSCx register first. By default i.MX OTG port is configured for USB serial PHY. In order to use a ULPI PHY the PORTSCx register needs to be configured properly. commit 724c852 (USB: ehci/mxc: compile fix) placed the PORTSC setup after the OTG viewport is accessed and this causes ULPI read/write to fail. Revert the PORTSC setup order. Tested on a MX31PDK board with a ISP1504 transceiver: ehci_hcd: USB 2.0 'Enhanced' Host Controller (EHCI) Driver mxc-ehci mxc-ehci.0: initializing i.MX USB Controller ULPI transceiver vendor/product ID 0x04cc/0x1504 Found NXP ISP1504 ULPI transceiver. ULPI integrity check: passed. Signed-off-by: Fabio Estevam Signed-off-by: Greg Kroah-Hartman commit 2c8245c4990e75d86ab30bb0af9bb90cbe04985d Author: Rob Emanuele Date: Tue Dec 14 19:00:30 2010 +0100 USB: atmel_usba_udc: fix freeing irq in usba_udc_remove() Add a free_irq() call on vbus gpio when we remove udc so that the vbus irq is properly released. Signed-off-by: Rob Emanuele Signed-off-by: Nicolas Ferre Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Greg Kroah-Hartman commit 6ef9fc657bd69c708ada2ee9fd3b2e13f7600a3d Author: Anand Gadiyar Date: Mon Dec 13 22:00:34 2010 +0530 usb: ehci-omap: fix tll channel enable mask The TLL channel enable code searches for the wrong mask, and could end up enabling the wrong port. Fix this. Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit a0c9e95dfc6898dbc178d7b962916f3823434e6e Author: Keshava Munegowda Date: Mon Dec 13 22:00:51 2010 +0530 usb: ohci-omap3: fix trivial typo This is the ohci-omap3 driver, not ehci-omap. Correct this obvious typo. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 0a313c4d2435ed0d86cf2295514f02de34cecd88 Author: Artem Leonenko Date: Tue Dec 14 23:47:06 2010 -0800 USB: gadget: ci13xxx: don't assume that PAGE_SIZE is 4096 Page size for transaction descriptors for CI13XXX has nothing common with page size from MM. Using platform and configuration specific PAGE_SIZE is wrong. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit 7c25a82684364da44643cbe3bdbd0f8835293767 Author: Artem Leonenko Date: Tue Dec 14 23:46:55 2010 -0800 USB: gadget: ci13xxx: fix complete() callback for no_interrupt rq's CI13xxx UDC driver doesn't call complete() callback for requests with flag no_interrupt set. Thus gadget drivers (like g_ether) are never notifed about successfully (or not) transmitted requests. As a result in case of g_ether and queued request with no_interrupt=1 fields g_ether is never notifed about sent packets and TX stalls. Solution: treat no_interrupt flag like all other UDC drivers do and call complete() callback for all requests. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit d9bb9c1820cb2a7aeb5e42a5470cf208002d9aa8 Author: Artem Leonenko Date: Tue Dec 14 23:45:50 2010 -0800 USB: gadget: update ci13xxx to work with g_ether There is one nasty scenario when CI13xxx driver fails: a) two or more rx requests are queued (g_ether does that) b) rx request completed, interrupt fires and ci13xxx dequeues rq c) request complete() callback gets called and in turn it calls ep_queue() c1) in ep_queue() request gets added to the TAIL of the rx queue list d) ep gets primed with rq from (b) e) interrupt fires f) request gets popped from queue head for hw dequeue G) requets from queue head wasn't enqueued g1) isr_tr_complete_low() doesn't enqueue more requests and it doesn't prime EP, rx traffic stalls Solution: a) enque queued requests ASAP, i.e. before calling complete() callback. b) don't HW enqueue and prime endpoint with recently added request and use the oldest request in the queue. Fixed issues: a) ep_queue() may return an error code despite request was successfully added to the queue (if _hardware_enqueue() fails) b) Added requests are always processed in LIFO order, even if they are added in complete() callback c) Finally more than two and more queued requests are processed consistently, even if they were added in complete() callback The fix was successfully tested on MIPS based SoC with 4KEc CPU core and CI13612 USB core. Board successfully boots with NFS root using g_ether on ci13xxx udc. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit 6549e8b7f34b456d5689b98c2c0cf38c98414e47 Author: Artem Leonenko Date: Tue Dec 14 23:46:40 2010 -0800 USB: gadgets: ci13xxx: fix probing of compiled-in gadget drivers Built-in gadget drivers have NULL-ifed unbind() function. Checking whether unbind() is NULL will never let any compiled into kernel driver attach. Signed-off-by: Artem Leonenko Signed-off-by: Greg Kroah-Hartman commit 6714afb108b4973a07413ec58cb300b6d90b8df4 Author: Chris Wilson Date: Fri Dec 17 04:10:51 2010 +0000 drm/i915/sdvo: Border and stall select became test bits in gen5 This is even more important as those bits will be moved in future. Signed-off-by: Chris Wilson commit b236da6931e2482bfe44a7865dd4e7bb036f3496 Author: Changli Gao Date: Tue Dec 14 03:09:15 2010 +0000 net: use NUMA_NO_NODE instead of the magic number -1 Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit caafa84251b886feb6cdf23d50e2cc99dcdaaaf3 Author: Taku Izumi Date: Sun Dec 12 19:04:43 2010 +0000 bonding: add the debugfs interface to see RLB hash table This patch provices the debugfs interface to see RLB hash table like the following: # cat /sys/kernel/debug/bonding/bond0/rlb_hash_table SourceIP DestinationIP Destination MAC DEV 10.124.196.205 10.124.196.205 ff:ff:ff:ff:ff:ff eth4 10.124.196.205 10.124.196.81 00:19:99:XX:XX:XX eth3 10.124.196.205 10.124.196.1 00:21:d8:XX:XX:XX eth0 This is helpful to check if the receive load balancing works as expected. Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 411204a5a1ec1a35363d8ef450c77e2b8235da4d Author: Taku Izumi Date: Sun Dec 12 19:03:24 2010 +0000 bonding: migrate some macros from bond_alb.c to bond_alb.h This patch simply migrates some macros from bond_alb.c to bond_alb.h. Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit ad6bad3efbb82206837daad8cba2bc9343d778bf Author: Dimitris Michailidis Date: Tue Dec 14 21:36:55 2010 +0000 cxgb4: NUMA-aware Tx queue allocations Allocate Tx queue memory on the node indicated by the new netdev_queue_numa_node_read. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 23d88e1d3e4a5b807ce6725f9294b7b9dfcd89a1 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:54 2010 +0000 cxgb4: extend VPD parsing Current code parses the VPD RO section for keywords but makes static assumptions about the location of the section. Remove them and parse the VPD to find it. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 005b5717faac22264c1f61908ec5ac5b98108d99 Author: Joe Perches Date: Tue Dec 14 21:36:53 2010 +0000 cxgb4: add const to static arrays Patch originally from Joe Perches, unmodified. Signed-off-by: Joe Perches Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 8f3a76769ee50a839282f70d07d5f3429524b68a Author: Dimitris Michailidis Date: Tue Dec 14 21:36:52 2010 +0000 cxgb4: remove a bitmap The driver keeps a bitmap of the netdevs it registered so it knows what to unregister later. Remove that and look at reg_state instead. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit b1a3c2b698ec333edc86bf8b5a636162ca309870 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:51 2010 +0000 cxgb4: remove the name field from the adapter structure Remove a field the driver uses to keep track of the name of the first netdev it manages to register. Do this by changing the registration loop to stop the first time it fails so the first registered device is trivial to tell. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ba27816cd8167c64652406d86ca78bcc5989f20f Author: Dimitris Michailidis Date: Tue Dec 14 21:36:50 2010 +0000 cxgb4: correct formatting of MSI-X interrupt names The last byte of the buffer for MSI-X names could not be used due to a bogus -1. Also do not explicitly clear the last byte, snprintf will do the right thing. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 8cd18ac47f9642bcd0d30d4b3521359b1896c208 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:49 2010 +0000 cxgb4: allocate more space for MSI-X interrupt names Currently MSI-X names for netdevs with long names are truncated in /proc/interrupts due to insufficient space. Use IFNAMSIZ to size the needed space. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 118969ed21b6895045b0a5a8a32feac1c9341096 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:48 2010 +0000 cxgb4: print port information after registering each netdev Print information about each port when its netdev is registered instead of looping separately over the ports at the end. The bulk of this patch is due to indentation change. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 7d5e77aafa39f3210b6273a44fe07508e837c3cb Author: Dimitris Michailidis Date: Tue Dec 14 21:36:47 2010 +0000 cxgb4: distinguish between 1-lane KR/KX and 4-lane KR/KX/KX4 ports And fix the supported flags ethtool reports for the two cases. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit a57cabe09f843a3f71277c485494496b3b9ee84a Author: Dimitris Michailidis Date: Tue Dec 14 21:36:46 2010 +0000 cxgb4: set the number of queues before device registration The number of queues is known early, move the calls to netif_set_real_num_[rt]x_queues before register_netdev. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ec16400823ce63bc0cfe89df78c6b7bf4a4d684b Author: Dimitris Michailidis Date: Tue Dec 14 21:36:45 2010 +0000 cxgb4: do not read the clock frequency from VPD No need to read the clock frequency from VPD, we already get it a bit later from FW, after any potential adjustments. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit ef306b50b983be4873aed453c1feeaab22f3a098 Author: Dimitris Michailidis Date: Tue Dec 14 21:36:44 2010 +0000 cxgb4: enable PCIe relaxed ordering Enable relaxed ordering for descriptor reads and packet I/O. Signed-off-by: Dimitris Michailidis Signed-off-by: David S. Miller commit 986d730a696277520084180071ac4873aac63905 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:50 2010 +0000 bnx2x: update version to 1.62.00-2 Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit b0200e250b5eef29e5ed8aa17979499affcc11cd Author: Vladislav Zolotarov Date: Mon Dec 13 22:34:37 2010 +0200 bnx2x: remove old FW files Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 5928c8baf67a36f553fe23a1b7820c7745e8bb2e Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:35 2010 +0000 bnx2x: replace FW to 6.2.5 Includes FCoE releated fixes in FW flows Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 40392d4e49c29bf5e939803d804dc8c7b600f297 Author: Vladislav Zolotarov Date: Mon Dec 13 22:28:42 2010 +0200 bnx2x: add FW 6.2.5 files Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit bcab15c5d780bafb38311f00fcb263d03d2b00f1 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:25 2010 +0000 bnx2x: Add DCB/PFC support - link layer Add appropriate HW DCB/PFC configuration Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit e4901dde12d92b70dd13fa8b3bbc9df7a6129aab Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:18 2010 +0000 bnx2x: add DCB support Adding DCB initialization and handling on 57712 FW/HW Signed-off-by: Dmitry Kravkov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 8307fa3e86a83924dd7f8310ce1e051f34986fe8 Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:09 2010 +0000 bnx2x: add a select queue callback This callback required to allow FCoE traffic to be sent on separate priority queue from other L2 traffic, which is managed by PFC in HW. Signed-off-by: Vladislav Zolotarov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit ec6ba945211b1c1f97d3d19fe60f166c9a92241d Author: Vladislav Zolotarov Date: Mon Dec 13 05:44:01 2010 +0000 bnx2x: add FCoE ring Includes new driver structures and FW/HW configuration for FCoE ring Signed-off-by: Vladislav Zolotarov Signed-off-by: Shmulik Ravid-Rabinovitz Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit a3d22a68d752ccc1a01bb0a64dd70b7a98bf9e23 Author: Vladislav Zolotarov Date: Mon Dec 13 06:27:10 2010 +0000 bnx2x: Take the distribution range definition out of skb_tx_hash() Move the calcualation of the Tx hash for a given hash range into a separate function and define the skb_tx_hash(), which calculates a Tx hash for a [0; dev->real_num_tx_queues - 1] hash values range, using this function (__skb_tx_hash()). Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 35c64e5d13c3d7d8c4ad061ad5e20498b9160c24 Author: Thomas Gleixner Date: Thu Dec 16 13:06:35 2010 +0000 drivers: serial: apbuart: Handle OF failures gracefully The apbuart driver depends on OF and relies on everything being available. So if it's probed on a platform which has OF support, but no device tree is available it crashes. Triggered by the upcoming x86 OF support in randconfig testing. Further it's inconsistent vs. the probing and exiting from the of_match loop. Make it robust and consistent: - check the availablility of OF nodes before dereferencing - return -ENODEV when the device tree lookup fails - return -ENODEV when no uart port configuration is found - return -ENODEV when invalid uart port configuration is found Remove the enum_done check while at it. Driver init functions are only called once. Remove the pointless vendor and device queries as well. Reported-by: Ingo Molnar Signed-off-by: Thomas Gleixner Cc: Grant Likely Cc: Kristoffer Glembo Signed-off-by: Greg Kroah-Hartman commit 3f960dbb9dfe29ff283810624c4340c79fde87f5 Author: Govindraj.R Date: Thu Dec 16 18:12:47 2010 +0530 Serial: Avoid unbalanced IRQ wake disable during resume To avoid unbalanced IRQ wake disable, ensure that wakeups are disabled only when wakeups have been successfully enabled. Tested on OMAP3630SDP/ZOOM3. Signed-off-by: Govindraj.R Reported-by: Paul Walmsley Cc: Santosh Shilimkar Acked-by: Kevin Hilman Signed-off-by: Greg Kroah-Hartman commit 6ce5b1ce5f6922db32599e73bcb22f5cdcbf241f Author: Timur Tabi Date: Mon Dec 13 14:08:53 2010 -0600 tty: fix typos/errors in tty_driver.h comments Fix various typos and other errors in comments of tty_driver.h. The most significant is the wrong name of a function for the description of TTY_DRIVER_DYNAMIC_DEV. Signed-off-by: Timur Tabi Signed-off-by: Greg Kroah-Hartman commit 1c5189976ffc130416e808f41049c12615a6380c Author: Tomoya MORINAGA Date: Thu Dec 16 16:13:29 2010 +0900 pch_uart : fix warnings for 64bit compile Fix the following warnings drivers/serial/pch_uart.c: In function ‘dma_handle_rx’: drivers/serial/pch_uart.c:685:24: warning: cast from pointer to integer of different size drivers/serial/pch_uart.c: In function ‘dma_handle_tx’: drivers/serial/pch_uart.c:778:23: warning: cast from pointer to integer of different size drivers/serial/pch_uart.c: In function ‘pch_uart_init_port’: drivers/serial/pch_uart.c:1289:20: warning: cast to pointer from integer of different size drivers/serial/pch_uart.c: In function ‘pch_uart_exit_port’: drivers/serial/pch_uart.c:1328:2: warning: cast from pointer to integer of different size Signed-off-by: Tomoya MORINAGA Reported-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 49b14a5ca26fc18bafe33bd9704a1a1cea681fbf Author: Mario Kleiner Date: Thu Dec 9 07:00:07 2010 +0100 drm/i915: Add Guess-o-matic for pageflip timestamping. This patch changes the strategy for pageflip completion timestamping. It detects if the pageflip completion routine gets executed before or after drm_handle_vblank, and thereby decides if the returned vblank count and timestamp must be incremented by 1 frame(duration) or not. It compares the current system time at invocation against the current vblank timestamp. If the difference is more than 0.9 video refresh interval durations then it assumes the vblank timestamp and count are outdated and need to be incremented and does so. Otherwise it assumes a delayed pageflip irq and doesn't correct the timestamp and count. Advantage of this patch: Pageflip timestamping becomes more robust against implementation errors and is maintenance free for future GPU's. Disadvantage: A few dozen (hundred?) nsecs extra time spent in pageflip irq handler for each flip, compared to hard-coded per-gpu settings? Signed-off-by: Mario Kleiner Acked-by: Jesse Barnes Signed-off-by: Chris Wilson commit 0af7e4dff50454905092d468e91c1ef92e10e6b4 Author: Mario Kleiner Date: Wed Dec 8 04:07:19 2010 +0100 drm/i915: Add support for precise vblank timestamping (v2) v2: Change IS_IRONLAKE to IS_GEN5 to adapt to 2.6.37 This patch adds new functions for use by the drm core: .get_vblank_timestamp() provides a precise timestamp for the end of the most recent (or current) vblank interval of a given crtc, as needed for the DRI2 implementation of the OML_sync_control extension. It is a thin wrapper around the drm function drm_calc_vbltimestamp_from_scanoutpos() which does almost all the work. .get_scanout_position() provides the current horizontal and vertical video scanout position and "in vblank" status of a given crtc, as needed by the drm for use by drm_calc_vbltimestamp_from_scanoutpos(). The patch modifies the pageflip completion routine to use these precise vblank timestamps as the timestamps for pageflip completion events. This code has been only tested on a HP-Mini Netbook with Atom processor and Intel 945GME gpu. The codepath for (IS_G4X(dev) || IS_GEN5(dev) || IS_GEN6(dev)) gpu's has not been tested so far due to lack of hardware. Signed-off-by: Mario Kleiner Acked-by: Jesse Barnes Signed-off-by: Chris Wilson commit d8c58fabd75021cdd99abcd96513cb088d41092b Merge: 9c04f01 b08ebe7 Author: Chris Wilson Date: Thu Dec 16 21:02:15 2010 +0000 Merge remote branch 'airlied/drm-core-next' into drm-intel-next commit 45241e50e3e741ee2a148693888b48e90e806de9 Author: Hank Janssen Date: Mon Dec 13 16:23:36 2010 -0800 Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize Correct issue with not checking kmalloc return value. This fix now only uses one receive buffer for all hv_utils channels, and will do only one kmalloc on init and will return with a -ENOMEM if kmalloc fails on initialize. And properly clean up memory on failure. Thanks to Evgeniy Polyakov for pointing this out. And thanks to Jesper Juhl and Ky Srinivasan for suggesting a better implementation of my original patch. Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Reviewed-by: Jesper Juhl Cc: Evgeniy Polyakov Cc: Jesper Juhl Cc: Ky Srinivasan Signed-off-by: Greg Kroah-Hartman commit 244ba85606b567e6e990d2fac61e3bde5ff8f0ad Author: Timo Teräs Date: Wed Dec 15 20:48:10 2010 +0200 staging: hv: remove unneeded osd_schedule_callback No one calls it anymore, so remove it. Reviewed-By: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Timo Teräs Signed-off-by: Greg Kroah-Hartman commit 4b2f9abea52af3782d349080fca5e189b0693792 Author: Timo Teräs Date: Wed Dec 15 20:48:09 2010 +0200 staging: hv: convert channel_mgmt.c to not call osd_schedule_callback The additional abstraction is unneeded. The three calls are assumed to not be pending simultaneously: - vmbus_onoffer queues work exactly once when a new channel is created, the channel is not attached to lists until the work is executed - vmbus_onoffer_rescind is received only when the channel is active it is enough to process the work once - free_channel is called exactly once when the channel is getting destroyed; I assumed that vmbus_process_rescind_offer cannot be pending while free_channel is called Reviewed-By: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Timo Teräs Signed-off-by: Greg Kroah-Hartman commit bf6506f60c46c8a709df534408cc6d470df657ff Author: Timo Teräs Date: Wed Dec 15 20:48:08 2010 +0200 staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback The additional abstraction is unneeded. This also fixes a sleeping while atomic issue as osd_schedule_callback can sleep which is not allowed for vmbus_on_msg_dpc running in a tasklet. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16701 Reviewed-By: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Timo Teräs Cc: stable Signed-off-by: Greg Kroah-Hartman commit f4528696d803749892eac27422a6fd7748cffee1 Author: Joe Perches Date: Tue Dec 14 12:51:52 2010 -0800 staging: brcm80211: Fix WL_ logging macros These macros use the equivalent of "#define WL_(x) printk x" which requires an extra level of parentheses. Convert the macros to use the normal WL_(fmt, args...) style and remove the extra parentheses from the uses. Add format argument verification using no_printk as appropriate. Couple of spelling typo fixes in the formats and argument alignment at the same time. Also coalesced long formats. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 12b9d5bf76bfa20d3207ef24fca9c8254a586a58 Author: Michael Hennerich Date: Tue Dec 14 17:04:02 2010 +0100 Staging: IIO: DDS: AD9833 / AD9834 driver Changes since RFC/v1: IIO: Apply list review feedback Apply list review feedback: Rename attributes to fit IIO convention used in other drivers. Fix typos. Provide ddsX_out_enable as opposed to ddsX_out_disable. Use proper __devexit marking. Use strict_strtoul() to avoid negatives. Changes since v2: IIO: ad9834.c: Apply more list review feedback Update use of dds convenience macros. Fix tabbing. Remove superfluous brackets. Keep output disabled after probe. Remove unnecessary code. Signed-off-by: Michael Hennerich Reviewed-by: Datta Shubhrajyoti Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 4851d97d87c8dfa8c97037965690cdefe99a767d Author: Michael Hennerich Date: Tue Dec 14 17:04:01 2010 +0100 Staging: IIO: dds.h convenience macros Changes since RFC/v1: IIO: Apply list review feedback Apply list review feedback: Rename attributes to fit IIO convention used in other drivers. Provide ddsX_out_enable as opposed to ddsX_out_disable. Fix typos. Changes since v2: IIO: dds.h: Apply more list review feedback Fix mixture of X and [n] notation for indices. Remove duplicated descriptions. Add store methods to some dds convenience macros. Signed-off-by: Michael Hennerich Reviewed-by: Jonathan Cameron Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit f8ce33bbd57a0c9c302ebb273fd963c5efb1a264 Author: Michael Hennerich Date: Tue Dec 14 17:04:00 2010 +0100 Staging: IIO: Direct digital synthesis abi documentation Changes since RFC/v1: IIO: Apply list review feedback: Apply list review feedback: Restructure documentation according to list feedback. Rename attributes to fit IIO convention used in other drivers. Fix typos. Provide ddsX_out_enable as opposed to ddsX_out_disable Changes since v2: IIO: sysfs-bus-iio-dds: Apply more list review feedback Fix mixture of X and [n] notation for indices. Fix some wording in the descriptions. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 8a09d6d80c90c02f2f8c89f69c702cab0c8d9b42 Author: Larry Finger Date: Thu Dec 16 11:13:57 2010 -0600 rtlwifi: Switch locking from semaphores to mutexes Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 3cf0c8ad94ba1ba241b970cd19c11a4f3cea93c2 Author: Larry Finger Date: Thu Dec 16 09:13:21 2010 -0600 rtl8192ce: Update MAINTAINERS Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit f15a4bb2637253680f09f0161d51e22446b6478f Author: Bruno Randolf Date: Thu Dec 16 16:22:20 2010 +0900 ath5k: Fix survey The old survey implementation was broken and returned nonsense data. Clear cycle counters and survey data on reset. Since the cycle counters easily overflow it's better to keep a local version of collected survey data (in ms resolution, instead of clockrate) and update this every time survey is retrieved. If survey is retrieved often enough to avoid cycle counter overflows this works fine, otherwise we could update survey more often, like ath9k does. Still only the survey for the current channel is kept. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 4aea248dd7a67097d683a97f94a0aeaf0d248f3f Author: Larry Finger Date: Wed Dec 15 22:55:34 2010 -0600 rtl8192ce: Fix build on powerpc After merge of the rtl8192ce driver, a powerpc build fails with: drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_init_sw_vars': drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: error: implicit declaration of function 'vmalloc' drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: warning: cast to pointer from integer of different size drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_deinit_sw_vars': drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:91: error: implicit declaration of function 'vfree' The problem is fixed by explicitly including the appropriate header. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 931299cf87701962ea1811dc216f48f3f7a4ebc8 Author: Luis R. Rodriguez Date: Wed Dec 15 19:24:12 2010 -0800 ath: fix NULL pointer dereference on reg_notifier() The reg_notifier() was recently updated as being capable of having the request passed as NULL, fix ath to follow this API change. Without this we end up oopsing: BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 IP: [] ath_reg_notifier_apply+0x5b/0xa0 [ath] PGD b4c4c067 PUD b4c4d067 PMD 0 Oops: 0000 [#1] SMP DEBUG_PAGEALLOC last sysfs file: /sys/devices/pci0000:00/0000:00:1b.0/uevent CPU 1 Modules linked in: Pid: 436, comm: modprobe Not tainted 2.6.37-rc5-wl+ #36 6460DWU/6460DWU RIP: 0010:[] [] ath_reg_notifier_apply+0x5b/0xa0 [ath] RSP: 0018:ffff8800b6f6baa8 EFLAGS: 00010246 RAX: ffff8800b527b254 RBX: ffff8800b532c180 RCX: 0000000000000018 RDX: ffff8800b530c108 RSI: 0000000000000000 RDI: ffff8800b532c180 RBP: ffff8800b6f6baa8 R08: ffff8800b532f268 R09: 0000000000000235 R10: 00000000000016ad R11: 0000000000000018 R12: 0000000000000000 R13: 0000000000000016 R14: ffff8800b532f268 R15: 0000000000000011 FS: 00007f0c53104700(0000) GS:ffff8800bed00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000004 CR3: 00000000b6531000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 436, threadinfo ffff8800b6f6a000, task ffff8800b404dc40) Stack: ffff8800b6f6bac8 ffffffffa03ea651 ffff8800b532c180 ffff8800b527b254 ffff8800b6f6bb38 ffffffffa01835ca ffffffffa019ed00 00000000a019ed80 0000000000000002 ffff880000000002 ffffffffa0366140 0000000010aee572 Call Trace: [] ath9k_reg_notifier+0x41/0x50 [ath9k] [] wiphy_update_regulatory+0x4ba/0x5a0 [cfg80211] [] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211] [] ? ieee80211_register_hw+0xa0/0x5b0 [mac80211] [] wiphy_register+0x1d4/0x360 [cfg80211] [] ? __kmalloc+0x108/0x1c0 [] ieee80211_register_hw+0x183/0x5b0 [mac80211] [] ath9k_init_device+0x66b/0x850 [ath9k] [] ath_pci_probe+0x2f6/0x3c0 [ath9k] [] ? default_spin_lock_flags+0x9/0x10 [] local_pci_probe+0x5f/0xd0 [] pci_device_probe+0x101/0x120 [] ? driver_sysfs_add+0x7a/0xb0 [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0x9b/0xa0 [] ? __driver_attach+0x0/0xa0 [] bus_for_each_dev+0x68/0x90 [] driver_attach+0x1e/0x20 [] bus_add_driver+0xe9/0x290 [] ? ath9k_init+0x0/0x4d [ath9k] [] driver_register+0x80/0x150 [] ? ath9k_init+0x0/0x4d [ath9k] [] ? ath9k_init+0x0/0x4d [ath9k] [] __pci_register_driver+0x56/0xd0 [] ath_pci_init+0x23/0x30 [ath9k] [] ath9k_init+0x2b/0x4d [ath9k] [] do_one_initcall+0x43/0x190 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Code: RIP [] ath_reg_notifier_apply+0x5b/0xa0 [ath] RSP CR2: 0000000000000004 ---[ end trace 6d03d3c7eda9f06b ]--- Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2784fe915cd25adf23ea28534019308d8a144721 Author: Luis R. Rodriguez Date: Wed Dec 15 19:24:11 2010 -0800 cfg80211: fix null pointer dereference with a custom regulatory request Once we moved the core regulatory request to the queue and let the scheduler process it last_request will have been left NULL until the schedular decides to process the first request. When this happens and we are loading a driver with a custom regulatory request like all Atheros drivers we end up with a NULL pointer dereference. We fix this by checking if the request was a custom one. BUG: unable to handle kernel NULL pointer dereference at 0000000000000004 IP: [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] PGD 71f91067 PUD 712b2067 PMD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/devices/pci0000:00/0000:00:1d.7/usb2/2-1/firmware/2-1/loading CPU 0 Modules linked in: ath9k_htc(+) ath9k_common ath9k_hw ath Pid: 3094, comm: insmod Tainted: G W 2.6.37-rc5-wl #16 INVALID/28427ZQ RIP: 0010:[] [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] RSP: 0018:ffff88007045db78 EFLAGS: 00010282 RAX: 0000000000000000 RBX: ffffffffa047d9a0 RCX: ffff88007045dbd0 RDX: 0000000000004e20 RSI: 000000000024cde0 RDI: ffff8800700483e0 RBP: ffff88007045db98 R08: ffffffffa02f5b40 R09: 0000000000000001 R10: 000000000000000e R11: 0000000000000001 R12: 0000000000000000 R13: ffff88007004e3b0 R14: 0000000000000000 R15: ffff880070048340 FS: 00007f635a707700(0000) GS:ffff880077400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b CR2: 0000000000000004 CR3: 00000000708a9000 CR4: 00000000000006f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process insmod (pid: 3094, threadinfo ffff88007045c000, task ffff8800713e3ec0) Stack: ffffffffa047d9a0 0000000000000000 ffff88007004e3b0 0000000000000000 ffff88007045dc08 ffffffffa016e147 000000007045dc08 0000000000000002 ffff8800700483e0 ffffffffa02f5b40 ffff88007045dbd8 0000000000000000 Call Trace: [] wiphy_apply_custom_regulatory+0x137/0x1d0 [cfg80211] [] ? ath9k_reg_notifier+0x0/0x50 [ath9k_htc] [] ath_regd_init+0x347/0x430 [ath] [] ath9k_htc_probe_device+0x6c5/0x960 [ath9k_htc] [] ath9k_htc_hw_init+0xc/0x30 [ath9k_htc] [] ath9k_hif_usb_probe+0x216/0x3b0 [ath9k_htc] [] usb_probe_interface+0x10c/0x210 [usbcore] [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0xa3/0xb0 [] ? __driver_attach+0x0/0xb0 [] bus_for_each_dev+0x5e/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0x168/0x320 [] driver_register+0x71/0x140 [] ? __raw_spin_lock_init+0x38/0x70 [] usb_register_driver+0xdc/0x190 [usbcore] [] ? ath9k_htc_init+0x0/0x4f [ath9k_htc] [] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc] [] ath9k_htc_init+0x2b/0x4f [ath9k_htc] [] do_one_initcall+0x3f/0x180 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Code: RIP [] freq_reg_info_regd.clone.2+0x27/0x130 [cfg80211] RSP CR2: 0000000000000004 ---[ end trace 79e4193601c8b713 ]--- Reported-by: Sujith Manoharan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 45ef6a0bcc9cd8f13004789ec6decb52e1d3045c Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:53 2010 -0800 ath9k_hw: Configure appropriate Tx power when PAPRD fails Target Tx power available in eeprom is for PAPRD. If PAPRD fails, paprd scale factor needs to be detected from this target tx power. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7072bf62fb7abe5a91389d6271da520f29c79326 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:52 2010 -0800 ath9k_hw: Disable PAPRD for rates with low Tx power When the drop in Tx power for a particular mcs rate exceeds the paprd scale factor, paprd may not work properly. Disable paprd for any such rates. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8698bca6b53d1f6641850b270de9c953078ed1ce Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:51 2010 -0800 ath9k_hw: Add a helper to get paprd scale factor Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 0b2084bc578128be866d6fc9926ed887c3432bb1 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:50 2010 -0800 ath9k_hw: Tx IQ cal changes for AR9003 Add multiple Tx IQ cal support to improve EVM accross different power levels. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 895ad7eb21ed228444169dbbff44f3dccfc7e006 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:49 2010 -0800 ath9k_hw: Move get_streams() to hw.h This helper can be used in multiple places. Also make it inline returning u8. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d8a8440e3f1f0cdd23074c6d2d8cbbde204a4374 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:48 2010 -0800 ath9k_hw: Remove unnecessary Rx IQ cal register configuration in ar9003_hw_tx_iq_cal() Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7e68b746681289c00e8fd818fdd0144c6896d425 Author: Vasanthakumar Thiagarajan Date: Wed Dec 15 07:30:47 2010 -0800 ath9k_hw: Remove delay during regwrite of analog shift registers This is not needed for AR9003. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit cf4e594ea7e55555e81647b74a3a8e8b2826a529 Author: Jouni Malinen Date: Thu Dec 16 00:52:40 2010 +0200 nl80211: Add notification for dropped Deauth/Disassoc Add a new notification to indicate that a received, unprotected Deauthentication or Disassociation frame was dropped due to management frame protection being in use. This notification is needed to allow user space (e.g., wpa_supplicant) to implement SA Query procedure to recover from association state mismatch between an AP and STA. This is needed to avoid getting stuck in non-working state when MFP (IEEE 802.11w) is used and a protected Deauthentication or Disassociation frame is dropped for any reason. After that, the station would silently discard any unprotected Deauthentication or Disassociation frame that could be indicating that the AP does not have association for the STA (when the Reason Code would be 6 or 7). IEEE Std 802.11w-2009, 11.13 describes this recovery mechanism. Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit 5928b91acae97622a6f2e679eb7a9f19bed68e3e Merge: 7d5f01a 248daa0 Author: John W. Linville Date: Thu Dec 16 15:21:33 2010 -0500 Merge branch 'wl12xx-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx commit fcbdbed01633bac6271708d86d569e06ed3e4c34 Author: Joe Perches Date: Mon Dec 13 16:57:04 2010 -0800 staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE Remove now unused #define. Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d7ec915abc98795a4cb88e369e2918696dd0ea01 Author: Joe Perches Date: Mon Dec 13 16:57:03 2010 -0800 staging: brcm80211: Remove unused ETHER_TYPE_ #defines Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit d659a3ec838866482779f594c4520f553468c492 Author: Joe Perches Date: Mon Dec 13 16:57:02 2010 -0800 staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit b8d6307894a73a10be6395b8ed3ffb3cb9255f9d Author: Joe Perches Date: Mon Dec 13 16:57:01 2010 -0800 staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN Add an #include of to include/proto/ethernet.h Convert ETHER_ADDR_LEN, remove the #define for ETHER_ADDR_LEN. Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit ed9568687e82c56017ca1aacf6eda9902939bf4a Author: Joe Perches Date: Mon Dec 13 16:57:00 2010 -0800 staging: brcm80211: Convert ETHER_IS to is__ether_addr Use the normal kernel calls and remove the #defines for ETHER_IS_BCAST and ETHER_IS_NULLADDR. Add #include for etherdevice.h where necessary. Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 47c6de7d37619d105de0367aece9ab10288225bc Author: Joe Perches Date: Mon Dec 13 16:56:59 2010 -0800 staging: brcm80211: Remove unused ether_ #defines and struct These are unused, just remove them. Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 3ca5ada504a41d9a8afd1e25f85f11d1761efa5f Author: Joe Perches Date: Mon Dec 13 16:56:58 2010 -0800 staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr Use the standard kernel function. Change callers to add .octet to addressing to avoid warnings. Add #include where necessary. Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit ee417a79567030ce726e9627aa52779e47c49ff0 Author: Joe Perches Date: Mon Dec 13 16:56:57 2010 -0800 staging: brcm80211: Remove unused #defines ETHER__LOCALADDR Signed-off-by: Joe Perches Acked-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c9c62f4e2c9b526c5cbade3f3a61f126e6587c16 Author: Xenofon Foukas Date: Wed Dec 15 19:44:20 2010 +0200 Staging: comedi: Fix checkpatch.pl issues in file s526.c This patch fixes the following issues in s526.c: WARNING: printk() should include KERN_ facility level WARNING: line over 80 characters ERROR: do not use C99 // comments WARNING: space prohibited between function name and open parenthesis '(' WARNING: braces {} are not necessary for any arm of this statement WARNING: suspect code indent for conditional statements (16, 16) Signed-off-by: Xenofon Foukas Signed-off-by: Greg Kroah-Hartman commit 3555a4c35e59c0217983f5df0cfe39a9fa65c2df Author: Xenofon Foukas Date: Wed Dec 15 00:14:30 2010 +0200 Staging: comedi: Fix coding style issues in ii_pci20kc.c This patch fixes the following issues in file ii_pci20kc.c: WARNING: please, no space before tabs WARNING: unnecessary whitespace before a quoted newline WARNING: line over 80 characters Signed-off-by: Xenofon Foukas Signed-off-by: Greg Kroah-Hartman commit 91cda632ebc6ea84fd7a45efb6d4452c34985731 Author: Marek Belisko Date: Tue Dec 14 14:02:55 2010 +0100 staging: ft1000: Fix kernel panic when use ioctl. During ioctl testing was observed kernel panic beuase file->private_data pointer was not correctly set when debugfs file was created. Add correct pointer setup. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 0ce72ea3b2f29e5755b095a5b217b9bab8386a03 Author: Marek Belisko Date: Tue Dec 14 14:02:54 2010 +0100 staging: ft1000: Fix camelcase variable names. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c346541f3d8c6e90b6aadc0511c27a6de15fdee5 Author: Marek Belisko Date: Tue Dec 14 09:42:28 2010 +0100 staging: ft1000: Rename ft1000_chdev.c to ft1000_debug.c. Name of old file was misleading because it is currently updated to debugfs so change also file name. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit dab56ffe9acc59a6cbe8f857a95adf75f42970b9 Author: Marek Belisko Date: Tue Dec 14 09:42:27 2010 +0100 staging: ft1000: Fix camelcase function names. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 8c3d90921604951e306a898669c46a88578c5848 Author: L. Alberto Giménez Date: Tue Dec 14 02:01:55 2010 +0100 Staging: rt2860: Sanitize DBGPRINT_ERR macro Cleaner implementation. Avoids the need of the double parenthesis to call the macro. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit 3be305fd7c0d07cdbb175467b4fe706ea10eb732 Author: L. Alberto Giménez Date: Tue Dec 14 02:01:54 2010 +0100 Staging: rt2860: include KERN_* in printk Fix checkpatch complains. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit 36facadd9ea98f8415d0dbb63e0763b7ee9d3911 Merge: 2faa83e 0b83ae9 Author: Greg Kroah-Hartman Date: Thu Dec 16 10:05:06 2010 -0800 Merge branch 'usb-next' into musb-merge * usb-next: (132 commits) USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path USB: uas: Ensure we only bind to a UAS interface USB: uas: Rename sense pipe and sense urb to status pipe and status urb USB: uas: Use kzalloc instead of kmalloc USB: uas: Fix up the Sense IU usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource usb: gadget: g_ncm added usb: gadget: f_ncm.c added usb: gadget: u_ether: prepare for NCM usb: pch_udc: Fix setup transfers with data out usb: pch_udc: Fix compile error, warnings and checkpatch warnings usb: add ab8500 usb transceiver driver USB: gadget: Implement runtime PM for MSM bus glue driver USB: gadget: Implement runtime PM for ci13xxx gadget USB: gadget: Add USB controller driver for MSM SoC USB: gadget: Introduce ci13xxx_udc_driver struct USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc USB: gadget: Separate out PCI bus code from ci13xxx_udc ... commit 2faa83e2a519abea1055d156ce1b42b8fa57e87b Author: Greg Kroah-Hartman Date: Thu Dec 16 10:04:17 2010 -0800 Revert "USB: musb: pm: don't rely fully on clock support" This reverts commit 32d5dc9520f0c6f60f691dd478741c774e292406. Needed to properly merge the musb changes that are in the usb-next branch into Linus's tree. Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 224acb1839f5fbb4ba85a440f6dd30dfb0e561b6 Author: Greg Kroah-Hartman Date: Thu Dec 16 10:03:27 2010 -0800 Revert "USB: musb: blackfin: pm: make it work" This reverts commit 1e393c6eece048052d4131ec4dad3b98e35a98e2. Needed to properly merge the musb changes that are in the usb-next branch into Linus's tree. Acked-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8 Author: Eric Paris Date: Thu Dec 16 11:46:51 2010 -0500 SELinux: define permissions for DCB netlink messages Commit 2f90b865 added two new netlink message types to the netlink route socket. SELinux has hooks to define if netlink messages are allowed to be sent or received, but it did not know about these two new message types. By default we allow such actions so noone likely noticed. This patch adds the proper definitions and thus proper permissions enforcement. Signed-off-by: Eric Paris commit 79691836603541e81a3793970826ac4a75429572 Author: Chuck Lever Date: Tue Dec 14 15:06:52 2010 +0000 lockd: Remove src_sap and src_len from nlm_lookup_host_info struct Clean up. The contents of the src_sap field is not used in nlm_alloc_host(). Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 2025889828bb14b56d9aa4c1a785bd9847ccdc4b Author: Chuck Lever Date: Tue Dec 14 15:06:41 2010 +0000 lockd: Remove nlm_lookup_host() Clean up. Remove the now unused helper nlm_lookup_host(). Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit fcc072c783491ca465e4d1e74da7dbb48dbf7a31 Author: Chuck Lever Date: Tue Dec 14 15:06:32 2010 +0000 lockd: Make nrhosts an unsigned long Clean up. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit d2df0484bb38f2e0d9754b00597d4a6d1cf666d0 Author: Chuck Lever Date: Tue Dec 14 15:06:22 2010 +0000 lockd: Rename nlm_hosts Clean up. nlm_hosts now contains only server-side entries. Rename it to match convention of client side cache. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 67216b94d498f5880d8bba2a6b841880739dd524 Author: Chuck Lever Date: Tue Dec 14 15:06:12 2010 +0000 lockd: Clean up nlmsvc_lookup_host() Clean up. Change nlmsvc_lookup_host() to be purpose-built for server-side nlm_host management. This replaces the generic nlm_lookup_host() helper function, just like on the client side. The lookup logic is specialized for server host lookups. The server side cache also gets its own specialized equivalent of the nlm_release_host() function. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 8ea6ecc8b0759756a766c05dc7c98c51ec90de37 Author: Chuck Lever Date: Tue Dec 14 15:05:52 2010 +0000 lockd: Create client-side nlm_host cache NFS clients don't need the garbage collection processing that is performed on nlm_host structures. The client picks up an nlm_host at mount time and holds a reference to it until the file system is unmounted. Servers, on the other hand, don't have a precise way to tell when an nlm_host is no longer being used, so zero refcount nlm_host entries are left to expire in the cache after a time. Basically there's nothing holding a reference to an nlm_host between individual server-side NLM requests, but we can't afford the expense of recreating them for every new NLM request from a client. The nlm_host cache adds some lifetime hysteresis to entries in the cache so the next time a particular nlm_host is needed, it's likely to be discovered by a lookup rather than created from whole cloth. With the new implementation, client nlm_host cache items are no longer garbage collected, and are destroyed directly by a new release function specialized for client entries, nlmclnt_release_host(). They are cached in their own data structure, and have their own lookup logic, simplified and specialized for client nlm_host entries. However, the client nlm_host cache still shares reboot recovery logic with the server nlm_host cache. The NSM "peer rebooted" downcall for clients and servers still come through the same RPC call. This is a legacy formal API that would be difficult to alter, and besides, the user space NSM implementation can't tell the difference between peers that are clients or servers. For this reason, the client cache continues to share the nlm_host_mutex (and reboot recovery logic) with the server cache. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 7db836d4a427c3c64406b00b6d8d745d6335d72a Author: Chuck Lever Date: Tue Dec 14 15:05:42 2010 +0000 lockd: Split nlm_release_call() The nlm_release_call() function is invoked from both the server and the client side. We're about to introduce a distinct server- and client-side nlm_release_host(), so nlm_release_call() must first be split into a client-side and a server-side version. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 723bb5b5052faba57060a2feb564ced22416b5bc Author: Chuck Lever Date: Tue Dec 14 15:05:33 2010 +0000 lockd: Add nlm_destroy_host_locked() Refactor the tail of nlm_gc_hosts() into nlm_destroy_host() so that this logic can be used separately from garbage collection. Rename it _locked() to document that it must be called with the hosts cache mutex held. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit a7952f4056d4d9c63c70534bcfd4f2c11e487000 Author: Chuck Lever Date: Tue Dec 14 15:05:23 2010 +0000 lockd: Add nlm_alloc_host() Refactor nlm_host allocation and initialization into a separate function. This will be the common piece of server and client nlm_host lookup logic after the nlm_host cache is split. Small change: use kmalloc() instead of kzalloc(), as we're overwriting almost all fields in the new nlm_host struct with non-zero values immediately after it is allocated. An added benefit is we now have an explicit reference to each field name where it is initialized (for all you cscope fans out there). Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit b10e30f6559978e3c8ca2a70c1cb35d6680a4021 Author: J. Bruce Fields Date: Tue Dec 14 15:05:13 2010 +0000 lockd: reorganize nlm_host_rebooted Minor reorganization; no change in behavior. This will save some duplicated code after we split the client and server host caches. Signed-off-by: J. Bruce Fields [ cel: Forward-ported to 2.6.37 ] Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit b113746888c260a02f6ae1e92b0b9ef7e9c38993 Author: J. Bruce Fields Date: Tue Dec 14 15:05:03 2010 +0000 lockd: define host_for_each{_safe} macros We've got a lot of loops like this, and I find them a little easier to read with the macros. More such loops are coming. Signed-off-by: J. Bruce Fields [ cel: Forward-ported to 2.6.37 ] Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit bf2695516db982e90a22fc94f93491b481796bb1 Author: Chuck Lever Date: Tue Dec 14 14:59:29 2010 +0000 SUNRPC: New xdr_streams XDR decoder API Now that all client-side XDR decoder routines use xdr_streams, there should be no need to support the legacy calling sequence [rpc_rqst *, __be32 *, RPC res *] anywhere. We can construct an xdr_stream in the generic RPC code, instead of in each decoder function. This is a refactoring change. It should not cause different behavior. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 9f06c719f474be7003763284a990bed6377bb0d4 Author: Chuck Lever Date: Tue Dec 14 14:59:18 2010 +0000 SUNRPC: New xdr_streams XDR encoder API Now that all client-side XDR encoder routines use xdr_streams, there should be no need to support the legacy calling sequence [rpc_rqst *, __be32 *, RPC arg *] anywhere. We can construct an xdr_stream in the generic RPC code, instead of in each encoder function. Also, all the client-side encoder functions return 0 now, making a return value superfluous. Take this opportunity to convert them to return void instead. This is a refactoring change. It should not cause different behavior. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 1ac7c23e4af5e83525137661595000099f1ce94f Author: Chuck Lever Date: Tue Dec 14 14:59:09 2010 +0000 SUNRPC: Determine value of "nrprocs" automatically Clean up. Just fixed a panic where the nrprocs field in a different upper layer client was set by hand incorrectly. Use the compiler-generated method used by the other upper layer protocols. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 4129ccf303593a1922a934697f99e682ff491504 Author: Chuck Lever Date: Tue Dec 14 14:58:59 2010 +0000 SUNRPC: Avoid return code checking in rpcbind XDR encoder functions Clean up. The trend in the other XDR encoder functions is to BUG() when encoding problems occur, since a problem here is always due to a local coding error. Then, instead of a status, zero is unconditionally returned. Update the rpcbind XDR encoders to behave this way. To finish the update, use the new-style be32_to_cpup() and cpu_to_be32() macros, and compute the buffer sizes using raw integers instead of sizeof(). This matches the conventions used in other XDR functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit b43cd8c153f6902100ed50c1f7e11a470c73a73f Author: Chuck Lever Date: Tue Dec 14 14:58:49 2010 +0000 NFS: Remove unused UMNT response data structure Clean up. The UMNT request has a NULL response. There's no need to set up a mountres structure for it. Signed-off-by: Chuck Lever Signed-off-by: Trond Myklebust commit 98eb2b4f9323bcf2a46476576d3155758cb0a473 Author: Chuck Lever Date: Tue Dec 14 14:58:40 2010 +0000 NFS: Avoid return code checking in mount XDR encoder functions Clean up. The trend in the other XDR encoder functions is to BUG() when encoding problems occur, since a problem here is always due to a local coding error. Then, instead of a status, zero is unconditionally returned. Update the mount client XDR encoders to behave this way. To finish the update, use the new-style be32_to_cpup() and cpu_to_be32() macros, and compute the buffer sizes using raw integers instead of sizeof(). This matches the conventions used in other XDR functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 49b170047f4a9fe1483132e14a11bdf493bdb8af Author: Chuck Lever Date: Tue Dec 14 14:58:30 2010 +0000 NSM: Avoid return code checking in NSM XDR encoder functions Clean up. The trend in the other XDR encoder functions is to BUG() when encoding problems occur, since a problem here is always due to a local coding error. Then, instead of a status, zero is unconditionally returned. Update the NSM XDR encoders to behave this way. To finish the update, use the new-style be32_to_cpup() and cpu_to_be32() macros, and compute the buffer sizes using raw integers instead of sizeof(). This matches the conventions used in other XDR functions Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit ead00597882c4ee3c534d6880cc3bcb4d412cc4b Author: Chuck Lever Date: Tue Dec 14 14:58:21 2010 +0000 NFS: Squelch compiler warning in decode_getdeviceinfo() Clean up. .../linux/nfs-2.6/fs/nfs/nfs4xdr.c: In function ‘decode_getdeviceinfo’: .../linux/nfs-2.6/fs/nfs/nfs4xdr.c:5008: warning: comparison between signed and unsigned integer expressions Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 573c4e1ef53a6b891b73cc2257e1604da754a2e4 Author: Chuck Lever Date: Tue Dec 14 14:58:11 2010 +0000 NFS: Simplify ->decode_dirent() calling sequence Clean up. The pointer returned by ->decode_dirent() is no longer used as a pointer. The only call site (xdr_decode() in fs/nfs/dir.c) simply extracts the errno value encoded in the pointer. Replace the returned pointer with a standard integer errno return value. Also, pass the "server" argument as part of the nfs_entry instead of as a separate parameter. It's faster to derive "server" in nfs_readdir_xdr_to_array() since we already have the directory's inode handy. "server" ought to be invariant for a set of entries in the same directory, right? The legacy versions of decode_dirent() don't use "server" anyway, so it's wasted work for them to derive and pass "server" for each entry. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 8111f373600cd43b3198b48b9238e3ad2fd9908d Author: Chuck Lever Date: Tue Dec 14 14:58:01 2010 +0000 NFS: Fix hdrlen calculation in NFSv4's decode_read() When computing the length of the header, be sure to include the four octets consumed by "count". Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit d8367c504e39528a057a5d7a267b6724f7fdb4b8 Author: Chuck Lever Date: Tue Dec 14 14:57:52 2010 +0000 lockd: Move nlmdbg_cookie2a() to svclock.c Clean up. nlmdbg_cookie2a() is used only in svclock.c. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 7d93bd71cb3e2629cc88bc59f393bd4df4162b94 Author: Chuck Lever Date: Tue Dec 14 14:57:42 2010 +0000 NFS: Repair whitespace damage in NFS PROC macro Clean up. When I was making other changes in this area, checkscript.pl complained about the use of leading blanks in the PROC macros in the xdr files. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 85a56480191ca9f08fc775c129b9eb5c8c1f2c05 Author: Chuck Lever Date: Tue Dec 14 14:57:32 2010 +0000 NFSD: Update XDR decoders in NFSv4 callback client Clean up. Remove old-style NFSv4 XDR macros in favor of the style now used in fs/nfs/nfs4xdr.c. These were forgotten during the recent nfs4xdr.c rewrite. Additional whitespace cleanup adds to the size of this patch. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit a033db487eec09afde00a3562842982a8053c887 Author: Chuck Lever Date: Tue Dec 14 14:57:22 2010 +0000 NFSD: Update XDR encoders in NFSv4 callback client Clean up. Remove old-style NFSv4 XDR macros in favor of the style now used in fs/nfs/nfs4xdr.c. These were forgotten during the recent nfs4xdr.c rewrite. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 3460f29a27344db8c7af62cafdb961286ef0b6cd Author: Chuck Lever Date: Tue Dec 14 14:57:12 2010 +0000 lockd: Introduce new-style XDR functions for NLMv4 We'd like to prevent local buffer overflows caused by malicious or broken servers. New xdr_stream style decoders can do that. For efficiency, we also want to be able to pass xdr_streams from call_encode() to all XDR encoding functions, rather than building an xdr_stream in every XDR encoding function in the kernel. Same idea as the NLM v3 XDR overhaul. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit f6048709391336cf27fb5c1cfca8e792103e5a73 Author: Chuck Lever Date: Tue Dec 14 14:57:02 2010 +0000 NFS: Move and update xdr_decode_foo() functions that we're keeping Clean up. Move the timestamp decoder to match the placement and naming conventions of the other helpers. Fold xdr_decode_fattr() into decode_fattr3(), which is now it's only user. Fold xdr_decode_wcc_attr() into decode_wcc_attr(), which is now it's only user. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit b2cdd9c9c95e0e389a8b75fe25f266fc5267bbb6 Author: Chuck Lever Date: Tue Dec 14 14:56:52 2010 +0000 NFS: Remove unused old NFSv3 decoder functions Clean up. Remove unused legacy result decoder functions, and any now unused decoder helper functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit f5fc3c50c99a7df2bf908dfe66f112d35178ee07 Author: Chuck Lever Date: Tue Dec 14 14:56:42 2010 +0000 NFS: Switch in new NFSv3 decoder functions The naming scheme of the new decoder functions, which follows the NFSv4 XDR decoder functions, is slightly different than the scheme used for the old functions. Rename the functions as a separate step to keep the patches clean. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit e4f9323409369a3aeb01885c0c4409d2eeec794a Author: Chuck Lever Date: Tue Dec 14 14:56:30 2010 +0000 NFS: Introduce new-style XDR decoding functions for NFSv2 We'd like to prevent local buffer overflows caused by malicious or broken servers. New xdr_stream style decoders can do that. For efficiency, we also eventually want to be able to pass xdr_streams from call_decode() to all XDR decoding functions, rather than building an xdr_stream in every XDR decoding function in the kernel. Static helper functions are left without the "inline" directive. This allows the compiler to choose automatically how to optimize these for size or speed. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 9d5a64343925a152e1907c652a0d71d6640868b3 Author: Chuck Lever Date: Tue Dec 14 14:56:20 2010 +0000 NFS: Update xdr_encode_foo() functions that we're keeping Clean up. Move the timestamp and the sattr encoder to match the placement convention of the other helpers, update their coding style, and refresh their documenting comments. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 499ff710b2fd3a03c8195c82340e5166eed04205 Author: Chuck Lever Date: Tue Dec 14 14:56:10 2010 +0000 NFS: Remove unused old NFSv3 encoder functions Clean up. Remove unused legacy argument encoder functions, and any now unused encoder helper functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit ad96b5b5eae59696b97e207d730b8c8cfb9d4e42 Author: Chuck Lever Date: Tue Dec 14 14:56:01 2010 +0000 NFS: Replace old NFSv3 encoder functions with xdr_stream-based ones The naming scheme of the new encoder functions, which follows the NFSv4 XDR encoder functions, is slightly different than the scheme used for the old functions. Rename the functions as a separate step to keep the patches clean. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit d9c407b138926132e1f93c01fb2dee50eb0bb615 Author: Chuck Lever Date: Tue Dec 14 14:55:50 2010 +0000 NFS: Introduce new-style XDR encoding functions for NFSv3 We're interested in taking advantage of the safety benefits of xdr_streams. These data structures allow more careful checking for buffer overflow while encoding. More careful type checking is also introduced in the new functions. For efficiency, we also eventually want to be able to pass xdr_streams from call_encode() to all XDR encoding functions, rather than building an xdr_stream in every XDR encoding function in the kernel. To do this means all encoders must be ready to handle a passed-in xdr_stream. The new encoders follow the modern paradigm for XDR encoders: BUG on error, and always return a zero status code. Static helper functions are left without the "inline" directive. This allows the compiler to choose automatically how to optimize these for size or speed. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 2b061f9ef216b6d229b06267f188167fd6ab3d9b Author: Chuck Lever Date: Tue Dec 14 14:55:40 2010 +0000 lockd: Introduce new-style XDR functions for NLMv3 We'd like to prevent local buffer overflows caused by malicious or broken servers. New xdr_stream style decoders can do that. For efficiency, we also eventually want to be able to pass xdr_streams from call_encode() and call_decode() to all XDR encoding functions, rather than building an xdr_stream in every XDR encoding and decoding function in the kernel. To do all of this, rewrite the XDR encoding and decoding functions in fs/lockd/xdr.c to use xdr_streams. This makes them more or less incompatible with server-side XDR helper functions, so break them out into a separate source file. Static helper functions are left without the "inline" directive. This allows the compiler to choose automatically how to optimize these for size or speed. SHARE-related functionality doesn't seem to be used, as those functions are hiding behind a #define that isn't set anywhere that I can find. And, they've been in there forever (at least as far back as the kernel's git history goes), yet remain unused. Let's take the opportunity to bin them. It should be easy enough for someone to introduce proper XDR functions if at some point SHARE-related NLM functionality is desired. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 5f96e5e31b4f4a2f126adfe0586a7555c11b0562 Author: Chuck Lever Date: Tue Dec 14 14:55:30 2010 +0000 NFS: Move and update xdr_decode_foo() functions that we're keeping Clean up. Move the timestamp decoder to match the placement and naming conventions of the other helpers. Fold xdr_decode_fattr() into decode_fattr(), which is now it's only user. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 661ad4239a51a2169a366a227c68cf3b654ab936 Author: Chuck Lever Date: Tue Dec 14 14:55:20 2010 +0000 NFS: Replace old NFSv2 decoder functions with xdr_stream-based ones Clean up. Remove unused legacy result decoder functions, and any now unused decoder helper functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit f796f8b3ae292abb9cb2931e8db6fc1d69bba09d Author: Chuck Lever Date: Tue Dec 14 14:55:10 2010 +0000 NFS: Introduce new-style XDR decoding functions for NFSv2 We'd like to prevent local buffer overflows caused by malicious or broken servers. New xdr_stream style decoders can do that. For efficiency, we also eventually want to be able to pass xdr_streams from call_decode() to all XDR decoding functions, rather than building an xdr_stream in every XDR decoding function in the kernel. nfs_decode_dirent() is renamed to follow the naming convention of the other two dirent decoders. Static helper functions are left without the "inline" directive. This allows the compiler to choose automatically how to optimize these for size or speed. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 858284932462cec260f3d1d7426aeb03f5dbc2ad Author: Chuck Lever Date: Tue Dec 14 14:55:00 2010 +0000 NFS: Use the "nfs_stat" enum for nfs_stat_to_errno()'s argument Clean up. To distinguish more clearly between the on-the-wire NFSERR_ value and our local errno values, use the proper type for the argument of nfs_stat_to_errno(). Add a documenting comment appropriate for a global function shared outside this source file. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 282ac2a573dd1be4230710932cd471ed5a3a94b8 Author: Chuck Lever Date: Tue Dec 14 14:54:50 2010 +0000 NFS: Update xdr_encode_foo() functions that we're keeping Clean up. The new helper functions are kept in order by section of RFC 1094. Move the two timestamp encoders we're keeping, update their coding style, and refresh their documenting comments. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 2d70f533eab0a0cabd05ee878b6709707bf63c86 Author: Chuck Lever Date: Tue Dec 14 14:54:40 2010 +0000 NFS: Remove old NFSv2 encoder functions Clean up: Remove unused legacy argument encoder functions, and any now unused encoder helper functions. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 25a0866cc63281b480cc0c11ddeaccb2ffc57dc9 Author: Chuck Lever Date: Tue Dec 14 14:54:30 2010 +0000 NFS: Introduce new-style XDR encoding functions for NFSv2 We're interested in taking advantage of the safety benefits of xdr_streams. These data structures allow more careful checking for buffer overflow while encoding. More careful type checking is also introduced in the new functions. For efficiency, we also eventually want to be able to pass xdr_streams from call_encode() to all XDR encoding functions, rather than building an xdr_stream in every XDR encoding function in the kernel. To do this means all encoders must be ready to handle a passed-in xdr_stream. The new encoders follow the modern paradigm for XDR encoders: BUG on any error, and always return a zero status code. Static helper functions are left without the "inline" directive. This allows the compiler to choose automatically how to optimize these for size or speed. Signed-off-by: Chuck Lever Tested-by: J. Bruce Fields Signed-off-by: Trond Myklebust commit 67b989a0c17e34a7c2c095e58a2f3d1b4408e3cb Merge: 56a8bd6 69479f8 Author: Dmitry Torokhov Date: Thu Dec 16 09:17:48 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt into next Conflicts: drivers/input/Makefile commit b2837fcf4994e699a4def002e26f274d95b387c1 Author: Anton Salikhmetov Date: Thu Dec 16 18:08:41 2010 +0200 hfsplus: %L-to-%ll, macro correction, and remove unneeded braces Clean-up based on checkpatch.pl report against unnecessary braces (`{' and `}'), non-standard format option %Lu (%llu recommended) as well as one trailing statement in a macro definition which should have been on the next line. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 20b7643d8ee44254fc972d42655bace81e7ab50a Author: Anton Salikhmetov Date: Thu Dec 16 18:08:40 2010 +0200 hfsplus: spaces/indentation clean-up Fix incorrect spaces and indentation reported by checkpatch.pl. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 21f2296a598c4089e0a9bdf54634269ac913a693 Author: Anton Salikhmetov Date: Thu Dec 16 18:08:39 2010 +0200 hfsplus: C99 comments clean-up Match coding style restriction against C99 comments where checkpatch.pl reported errors about their usage. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd Author: Anton Salikhmetov Date: Thu Dec 16 18:08:38 2010 +0200 hfsplus: over 80 character lines clean-up Match coding style line length limitation where checkpatch.pl reported over-80-character-line warnings. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit 596276c3571e2108f4b336be545ece2eacf3da59 Author: Anton Salikhmetov Date: Thu Dec 16 14:44:51 2010 +0200 hfsplus: fix an artifact in ioctl flag checking Fix a flag checking artifact in hfsplus_ioctl_getflags() routine found while doing clean-up against assignments inside `if's. Signed-off-by: Anton Salikhmetov Signed-off-by: Christoph Hellwig commit f3c1e66f79f6a19951da10035c46faccc536ad59 Merge: 8ae47c1 30a7caa Author: Jens Axboe Date: Thu Dec 16 17:59:39 2010 +0100 Merge branch 'for-2.6.38/event-handling' into for-next commit 30a7caabbb8e8702b9cf453fee83f773d8b3430d Author: Jens Axboe Date: Thu Dec 16 17:58:50 2010 +0100 cdrom: export cdrom_check_events() It's used by sr, so we need to export it. Signed-off-by: Jens Axboe commit 30fac30103185d853cb5cdb4bbed70d629d6da7e Author: Takashi Iwai Date: Thu Dec 16 17:55:42 2010 +0100 ALSA: hda - Clean up dead code in patch_realtek.c Signed-off-by: Takashi Iwai commit 8ae47c1e7deda7fa959a1dd272ff67e8a1830490 Merge: c4ffa14 c8d2e93 Author: Jens Axboe Date: Thu Dec 16 17:54:38 2010 +0100 Merge branch 'for-2.6.38/event-handling' into for-next commit c4ffa146849099e9178d3fcfa48ba114d3d1e432 Merge: 82cc2e4 e4ea0c1 Author: Jens Axboe Date: Thu Dec 16 17:54:32 2010 +0100 Merge branch 'for-2.6.38/core' into for-next commit c8d2e937355d02db3055c2fc203e5f017297ee1f Author: Tejun Heo Date: Wed Dec 8 20:57:42 2010 +0100 sd: implement sd_check_events() Replace sd_media_change() with sd_check_events(). sd used to set the changed state whenever the device is not ready, which can cause event loop while the device is not ready. Media presence handling code is changed such that the changed state is set iff the media presence actually changes. UA still always sets the changed state and NOT_READY always (at least where it used to set ->changed) clears media presence, so no event is lost. Signed-off-by: Tejun Heo Cc: Kay Sievers Signed-off-by: Jens Axboe commit 93aae17af1172c40c6f74b7294e93a90c3cfaa5d Author: Tejun Heo Date: Thu Dec 16 17:52:17 2010 +0100 sr: implement sr_check_events() Replace sr_media_change() with sr_check_events(). It normally only uses GET_EVENT_STATUS_NOTIFICATION to check both media change and eject request. If @clearing includes DISK_EVENT_MEDIA_CHANGE, it issues TUR and compares whether media presence has changed. The SCSI specific media change uevent is kept for compatibility. sr_media_change() was doing both media change check and revalidation. The revalidation part is split into sr_block_revalidate_disk(). Signed-off-by: Tejun Heo Cc: Kay Sievers Signed-off-by: Jens Axboe commit 9f8a2c23c6c1140f515f601265c4dff7522110b7 Author: Tejun Heo Date: Wed Dec 8 20:57:40 2010 +0100 scsi: replace sr_test_unit_ready() with scsi_test_unit_ready() The usage of TUR has been confusing involving several different commits updating different parts over time. Currently, the only differences between scsi_test_unit_ready() and sr_test_unit_ready() are, * scsi_test_unit_ready() also sets sdev->changed on NOT_READY. * scsi_test_unit_ready() returns 0 if TUR ended with UNIT_ATTENTION or NOT_READY. Due to the above two differences, sr is using its own sr_test_unit_ready(), but sd - the sole user of the above extra handling - doesn't even need them. Where scsi_test_unit_ready() is used in sd_media_changed(), the code is looking for device ready w/ media present state which is true iff TUR succeeds w/o sense data or UA, and when the device is not ready for whatever reason sd_media_changed() explicitly marks media as missing so there's no reason to set sdev->changed automatically from scsi_test_unit_ready() on NOT_READY. Drop both special handlings from scsi_test_unit_ready(), which makes it equivalant to sr_test_unit_ready(), and replace sr_test_unit_ready() with scsi_test_unit_ready(). Also, drop the unnecessary explicit NOT_READY check from sd_media_changed(). Checking return value is enough for testing device readiness. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 638428ece619495edc9579b1e21493eb00f9687c Author: Tejun Heo Date: Thu Dec 9 11:18:42 2010 +0100 scsi: fix TUR error handling in sr_media_change() sr_test_unit_ready() returns 0 iff TUR succeeded - IOW, when media is present and the device is actually ready, so the return value wouldn't be zero when TUR ends with sense data. sr_media_change() incorrectly tests (retval || (scsi_sense_valid(sshdr)...)) when it tries to test whether TUR failed without sense data or with sense data indicating media-not-present. Fix the test using scsi_status_is_good() and update comments. - Fixed a comment typo spotted by Eike. Signed-off-by: Tejun Heo Cc: Rolf Eike Beer Signed-off-by: Jens Axboe commit 2d9217296bfa6fdc0d3707264076e5296faffdbd Author: Tejun Heo Date: Wed Dec 8 20:57:38 2010 +0100 cdrom: add ->check_events() support In principle, cdrom just needs to pass through ->check_events() but CDROM_MEDIA_CHANGED ioctl makes things a bit more complex. Just as with ->media_changed() support, cdrom code needs to buffer the events and serve them to ioctl and vfs as requested. As the code has to deal with both ->check_events() and ->media_changed(), and vfs and ioctl event buffering, this patch adds check_events caching on top of the existing cdi->mc_flags buffering. It may be a good idea to deprecate CDROM_MEDIA_CHANGED ioctl and remove all this mess. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit 77ea887e433ad8389d416826936c110fa7910f80 Author: Tejun Heo Date: Wed Dec 8 20:57:37 2010 +0100 implement in-kernel gendisk events handling Currently, media presence polling for removeable block devices is done from userland. There are several issues with this. * Polling is done by periodically opening the device. For SCSI devices, the command sequence generated by such action involves a few different commands including TEST_UNIT_READY. This behavior, while perfectly legal, is different from Windows which only issues single command, GET_EVENT_STATUS_NOTIFICATION. Unfortunately, some ATAPI devices lock up after being periodically queried such command sequences. * There is no reliable and unintrusive way for a userland program to tell whether the target device is safe for media presence polling. For example, polling for media presence during an on-going burning session can make it fail. The polling program can avoid this by opening the device with O_EXCL but then it risks making a valid exclusive user of the device fail w/ -EBUSY. * Userland polling is unnecessarily heavy and in-kernel implementation is lighter and better coordinated (workqueue, timer slack). This patch implements framework for in-kernel disk event handling, which includes media presence polling. * bdops->check_events() is added, which supercedes ->media_changed(). It should check whether there's any pending event and return if so. Currently, two events are defined - DISK_EVENT_MEDIA_CHANGE and DISK_EVENT_EJECT_REQUEST. ->check_events() is guaranteed not to be called parallelly. * gendisk->events and ->async_events are added. These should be initialized by block driver before passing the device to add_disk(). The former contains the mask of all supported events and the latter the mask of all events which the device can report without polling. /sys/block/*/events[_async] export these to userland. * Kernel parameter block.events_dfl_poll_msecs controls the system polling interval (default is 0 which means disable) and /sys/block/*/events_poll_msecs control polling intervals for individual devices (default is -1 meaning use system setting). Note that if a device can report all supported events asynchronously and its polling interval isn't explicitly set, the device won't be polled regardless of the system polling interval. * If a device is opened exclusively with write access, event checking is automatically disabled until all write exclusive accesses are released. * There are event 'clearing' events. For example, both of currently defined events are cleared after the device has been successfully opened. This information is passed to ->check_events() callback using @clearing argument as a hint. * Event checking is always performed from system_nrt_wq and timer slack is set to 25% for polling. * Nothing changes for drivers which implement ->media_changed() but not ->check_events(). Going forward, all drivers will be converted to ->check_events() and ->media_change() will be dropped. Signed-off-by: Tejun Heo Cc: Kay Sievers Cc: Jan Kara Signed-off-by: Jens Axboe commit d2bf1b6723ed0eab378363649d15b7893bf14e91 Author: Tejun Heo Date: Wed Dec 8 20:57:36 2010 +0100 block: move register_disk() and del_gendisk() to block/genhd.c There's no reason for register_disk() and del_gendisk() to be in fs/partitions/check.c. Move both to genhd.c. While at it, collapse unlink_gendisk(), which was artificially in a separate function due to genhd.c / check.c split, into del_gendisk(). Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit dddd9dc340ae1a41d90e084529ca979c77c4ecfe Author: Tejun Heo Date: Wed Dec 8 20:57:35 2010 +0100 block: kill genhd_media_change_notify() There's no user of the facility. Kill it. Signed-off-by: Tejun Heo Signed-off-by: Jens Axboe commit eeb433876cf59438a1e1600a957ff6cc99c860eb Author: Anisse Astier Date: Thu Dec 16 12:19:47 2010 +0100 ALSA: hda - factorize an automute_mic realtek quirk function Multiple quirk functions were using the exact same code to verify if the Mic jack was plugged and mute the Mic accordingly Signed-off-by: Anisse Astier Signed-off-by: Takashi Iwai commit 846f40455276617275284a4b76b89311b4aed0b9 Author: Steven Whitehouse Date: Thu Dec 16 15:18:48 2010 +0000 GFS2: Don't flush delete workqueue when releasing the transaction lock There is no requirement to flush the delete workqueue before a gfs2 filesystem is suspended. The workqueue's work will just be suspended along with the rest of the tasks on the filesystem. The resolves a deadlock situation where the transaction lock's demotion code was trying to flush the delete workqueue while at the same time, the workqueue was waiting for the transaction lock. The delete workqueue is flushed by gfs2_make_fs_ro() already, so that umount/remount are correctly protected anyway. Signed-off-by: Steven Whitehouse commit 7d5f01ad536afebde9a1c81d985f8d0eaf2a9ab6 Author: Sedat Dilek Date: Thu Dec 16 12:46:23 2010 +0100 iwlwifi: Fix error: struct iwl_lq_sta has no member named dbg_fixed_rate While compiling linux-next (next-20101216) I fell over this breakage: ... drivers/net/wireless/iwlwifi/iwl-agn-rs.c: In function ‘iwl_rs_rate_init’: drivers/net/wireless/iwlwifi/iwl-agn-rs.c:2876:8: error: ‘struct iwl_lq_sta’ has no member named ‘dbg_fixed_rate’ dbg_fixed_rate is only used when CONFIG_MAC80211_DEBUGFS is set: [ drivers/net/wireless/iwlwifi/iwl-agn-rs.h ] ... #ifdef CONFIG_MAC80211_DEBUGFS struct dentry *rs_sta_dbgfs_scale_table_file; struct dentry *rs_sta_dbgfs_stats_table_file; struct dentry *rs_sta_dbgfs_rate_scale_data_file; struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file; u32 dbg_fixed_rate; #endif The issue was introduced by commit a1da077bc36368eb7d6312e7e49260f0a3d92c77: "iwlwifi: clear dbg_fixed_rate during init" Signed-off-by: Sedat Dilek Signed-off-by: John W. Linville commit e137478b56fd79c397b5c5c74fc08c049a42835a Author: John W. Linville Date: Thu Dec 16 09:20:16 2010 -0500 rtlwifi: convert to __packed notation Use "__packed" instead of "__attribute__ ((packed))"... Signed-off-by: John W. Linville commit 1bf84759bdcc08933b22ee70722f1575ad84f9b9 Author: Margarita Olaya Cabrera Date: Tue Dec 14 19:00:21 2010 -0600 ASoC: twl6040: Add ramp up/down volume for HS and HF Add ramp functions for the headset and handsfree outputs in order to reduce the pops during power on/off sequences. In order to give more control to volume ramp, step size and delay between steps can be specified. The patches are based on wm8350 implementation from Liam Girdwood. Signed-off-by: Margarita Olaya Cabrera Signed-off-by: Misael Lopez Cruz Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7639dae0ca11038286bbbcda05f2bef601c1eb8d Author: Peter Zijlstra Date: Tue Dec 14 21:26:40 2010 +0100 perf, x86: Provide a PEBS capable cycle event Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit abe43400579d5de0078c2d3a760e6598e183f871 Author: Peter Zijlstra Date: Wed Nov 17 23:17:37 2010 +0100 perf: Sysfs enumeration Simple sysfs emumeration of the PMUs. Use a "event_source" bus, and add PMU devices using their name. Each PMU device has a type attribute which contrains the value needed for perf_event_attr::type to identify this PMU. This is the minimal stub needed to start using this interface, we'll consider extending the sysfs usage later. Cc: Kay Sievers Cc: Greg KH Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.316982569@chello.nl> Signed-off-by: Ingo Molnar commit 2e80a82a49c4c7eca4e35734380f28298ba5db19 Author: Peter Zijlstra Date: Wed Nov 17 23:17:36 2010 +0100 perf: Dynamic pmu types Extend the perf_pmu_register() interface to allow for named and dynamic pmu types. Because we need to support the existing static types we cannot use dynamic types for everything, hence provide a type argument. If we want to enumerate the PMUs they need a name, provide one. Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.259707703@chello.nl> Signed-off-by: Ingo Molnar commit 9f58a205c62d0dad1df38d076324a89b1a0f1d65 Author: Peter Zijlstra Date: Wed Nov 17 23:17:35 2010 +0100 init: Initialized IDR earlier perf_event_init() wants to start using IDR trees, its needs in turn are satisfied by mm_init(). Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.206992649@chello.nl> Signed-off-by: Ingo Molnar commit 24a24bb6ff3dc3a09bb131241be920ecc3f0e519 Author: Peter Zijlstra Date: Wed Nov 17 23:17:33 2010 +0100 perf: Move perf_event_init() into main.c Currently we call perf_event_init() from sched_init(). In order to make it more obvious move it to the cannnonical location. Signed-off-by: Peter Zijlstra LKML-Reference: <20101117222056.093629821@chello.nl> Signed-off-by: Ingo Molnar commit 4407204c5c9037763aadce39b025529dfbfcac9e Author: Peter Zijlstra Date: Wed Dec 8 15:56:23 2010 +0100 perf, x86: Detect broken BIOSes that corrupt the PMU Some BIOSes use PMU resources, which can cause various bugs: - Non-working or erratic PMU based statistics - the PMU can end up counting the wrong thing, resulting in misleading statistics - Profiling can stop working or it can profile the wrong thing - A non-working or erratic NMI watchdog that cannot be relied on - The kernel may disturb whatever thing the BIOS tries to use the PMU for - possibly causing hardware malfunction in extreme cases. - ... and other forms of potential misbehavior Various forms of such misbehavior has been observed in practice - there are BIOSes that just corrupt the PMU state, consequences be damned. The PMU is a CPU resource that is handled by the kernel and the BIOS stealing+corrupting it is not acceptable nor robust, so we detect it, warn about it and further refuse to touch the PMU ourselves. Signed-off-by: Peter Zijlstra Cc: Jason Wessel Cc: Don Zickus Cc: Linus Torvalds Cc: Thomas Gleixner Cc: "H. Peter Anvin" LKML-Reference: Signed-off-by: Ingo Molnar commit 69479f8da68f1930b2078b2ebf6533fb00339918 Author: Dmitry Torokhov Date: Thu Dec 9 01:08:26 2010 -0800 Input: include MT library as source for kerneldoc Signed-off-by: Dmitry Torokhov Signed-off-by: Henrik Rydberg commit 7f9c2454010159e871e9416dcf64b1e6bfce78be Author: Henrik Rydberg Date: Tue Dec 7 09:18:28 2010 +0100 MAINTAINERS: Update input-mt entry The input multitouch core is now located in its own file, and maintained via a git tree. Update the maintainers entry accordingly. Signed-off-by: Henrik Rydberg commit 28906ad6d7c8a8090f720cf7c39461df0b1460f6 Author: Richard Nauber Date: Tue Dec 14 22:36:18 2010 +0100 hid: egalax: Add support for Samsung NB30 netbook The Samsung NB30 touch has a DWAV dual-touch device. This patch adds the NB30 to the list of supported devices, and grabs it accordingly in hid-core. [rydberg@euromail.se: rename and log message changes] Signed-off-by: Richard Nauber Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit e12b355b57b4d330be3479b1e9a518cfed59866c Author: Henrik Rydberg Date: Mon Nov 29 14:40:11 2010 +0100 hid: egalax: Document the new devices in Kconfig Add the new supported devices to the kernel menu config help text. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 006b20fe4c69189b0d854e5eabf269e50ca86cdd Merge: 5f29805 d949750 Author: Ingo Molnar Date: Thu Dec 16 11:22:25 2010 +0100 Merge branch 'perf/urgent' into perf/core Merge reason: We want to apply a dependent patch. Signed-off-by: Ingo Molnar commit 4e93db23bf95cd763c9182b5d6187412fe6ce747 Author: Henrik Rydberg Date: Mon Nov 29 07:27:49 2010 +0100 hid: egalax: Add support for Wetab The Wetab tablet dual-touch controller works the same way as the one in the Joojoo tablet. This patch adds the Wetab to the list of supported devices, and grabs it accordingly in hid-core. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit f7bc8046b33b9fb2e61318f885cc5d94e0a6b805 Author: Henrik Rydberg Date: Mon Dec 6 14:04:21 2010 +0100 hid: egalax: Convert to MT slots The firmware in the joojoo reports touches sequentially, one per report, which confuses the current driver. A further complication is the absense of any indication of a touch frame. This patch converts the driver to the MT slots protocol, and outputs one full touch frame per report. This way, proper handling for both firmwares is ensured. Tested-by: Philipp Merkel Cc: Stephane Chatty Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit 17c760687f1270af9bd798d938198caa7d5aa3eb Author: Henrik Rydberg Date: Mon Oct 11 21:20:51 2010 +0200 hid: egalax: Add event filtering Use estimated signal-to-noise ratios to reduce noise and limit the amount of events emitted. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 80a469e4f4d01ad96447f85cc71a379ec82ffe2d Author: Henrik Rydberg Date: Mon Oct 11 21:16:43 2010 +0200 hid: egalax: Report zero as minimum pressure The firmware reports a logical minimum of one, but in order for userspace applications to correctly map all reported values to non-zero pressure, the driver needs to report a logical minimum of zero. Fixed with this patch. Tested-by: Philipp Merkel Cc: Stephane Chatty Signed-off-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit b88cbd3a007608a224fad5413de6170c75afd5a7 Author: Henrik Rydberg Date: Wed Oct 13 22:18:32 2010 +0200 hid: egalax: Correct for device resolution report error The firmware of both supported devices report a X/Y maximum of 4095, whereas in reality, it is eight times larger. Fixed with this patch. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit 4a864183fb28ddf553e5b0b47858bc3c518dae94 Author: Henrik Rydberg Date: Sat Nov 27 17:56:17 2010 +0100 hid: egalax: Setup input device manually The hid core does not yet handle input filtering. Take over the setup of the input device, so that proper signal-to-noise ratios can be used. Signed-off-by: Jiri Kosina Cc: Stephane Chatty Signed-off-by: Henrik Rydberg commit e42a98b520bb22535687ead3120e80edc268279a Author: Henrik Rydberg Date: Mon Dec 6 10:05:43 2010 +0100 input: mt: Add hovering distance axis Touch devices capable of hovering, i.e., fingers detected a distance from the surface, are not supported by the current input MT protocol. This patch adds ABS_MT_DISTANCE, which may be used to indicate the distance between the contact and the surface. Signed-off-by: Henrik Rydberg commit c5f4dec1ceb6ab773bbbefbe64a7c990c7d6b17f Author: Henrik Rydberg Date: Wed Dec 15 13:50:34 2010 +0100 input: mt: Move tracking and pointer emulation to input-mt The drivers using the type B protocol all report tracking information the same way. The contact id is semantically equivalent to ABS_MT_SLOT, and the handling of ABS_MT_TRACKING_ID only complicates the driver. The situation can be improved upon by providing a common pointer emulation code, thereby removing the need for the tracking id in the driver. This patch moves all tracking event handling over to the input core, simplifying both the existing drivers and the ones currently in preparation. Acked-by: Ping Cheng Acked-by: Jiri Kosina Signed-off-by: Henrik Rydberg commit 8cde81001626c4c60b26ef2eb5fc522885ed9fd0 Author: Henrik Rydberg Date: Sat Nov 27 10:50:54 2010 +0100 input: mt: Collect slots initialization code The MT slots devices all follow the same initialization pattern of creating slots and hinting about buffer size. Let drivers call an initialization function instead, and make sure it can be called repeatedly without side effects. Signed-off-by: Henrik Rydberg commit 47c78e891323513e9909729b44033e2c6649e2b7 Author: Henrik Rydberg Date: Sat Nov 27 09:16:48 2010 +0100 input: mt: Break out slots handling In preparation for common code to handle a larger set of MT slots devices, move the slots handling over to a separate file. Signed-off-by: Henrik Rydberg commit cfc069d3fa24d7c6357e3b731e97f94db495bf0c Author: Sunil Mushran Date: Tue Dec 14 14:14:31 2010 -0800 ocfs2/cluster: Pin the local node when o2hb thread starts The patch pins the node item of the local node when the o2hb thread starts and unpins on stop. An earlier patch pinned the node item of the remote node on o2net connect and unpinned on disconnect. Signed-off-by Sunil Mushran Signed-off-by: Joel Becker commit cb0586bd4c77c531fe0be4ae860ec642450eeda5 Author: Sunil Mushran Date: Tue Dec 14 14:14:30 2010 -0800 ocfs2/cluster: Show pin state for each o2hb region This patch adds a per o2hb region debugfs file that shows whether that region is pinned or not. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 58a3158a5d17ddf4894db9e8ccaf92093ff8e42e Author: Sunil Mushran Date: Tue Dec 14 14:14:29 2010 -0800 ocfs2/cluster: Pin/unpin o2hb regions This patch adds support for pinning o2hb regions in configfs. Pinning disallows a region to be cleanly stopped as long as it has an active dependent user (read o2dlm). In local heartbeat mode, the region uuid matching the domain name is pinned as long as the o2dlm domain is active. In global heartbeat mode, all regions are pinned as long as there is atleast one dependent user and the region count is 3 or less. All regions are unpinned if the number of dependent users is zero or region count is greater than 3. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit ffee223a9af4c5124beb56fa5c84132949923d23 Author: Sunil Mushran Date: Tue Dec 14 14:14:28 2010 -0800 ocfs2/cluster: Remove dropped region from o2hb quorum region bitmap Patch removes a dropped region from the quorum region bitmap maintained by o2hb. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 2b190ce9bf923fb1fd8ccff18e9bab72da40da06 Author: Sunil Mushran Date: Tue Dec 14 14:14:27 2010 -0800 ocfs2/cluster: Pin the remote node item in configfs o2net pins the node item of the remote node in configfs before initiating the connection. It is unpinned on disconnect. This is to prevent the node item from being unlinked while it is still in use. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 66f4500573fe5a1b455e5f7b30068a623a94117f Author: Wengang Wang Date: Wed Dec 8 20:34:39 2010 +0800 ocfs2/dlm: make existing convertion precedent over new lock Make existing convertion precedent over new lock. It makes o2dlm locking more like fair locking. Signed-off-by: Wengang Wang Signed-off-by: Joel Becker commit 8e17d16f401f7c60908726e070bfa5cbdf31e2f3 Author: Sunil Mushran Date: Fri Nov 19 15:06:49 2010 -0800 ocfs2/dlm: Cleanup mlogs in dlmthread.c, dlmast.c and dlmdomain.c Add the domain name and the resource name in the mlogs. Signed-off-by: Sunil Mushran Signed-off-by: Joel Becker commit 50308d813bf26500fed671882469939fd19403a3 Author: Tao Ma Date: Thu Nov 4 15:14:11 2010 +0800 ocfs2: Try to free truncate log when meeting ENOSPC in write. Recently, one of our colleagues meet with a problem that if we write/delete a 32mb files repeatly, we will get an ENOSPC in the end. And the corresponding bug is 1288. http://oss.oracle.com/bugzilla/show_bug.cgi?id=1288 The real problem is that although we have freed the clusters, they are in truncate log and they will be summed up so that we can free them once in a whole. So this patch just try to resolve it. In case we see -ENOSPC in ocfs2_write_begin_no_lock, we will check whether the truncate log has enough clusters for our need, if yes, we will try to flush the truncate log at that point and try again. This method is inspired by Mark Fasheh . Thanks. Cc: Mark Fasheh Signed-off-by: Tao Ma Signed-off-by: Joel Becker commit 56a8bd6dcf81693e61a712097216904f3a4ab536 Author: Tony SIM Date: Wed Dec 15 23:39:25 2010 -0800 Input: add ST1232 touchscreen controller driver This patch introduces support for Sitronix ST1232 integrated capacitive touchscreen with LCD module. The touchscreen is multitouch capable and can report coordinates of up to two contact points. Signed-off-by: Tony SIM Reviewed-by: Trilok Soni Acked-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov commit f113fe4e844be15394edcbc32b0ec196cdd0a0ff Author: Eric Miao Date: Tue Nov 23 17:00:03 2010 +0800 ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume Signed-off-by: Eric Miao commit 2a125dd56b3a853701063fe8a678ad7603e385fd Author: Eric Miao Date: Mon Nov 22 22:48:49 2010 +0800 ARM: pxa: remove get_memclk_frequency_10khz() Introduce 'struct clk' for memory and remove get_memclk_frequency_10khz(). Signed-off-by: Eric Miao commit 4029813c89926ae5d78cc2dff49d845d934424f6 Author: Eric Miao Date: Mon Nov 22 10:49:55 2010 +0800 ARM: pxa: separate the clock support into clock-{pxa2xx,pxa3xx}.c Signed-off-by: Eric Miao commit 2e8581e756ddbd0dea8b0d4059e9a82d2929de01 Author: Eric Miao Date: Mon Nov 22 09:41:39 2010 +0800 ARM: pxa: replace duplicated macro DEFINE_PXA3_CK() with DEFINE_CK() Signed-off-by: Eric Miao commit bb71bdd31b48efa2b9834f1a47eb5f657e3c217c Author: Haojian Zhuang Date: Wed Nov 17 19:03:36 2010 +0800 ARM: pxa: redefine irqs.h Define all IRQs in irqs.h. If some IRQs are sharing one IRQ number, define them together. If some IRQs are sharing same name with different IRQ number, define different IRQ. Signed-off-by: Haojian Zhuang Cc: Eric Miao Signed-off-by: Eric Miao commit d04e67cd1d088762c17e8edf08fbc14e4af1981a Author: Haojian Zhuang Date: Wed Nov 17 19:03:35 2010 +0800 ARM: pxa: redefine the cpu_is_pxa3xx After introducing pxa930/pxa935 and new silicons, original cpuid rules of XScale generation 3 can't fit new silicons. Now redefine the rule of PXA3xx. Only PXA300/PXA310/PXA320/PXA930/PXA935 are family members of PXA3xx. PXA930/PXA935 are family members of PXA93x. PXA93x can be considered as PXA3xx + CP. Signed-off-by: Haojian Zhuang Cc: Eric Miao Signed-off-by: Eric Miao commit d38bdf48f30f5dc0fac4c1ab656aff74f6804f07 Author: Haojian Zhuang Date: Thu Nov 25 14:21:32 2010 +0800 ARM: mmp: fix the typo - MMP2 is compatible with ARMv7 Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 13dee960f37b3769baa0eae9d1de4a7ca9a2e999 Author: Haojian Zhuang Date: Thu Nov 25 11:33:13 2010 +0800 ARM: mmp: append brownstone support Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 7bdba92dcaefdc69c339db9e23861e5e21d3a2c4 Author: cxie4 Date: Tue Nov 23 10:43:22 2010 +0800 ARM: mmp: add usb clock for pxa168/pxa910 Signed-off-by: Chao Xie Signed-off-by: Eric Miao commit aa11781671279c67d56b95c4d73cde5cd1a6d594 Author: Daniel Mack Date: Thu Nov 4 14:44:01 2010 -0400 ARM: pxa/raumfeld: enable PXA3XX_GCU driver Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 364dbdf3b6c31a4a5fb7a6d479e7aafb4a7a10b6 Author: Daniel Mack Date: Thu Nov 4 14:44:00 2010 -0400 video: add driver for PXA3xx 2D graphics accelerator This adds a driver for the the 2D graphics accelerator found on PXA3xx processors. Only resource mapping, interrupt handling and a simple ioctl handler is done by the kernel part, the rest of the logic is implemented in DirectFB userspace. Graphic applications greatly benefit for line drawing, blend, and rectangle and triangle filling operations. Benchmarks done on a PXA303 using the df_dok benchmarking tool follow, where the value in square brackets show the CPU usage during that test. Without accelerator (benchmarking 256x252 on 480x262 RGB16 (16bit)): Anti-aliased Text 3.016 secs ( 65.649 KChars/sec) [ 99.6%] Fill Rectangle 3.021 secs ( 175.107 MPixel/sec) [ 98.0%] Fill Rectangle (blend) 3.582 secs ( 3.602 MPixel/sec) [ 99.7%] Fill Rectangles [10] 3.177 secs ( 182.753 MPixel/sec) [ 98.1%] Fill Rectangles [10] (blend) 18.020 secs ( 3.580 MPixel/sec) [ 98.7%] Fill Spans 3.019 secs ( 145.306 MPixel/sec) [ 98.0%] Fill Spans (blend) 3.616 secs ( 3.568 MPixel/sec) [ 99.4%] Blit 3.074 secs ( 39.874 MPixel/sec) [ 98.0%] Blit 180 3.020 secs ( 32.042 MPixel/sec) [ 98.0%] Blit with format conversion 3.005 secs ( 19.321 MPixel/sec) [ 99.6%] Blit from 32bit (blend) 4.792 secs ( 2.692 MPixel/sec) [ 98.7%] With accelerator: Anti-aliased Text 3.056 secs (* 36.518 KChars/sec) [ 21.3%] Fill Rectangle 3.015 secs (* 115.543 MPixel/sec) [ 8.9%] Fill Rectangle (blend) 3.180 secs (* 20.286 MPixel/sec) [ 1.8%] Fill Rectangles [10] 3.251 secs (* 119.062 MPixel/sec) [ 1.2%] Fill Rectangles [10] (blend) 6.293 secs (* 20.502 MPixel/sec) [ 0.3%] Fill Spans 3.051 secs (* 97.264 MPixel/sec) [ 35.7%] Fill Spans (blend) 3.377 secs (* 15.282 MPixel/sec) [ 17.8%] Blit 3.046 secs (* 27.533 MPixel/sec) [ 2.6%] Blit 180 3.098 secs (* 27.070 MPixel/sec) [ 2.2%] Blit with format conversion 3.131 secs (* 39.148 MPixel/sec) [ 2.8%] Blit from 32bit (blend) 3.346 secs (* 11.568 MPixel/sec) [ 0.8%] Signed-off-by: Daniel Mack Tested-by: Sven Neumann Cc: Eric Miao Cc: Denis Oliver Kropp Cc: Sven Neumann Cc: Haojian Zhuang Signed-off-by: Eric Miao commit fe805986b20a86257e6de8cb12a7e5b991925aab Author: Zhangfei Gao Date: Wed Nov 3 01:15:32 2010 -0400 ARM: mmp: add sd card to jasper Signed-off-by: Zhangfei Gao Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 5382f419c128c85af3933958d73b18ed063d0264 Author: Zhangfei Gao Date: Wed Sep 29 16:18:51 2010 -0400 ARM: mmp: add mmc resource Signed-off-by: Zhangfei Gao Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit ad68bb9f7a3cd47396635a5e3895215af57579da Author: Marek Vasut Date: Wed Nov 3 16:29:35 2010 +0100 ARM: pxa: Access SMEMC via virtual addresses This is important because on PXA3xx, the physical mapping of SMEMC registers differs from the one on PXA2xx. In order to get PCMCIA working on both PXA2xx and PXA320, the PCMCIA driver was adjusted accordingly as well. Also, various places in the kernel had to be patched to use __raw_read/__raw_write. Signed-off-by: Marek Vasut Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit 851982c1b6ca18cedf6d01e4529a0c1ddb30771e Author: Marek Vasut Date: Mon Oct 11 02:20:19 2010 +0200 ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() This patch introduces pxa2xx_map_io() and pxa3xx_map_io() to distinguish between PXA25x/PXA27x and PXA3xx memory mapping. Also, fixup for platforms broken after introducing pxa{25x,27x}_map_io() and pxa3xx_map_io() is included. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 64ed267bdac799485a938dd2cba8243ba383cd5f Author: Eric Miao Date: Wed Oct 13 14:51:25 2010 +0800 ARM: pxa: introduce addr-map.h for large bus addresses and ranges Signed-off-by: Eric Miao commit ead67b6e6679b14befb0cef59db60e2853e19cd8 Author: Eric Miao Date: Wed Oct 13 10:38:56 2010 +0800 ARM: pxa: remove un-used mapping of camera registers The camera registers start and range are encoded into the platform device, and are actually handled by ioremap()'ed, thus the mapping in pxa_map_io() is not necessary. Signed-off-by: Eric Miao commit b08ebe7e776e5be0271ed1e1bbb384e1f29dd117 Author: Alex Deucher Date: Fri Dec 3 15:34:16 2010 -0500 drm/radeon/kms: properly print ontario chip id Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b4183e301ac1dfaf93e3e92fd70a0c3203c5a27d Author: Alex Deucher Date: Wed Dec 15 11:04:10 2010 -0500 drm/radeon/kms: fix vram start calculation on ontario (v2) Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit ca9693a17368041dd5416b0f1f93daaf7a5a5308 Merge: b921bae c45aada Author: Dave Airlie Date: Thu Dec 16 14:49:02 2010 +1000 Merge remote branch 'nouveau/drm-nouveau-next' of ../drm-nouveau-next into drm-core-next * 'nouveau/drm-nouveau-next' of ../drm-nouveau-next: (93 commits) drm/nv50: fix a couple of vm init issues drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation. drm/nouveau: kick vram functions out into an "engine" drm/nouveau: allow gpuobj vinst to be a virtual address when necessary drm/nv50: tidy up PCIEGART implementation drm/nv50: enable non-contig vram allocations where requested drm/nv50: enable 4KiB pages for small vram allocations drm/nv50: implement global channel address space on new VM code drm/nv50: implement BAR1/BAR3 management on top of new VM code drm/nv50: import new vm code drm/nv50: implement custom vram mm drm/nouveau: Avoid potential race between nouveau_fence_update() and context takedown. drm/nouveau: fix use of drm_mm_node in semaphore object drm/nouveau: wrap calls to ttm_bo_validate() drm/nouveau: no need to zero dma objects, we fill them completely anyway drm/nouveau: introduce a util function to wait on reg != val drm/nouveau: implicitly insert non-DMA objects into RAMHT drm/nouveau: make fifo.create_context() responsible for mapping control regs drm/nouveau: Spin for a bit in nouveau_fence_wait() before yielding the CPU. drm/nouveau: Use WC memory on the AGP GART. ... commit b921bae2eedc806b118a03d986cf0be9ffd3af40 Author: Ben Skeggs Date: Thu Dec 16 14:47:46 2010 +1000 drm/ttm: delay freeing of old node during move_memcpy until after iounmap Drivers using their own implementation of io_mem_reserve/io_mem_free are likely to store the tracking information for the map in mem.mm_node, so it can't be freed while still mapped. Signed-off-by: Ben Skeggs Reviewed-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 99ee7fac189893c90145a22b86bbcfdc98f69a9c Author: Dave Airlie Date: Tue Nov 23 11:47:49 2010 +1000 drm/radeon: add initial tracepoint support. this adds a bo create, and fence seq tracking tracepoints. This is just an initial set to play around with, we should investigate what others we need would be useful. Signed-off-by: Dave Airlie commit a2595b8aa67011419dae26b47e474f46df902989 Author: Theodore Ts'o Date: Wed Dec 15 20:30:48 2010 -0500 ext4: Add second mount options field since the s_mount_opt is full up Signed-off-by: "Theodore Ts'o" commit 673c610033a8202c037ecd068c7a235495acda17 Author: Theodore Ts'o Date: Wed Dec 15 20:28:48 2010 -0500 ext4: Move struct ext4_mount_options from ext4.h to super.c Move the ext4_mount_options structure definition from ext4.h, since it is only used in super.c. Signed-off-by: "Theodore Ts'o" commit fd8c37eccdda21153298997417144b38b1623196 Author: Theodore Ts'o Date: Wed Dec 15 20:26:48 2010 -0500 ext4: Simplify the usage of clear_opt() and set_opt() macros Change clear_opt() and set_opt() to take a superblock pointer instead of a pointer to EXT4_SB(sb)->s_mount_opt. This makes it easier for us to support a second mount option field. Signed-off-by: "Theodore Ts'o" commit b5318d302f8a20eacbbfc01b0ee35b108085a363 Author: Andres Salomon Date: Mon Nov 29 23:39:51 2010 +0000 x86, olpc: Speed up device tree creation during boot Calling alloc_bootmem() for tiny chunks of memory over and over is really slow; on an XO-1, it caused the time between when the kernel started booting and when the display came alive (post-lxfb probe) to increase to 44s. This patch optimizes the prom_early_alloc function by calling alloc_bootmem for 4k-sized blocks of memory, and handing out chunks of that to callers. With this patch, the time between kernel load and display initialization decreased to 23s. If there's a better way to do this early in the boot process, please let me know. (Note: increasing the chunk size to 16k didn't noticably affect boot time, and wasted 9k.) v4: clarify comment, requested by hpa v3: fix wasted memory buglet found by Milton Miller, and style fix. v2: reorder prom_early_alloc as suggested by Grant. Signed-off-by: Andres Salomon LKML-Reference: <20101129153951.74202a84@queued.net> Signed-off-by: H. Peter Anvin commit c10d1e260f7cb6766dc76b4e36ed8f4be53f195a Author: Andres Salomon Date: Wed Nov 17 06:09:52 2010 +0000 x86, olpc: Add OLPC device-tree support Make use of PROC_DEVICETREE to export the tree, and sparc's PROMTREE code to call into OLPC's Open Firmware to build the tree. v5: fix buglet with root node check (introduced in v4) v4: address some minor style issues pointed out by Grant, and explicitly cast negative phandle checks to s32. v3: rename olpc_prom to olpc_dt - rework Kconfig entries - drop devtree build hook from proc, instead adding a call to x86's paging_init (similarly to how sparc64 does it) - switch allocation from using slab to alloc_bootmem. this allows the DT to be built earlier during boot (during setup_arch); the downside is that there are some 1200 bootmem reservations that are done during boot. Not ideal.. - add a helper olpc_ofw_is_installed function to test for the existence and successful detection of OLPC's OFW. Signed-off-by: Andres Salomon LKML-Reference: <20101116220952.26526a80@queued.net> Signed-off-by: H. Peter Anvin commit 4722d194e648fb5755faecee895b96b26f9732f3 Author: Andres Salomon Date: Fri Nov 12 05:45:26 2010 +0000 x86, of: Define irq functions to allow drivers/of/* to build on x86 - Define a stub irq_create_of_mapping for x86 as a stop-gap solution until drivers/of/irq is further along. - Define irq_dispose_mapping for x86 to appease of_i2c.c These are needed to allow stuff in drivers/of/ to build on x86. This stuff will eventually get replaced; quoting Grant, "The long term plan is to have the drivers/of/ code handling the mapping intelligently like powerpc currently does." But for now, just provide these functions. Signed-off-by: Andres Salomon LKML-Reference: <20101111214526.5de7121b@queued.net> Signed-off-by: H. Peter Anvin commit c45aadabb961501b3e64bc92d0bf12fdce26d37d Author: Francisco Jerez Date: Thu Dec 16 10:30:35 2010 +1000 drm/nv50: fix a couple of vm init issues Fixes overwriting the first page table entry when testing that the PRAMIN BAR can be correctly read/written, and adds an additional bar flush after poking the BAR3 control regs. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 0b83ae960cd7d4a5ee02786ecf41ab45688999bf Author: Matthew Wilcox Date: Wed Dec 15 15:44:06 2010 -0500 USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path If swap is on a UAS device, we could recurse into the driver by using GFP_KERNEL. Using GFP_NOIO ensures we won't. Reported-by: James Bottomley Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 89dc29051b626756e69db12f3ffb22e49a817bfe Author: Matthew Wilcox Date: Wed Dec 15 15:44:05 2010 -0500 USB: uas: Ensure we only bind to a UAS interface While all existing UAS devices use alternate interface 1, this is not guaranteed, and it has caused confusion with people trying to bind the uas driver to non-uas devices. Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 92a3f767f5cd079351ae04a337c40266e9c6048f Author: Matthew Wilcox Date: Wed Dec 15 15:44:04 2010 -0500 USB: uas: Rename sense pipe and sense urb to status pipe and status urb The spec calls this the status pipe. While it is used to receive sense IUs, it is also used to receive other IUs, so this can be confusing. Reported-by: Luben Tuikov Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit ac563cfd528033ee6e3bb4801b5c73468d0145c8 Author: Matthew Wilcox Date: Wed Dec 15 15:44:03 2010 -0500 USB: uas: Use kzalloc instead of kmalloc The IUs are not being fully initialised by the driver (due to the reserved space). Since we should be zeroing reserved fields, use kzalloc to do it for us. Reported-by: Luben Tuikov Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit 4400ef311e10666a2e5acf97d040df89cb880cb2 Author: Matthew Wilcox Date: Wed Dec 15 15:44:02 2010 -0500 USB: uas: Fix up the Sense IU Add a comment to the Sense IU data structure that it's also used for Read Ready and Write Ready. Remove the 'service response' element since it's gone from the current draft (04). Signed-off-by: Matthew Wilcox Signed-off-by: Greg Kroah-Hartman commit ab60bd0b92ec57c98df08616b7d0664be5551eae Author: Arnaud Lacombe Date: Sun Dec 5 01:29:25 2010 -0500 kconfig: add more S_INT and S_HEX consistency checks This patch add more number consistency checkg, trying to catch the following situation: config FOO0 hex default 42 config FOO1 string config BAR0 int default FOO1 config BAR1 hex default FOO1 config FOO2 hex default 42h config FOO3 int default "1bar" Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 50bc0ef42c76879f5d68a88c7063603dc0c9789b Author: Daniel Walker Date: Mon Dec 13 14:35:11 2010 -0800 msm: initial framebuffer support Initial framebuffer components. Add board-trout-panel.c as well as platform parts to enable the framebuffer. This code comes directly from Google's tree. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 3a790bbe790e79a9744adf105ed135624a590f5b Author: Daniel Walker Date: Mon Dec 13 14:35:10 2010 -0800 msm: add handling for clocks tagged as CLK_MINMAX CLK_MINMAX is used to denote clocks that have a wide variation in possible frequencies. This handling just sets the min and max values to the same value. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 304a09c3251c7c74660fc2ff9c590edf3d4bdd7e Author: Daniel Walker Date: Mon Dec 13 14:35:09 2010 -0800 msm: trout: change name of pmdh_clk to mddi_clk This clock is used in the framebuffer driver as mddi_clk. This just changes the name to match that. This also mirrors a change in Google tree. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 078dde9311dd067a76275ea2c903623cec504e31 Author: Daniel Walker Date: Mon Dec 13 14:35:08 2010 -0800 msm: add CLK_MINMAX to pmdh_clk This adds in the CLK_MINMAX flag to the pmdh_clk since it's actual a min/max clock instead of a single frequency clock. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 940f2efc28564c478033b075bcfc8e7b694831e1 Author: Daniel Walker Date: Mon Dec 13 14:35:07 2010 -0800 msm: trout: add gpio_to_irq trout has gpiolib support and interrupt support, but was missing the gpio_to_irq function. This adds that functions which should allow proper translation. Signed-off-by: Daniel Walker Signed-off-by: David Brown commit 294b2dea83ba0a6d6034a7521bc62c317efab17b Author: Stepan Moskovchenko Date: Fri Dec 10 14:12:03 2010 -0800 msm: iommu: Use the correct memory allocation flag Change msm_iommu_map to use GFP_ATOMIC instead of GFP_KERNEL due to the fact that the call occurs within a spinlock-protected region. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown commit 38cd6b4f52a75926fd81fc85f53f5067dcd809f7 Author: Shan Wei Date: Wed Dec 15 14:27:28 2010 +0800 wireless:mac80211: kill unuse macro MESH_CFG_CMP_LEN in mesh.h Commit 00d3f14c has removed the references of this macro, but left it only. So remove this definition. commit 00d3f14cf9f12c21428121026a5e1d5f65926447 Author: Johannes Berg Date: Tue Feb 10 21:26:00 2009 +0100 mac80211: use cfg80211s BSS infrastructure Remove all the code from mac80211 to keep track of BSSes and use the cfg80211-provided code completely. Signed-off-by: Shan Wei Signed-off-by: John W. Linville commit 2b7e6bce41b6b944bd4302cf0914e2a6f4bc704b Author: Mohammed Shafi Shajakhan Date: Wed Dec 15 13:02:46 2010 +0530 ath9k: Add comments for making pm-qos as modparam PM-QOS value can be user specified via module parameter. This patch adds few comments regarding this in the driver code. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 64c6e50c0732b793e4bd5fd2954b7bef088f83f8 Author: Sujith Manoharan Date: Wed Dec 15 07:47:23 2010 +0530 ath9k_htc: Remove PCI specific configuration This is not required for USB devices. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit bd2ce6e43f65127bc723e7fcc044758cf8113260 Author: Sujith Manoharan Date: Wed Dec 15 07:47:10 2010 +0530 mac80211: Add timeout to BA session start API Allow drivers or rate control algorithms to specify BlockAck session timeout when initiating an ADDBA transaction. This is useful in cases where maintaining persistent BA sessions does not incur any overhead. The current timeout value of 5000 TUs is retained for all non ath9k/ath9k_htc drivers. Signed-off-by: Sujith Manoharan Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit a293911d4fd5e8593dbf478399a77f990d466269 Author: Johannes Berg Date: Tue Dec 14 17:54:28 2010 +0100 nl80211: advertise maximum remain-on-channel duration With the upcoming hardware offload implementation, some devices will have a different maximum duration for the remain-on-channel command. Advertise the maximum duration in mac80211, and make mac80211 set it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 14a085e77063090fb12ad391d0f4d46e593be225 Author: Wey-Yi Guy Date: Tue Dec 14 07:38:58 2010 -0800 iwlagn: fix witespace damage patch "iwlagn: check ready in iwlagn_bss_info_changed()" introduce whitespace, fix it please merge with the previous patch Reported by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4dc3530df7c0428b41c00399a7ee8c929406d181 Author: Mohammed Shafi Shajakhan Date: Tue Dec 14 13:18:28 2010 +0530 ath9k: Make PM-QOS value as user configurable This patch allows the pm-qos value to be user configurable by making it as a module parameter.This will help our customers to configure the pm-qos value according to the effect in throughput due to the DMA latency problem which was observed in Intel Pinetrail platforms. The tested value of '55' will be filled as the default pm-qos-value incase the user does not specifies pm-qos value as a module parameter. example usage: sudo modprobe ath9k pmqos=65 Cc: Senthilkumar Balasubramanian Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 17b3c17ecde36db5db7760a2802990b3129a4d65 Merge: 1fcfe76 65af8de Author: John W. Linville Date: Wed Dec 15 16:37:55 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c drivers/net/wireless/iwlwifi/iwl-core.h commit 65b7cecc85b9bb7bb8ce74c6a3b280464b00c86c Author: Olaya, Margarita Date: Tue Dec 14 19:18:36 2010 -0600 ASoC: twl6040: Set default gains to minimun value Updated default values to improve power consumption. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 1fcfe76a760e78d7774a254608557c84071b0cfb Merge: 0c81733 56e6417 Author: John W. Linville Date: Wed Dec 15 16:33:28 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/iwlwifi/iwl-1000.c drivers/net/wireless/iwlwifi/iwl-6000.c drivers/net/wireless/iwlwifi/iwl-core.h commit 0c8173385e549f95cd80c3fff5aab87b4f881d8d Author: Larry Finger Date: Wed Dec 8 11:12:31 2010 -0600 rtl8192ce: Add new driver Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 7be31be880ee00c6f8d38184368e8a834923b469 Author: Jarkko Nikula Date: Tue Dec 14 12:18:32 2010 +0200 ASoC: Extend DAPM to handle power changes on cross-device paths Power change event like stream start/stop or kcontrol change in a cross-device path originates from one device but codec bias and widget power changes must be populated to another devices on that path as well. This patch modifies the dapm_power_widgets so that all the widgets on a sound card are checked for a power change, not just those that are specific to originating device. Also bias management is extended to check all the devices. Only exception in bias management are widgetless codecs whose bias state is changed only if power change is originating from that context. DAPM context test is added to dapm_seq_run to take care of if power sequence extends to an another device which requires separate register writes. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 97c866defc0fc6e18b49603ac19f732f53e79c46 Author: Jarkko Nikula Date: Tue Dec 14 12:18:31 2010 +0200 ASoC: Move widgets from DAPM context to snd_soc_card Decoupling widgets from DAPM context is required when extending the ASoC core to cross-device paths. Even the list of widgets are now kept in struct snd_soc_card, the widget listing in sysfs and debugs remain sorted per device. This patch makes possible to build cross-device paths but does not extend yet the DAPM to handle codec bias and widget power changes of an another device. Cross-device paths are registered by listing the widgets from device A in a map for device B. In case of conflicting widget names between the devices, a uniform name prefix is needed to separate them. See commit ead9b91 "ASoC: Add optional name_prefix for kcontrol, widget and route names" for help. An example below shows a path that connects MONO out of A into Line In of B: static const struct snd_soc_dapm_route mapA[] = { {"MONO", NULL, "DAC"}, }; static const struct snd_soc_dapm_route mapB[] = { {"Line In", NULL, "MONO"}, }; Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8ddab3f5107c3955e70e87a632d4d179ddba1189 Author: Jarkko Nikula Date: Tue Dec 14 12:18:30 2010 +0200 ASoC: Move DAPM paths from DAPM context to snd_soc_card Decoupling DAPM paths from DAPM context is a first prerequisite when extending ASoC core to cross-device paths. This patch is almost a nullop and does not allow to construct cross-device setup but the path clean-up part in dapm_free_widgets is prepared to remove cross-device paths between a device being removed and others. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1cd25df4e53b9507f7abbb8aff8ce2ba644a1468 Author: Felipe Contreras Date: Mon Oct 11 09:53:49 2010 +0000 OMAP: iommu: make iva2 iommu selectable It seems dsp-link will do this, and tidspbridge too at some point, but right now it's not possible to select CONFIG_MPU_BRIDGE_IOMMU. Cc: Fernando Guzman Lugo Cc: Yogesh Marathe Signed-off-by: Felipe Contreras commit 5cdc5bd8b2b1190cb54548c03194b154b4892e2a Merge: 6c34d28 e4a2b35 Author: Greg Kroah-Hartman Date: Wed Dec 15 09:29:38 2010 -0800 Merge branch 'musb-hw' of git://gitorious.org/usb/usb into musb * 'musb-hw' of git://gitorious.org/usb/usb: (43 commits) usb: musb: core: kill unneeded #include's DA8xx: assign name to MUSB IRQ resource arm: OMAP4430: musb: Configure musb to OTG mode usb: musb: Adding musb support for OMAP4430 usb: otg: TWL6030: Add twl6030_usb file for compilation mfd: TWL6030: OMAP4: Registering the TWL6030-usb device usb: musb: TWL6030: Selecting TWL6030_USB transceiver usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver. usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 mfd: TWL6030: USBOTG VBUS event generation on usb: musb: add support for ux500 platform musb: am35x: fix compile error due to control apis arm: omap4: enable usb on 4430sdp usb: musb: drop board_set_vbus usb: musb: drop musb_platform_suspend/resume usb: musb: blackfin: usb dev_pm_ops structure usb: musb: am35x: usb dev_pm_ops structure usb: musb: omap2430: use dev_pm_ops structure usb: musb: omap2430: drop the nops usb: musb: mark musb_save/restore_context static ... commit c7f4ab26e3bcdaeb3e19ec658e3ad9092f1a6ceb Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:03 2010 +0000 OMAP: iommu: create new api to set valid da range Some IOMMUs cannot use the whole 0x0 - 0xFFFFFFFF range. With this new API the valid range can be set. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit 9205a109fbeee180254bb5a4020eb71d50735944 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:02 2010 +0000 OMAP: iovmm: replace __iounmap with iounmap __iounmap function is wrong for OMAP architecture, instead use iounmap which will call to the correct function. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit ad1081210f3c91874f9fe9b48c3934c7db9714b7 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:01 2010 +0000 OMAP: iovmm: add superpages support to fixed da address This patch adds superpages support to fixed ad address inside iommu_kmap function. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit ba6e1f4ff41314906d81e6d96e646cdeafe42827 Author: Guzman Lugo, Fernando Date: Wed Dec 15 00:54:00 2010 +0000 OMAP: iovmm: no gap checking for fixed address If some fixed da address is wanted to be mapped and the page is freed but it is used as gap, the mapping will fail. This patch is fixing that and olny keeps the gap for not fixed address. Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi DOYU commit 5af244fdf2a2405b2181da2a32636f3ca5ef162e Author: Mike Rapoport Date: Mon Nov 15 11:48:33 2010 +0200 [ARM] Dove: add support for multi-purpose pins configuration Signed-off-by: Mike Rapoport Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 8d4ce4cd7480ccd8412d4391d063733d6fc52f5c Author: Mike Rapoport Date: Mon Nov 15 11:48:32 2010 +0200 [ARM] Dove: add support for GPIOs 64-71 Signed-off-by: Mike Rapoport Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 248daa084cee4b212ff4408e9c9b05b3bdc0da0d Author: Luciano Coelho Date: Wed Dec 15 16:10:12 2010 +0200 wl12xx_sdio_test: rename files to match current style Change some file names and Kconfig settings so that this new module matches the new way of using wl12xx instead of wl1271. Also fix SDIO power enabling and disabling to match the latest way of doing it. Cc: Roger Quadros Signed-off-by: Luciano Coelho commit f0a6332ce221614fbd0731af92f668892fa4b700 Author: Jonas Aaberg Date: Wed Dec 15 08:37:00 2010 +0100 kbuild: add numeric --set-val option to scripts/config Add new option to scripts/config for changing .config numeric values Acked-by: Linus Walleij Signed-off-by: Jonas Aaberg Signed-off-by: Michal Marek commit 656d4b1edeb32a87042caee5694603706e399929 Author: Mark Brown Date: Tue Dec 14 17:16:56 2010 +0000 ASoC: Remove unused DAPM_DOUBLE control types There are no users of these and it's not clear what they would do given the mono flow modelling which DAPM does. If need arises we can add them again. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ee1ae4d7b1c9a8b73e232fa33dc733be59368ff6 Author: Sascha Hauer Date: Wed Dec 15 09:56:35 2010 +0100 ARM i.MX51: Full iomux support This iomux file has been constructed from the Freescale pinmux tool. It contains all pins from the tool, but the datasheet lists some configurations not present in the tool, these are not yet added. Signed-off-by: Sascha Hauer commit 4ce2c1e8e899831dd152bd0d534a60da6fb1582a Author: Arnaud Lacombe Date: Sun Dec 5 01:41:18 2010 -0500 kconfig: fix `zconfdebug' extern declaration This symbol is only exist if YYDEBUG is defined. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit bf128f5265625b8015789ea8f12b3582dc29faa3 Author: Arnaud Lacombe Date: Sun Dec 5 01:41:17 2010 -0500 kconfig/conf: merge duplicate switch's case Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 579fb8e741fecef7dfd64afcc7b0b0c68ea207cc Author: Arnaud Lacombe Date: Sun Dec 5 01:41:16 2010 -0500 kconfig: fix typos Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 1ebfa5198ee96f34f2ee4ae95c92318f07341fbd Author: Arnaud Lacombe Date: Sun Dec 5 01:41:15 2010 -0500 kbuild/gconf: add dummy inline for bind_textdomain_codeset() This symbols is used by gconf. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit fe04ce0bf955eaf53f7e4cd6bb35976fa94e0925 Author: Arnaud Lacombe Date: Sun Dec 5 01:41:14 2010 -0500 kbuild/nconf: fix spaces damage Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 6742f554db14da94172da9eb1875a1aa944a827f Author: Juuso Oikarinen Date: Mon Dec 13 09:52:37 2010 +0200 wl12xx: Change TX queue to be per AC With the current single-queue implementation traffic priorization is not working correctly - when using multiple BE streams and one, say VI stream, the VI stream will share bandwidth almost equally with the BE streams. To fix the issue, implement per AC queues, which are emptied in priority order to the firmware. To keep it relatively simple, maintain a global buffer count and global queue stop/wake instead of per-AC. With these changes, priorization appears to work just fine. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 17c1755c24d83f9fd0509b64c76cc43fc60cc642 Author: Eliad Peller Date: Sun Dec 12 12:15:35 2010 +0200 wl12xx: allow runtime changing of debug_level Currently, the debug level is set in compilation time (by the DEBUG_LEVEL const). This method has the advantage of compiling only the relevant messages, while optimizing out the unused ones. In order to allow runtime control over the debug_level, while optimizing out messages when debug messages are not needed, we combine some methods: 1. use dynamic_debug (pr_debug) rather then printk. 2. add debug_level module param in order to set debug level during insmod. 3. add debug_level sysfs file in order to allow dynamic control over the debug level. Since patches for pr_debug_hex_dump() implementation haven't been applied yet, we are still temporarly using print_hex_dump(). Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit ea559b460509b241cc1a3f36eebe0b2b634b3cf2 Author: Guy Eilam Date: Thu Dec 9 16:54:59 2010 +0200 wl1271: fixed problem with WPS IEs in probe requests Inclusion of a WPS IE in probe requests caused a problem in the driver due to the maximum size of the probe request template and the max_scan_ie_len values at initialization. Increased the size of probe request template to the maximum size allowed by the firmware. Struct wl12xx_probe_req_template, which was only used for calculating the max size of the probe request template, is no longer used and needed. max_scan_ie_len is used for validating the size of additional IEs in scan requests. Initialized the max_scan_ie_len field to the maximum size of the probe request template minus the ieee80211 header size. Signed-off-by: Guy Eilam Signed-off-by: Luciano Coelho commit 0dce631092f410bb22b21b3d47ef20d69389dfd9 Author: Arnaud Lacombe Date: Sun Dec 5 01:33:16 2010 -0500 kconfig: nuke second argument of conf_write_symbol() Replacing S_TRISTATE by S_BOOLEAN is a no-op for conf_write_symbol(). Signed-off-by: Arnaud Lacombe [mmarek: Fix unused variable warning in conf_write()] Signed-off-by: Michal Marek commit c5312772156bb5f9b2e95e4c91526d578426a069 Author: Eliad Peller Date: Thu Dec 9 11:31:27 2010 +0200 wl12xx: add auto-arp support The auto-arp feature of wl12xx allows the firmware to automatically response to arp requests asking for its ip. in order to use it, we configure the arp response template and enable the corresponding bit in wl1271_acx_arp_filter (along with passing its ip) Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit b69eb80bf7a6922fef8056d42b06124a7de31501 Author: Roger Quadros Date: Wed Dec 1 11:58:54 2010 +0200 wl1271_sdio_test: Add module for sdio RX/TX testing This module enables individually generating RX and TX traffic over the SDIO bus on which the WL1271 chipset is connected. This is required to perform RF interference testing. The module takes 2 module parameters 'rx' and 'tx'. To generate RX traffic: modprobe wl1271_sdio_test rx=1 To generate TX traffic: modprobe wl1271_sdio_test tx=1 To generate both RX & TX traffic, set both rx and tx to 1. You can change the testing configuration at runtime by changing the rx & tx values at /sys/modules/wl1271_sdio_test/ To stop testing simply unload the module. Signed-off-by: Roger Quadros Reviewed-by: Carlos Chinea Signed-off-by: Luciano Coelho commit fb6a6819fad0d71b47577a51709440a9f8441f0a Author: Luciano Coelho Date: Fri Dec 3 17:05:40 2010 +0200 wl12xx: disable 11a channels when wl->enable_11a is known Disabling the 11a channels when not supported in the reg_notify function was not working as it should, because when the driver is initiailizing (and registering itself with mac80211), it would get the reg notification too early. At that point the driver wouldn't have received the NVS yet, so it wouldn't know whether 11a was supported. To fix this, we disable 11a channels when we read the NVS instead. Also, it is easier (and still safe) to set n_channels to zero instead of setting the disabled flag on every 11a channel. Signed-off-by: Luciano Coelho commit 6e71fabe9e60b1c6db587fbeac349848647920ab Author: Arnaud Lacombe Date: Sun Dec 5 01:31:57 2010 -0500 kconfig: do not define AUTOCONF_INCLUDED AUTOCONF_INCLUDED is not checked is not used within the tree and its parent header, `autoconf.h', is safe to be re-included. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 8fbf397c3389c1dedfa9ee412715046ab28fd82d Author: Will Deacon Date: Wed Dec 1 17:37:45 2010 +0000 ARM: hw_breakpoint: do not fail initcall if monitor mode is disabled The debug registers can only be manipulated from software if monitor debug mode is enabled. On some cores, this can never be enabled (i.e. the corresponding bit in the DSCR is RAZ/WI). This patch ensures we can handle this hardware configuration and fail gracefully, rather than blow up the kernel during boot. Reported-by: Cyril Chemparathy Signed-off-by: Will Deacon commit 96f3e2568456402769f3998e111746941f549dc6 Author: Lothar Waßmann Date: Mon Nov 22 09:39:51 2010 +0100 MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2) This patch actually replaces the 'struct pad_desc' with a u64 cookie to facilitate adding platform specific pad_ctrl settings to an existing pad definition. So, instead of: iomux_v3_cfg_t power_key = MX51_PAD_EIM_A27__GPIO_2_21; power_key.pad_ctrl = MX51_GPIO_PAD_CTRL_2; mxc_iomux_v3_setup_pad(&power_key); one can write: mxc_iomux_v3_setup_pad((MX51_PAD_EIM_A27__GPIO_2_21 & ~MUX_PAD_CTRL_MASK) | MX51_GPIO_PAD_CTRL_2); Patch applies to branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/imx/linux-2.6 Signed-Off-By: Lothar Waßmann Signed-off-by: Sascha Hauer commit 9c04f015ebc2cc2cca5a4a576deb82a311578edc Author: Yuanhan Liu Date: Wed Dec 15 15:42:32 2010 +0800 drm/i915: Add frame buffer compression on Sandybridge Add frame buffer compression on Sandybridge. The method is similar to Ironlake, except that two new registers of type GTTMMADR must be written with the right fence info. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson commit 1398261a2e84c537c409259cfe9db3d0abcd9f99 Author: Yuanhan Liu Date: Wed Dec 15 15:42:31 2010 +0800 drm/i915: Add self-refresh support on Sandybridge Add the support of memory self-refresh on Sandybridge, which is now support 3 levels of watermarks and the source of the latency values for watermarks has changed. On Sandybridge, the LP0 WM value is not hardcoded any more. All the latency value is now should be extracted from MCHBAR SSKPD register. And the MCHBAR base address is changed, too. For the WM values, if any calculated watermark values is larger than the maximum value that can be programmed into the associated watermark register, that watermark must be disabled. Signed-off-by: Yuanhan Liu [ickle: remove duplicate compute routines and fixup for checkpatch] Signed-off-by: Chris Wilson commit b7f1de289c50beb4998611ba5373e539efd0f79f Author: Chris Wilson Date: Tue Dec 14 16:09:31 2010 +0000 drm/i915: Wait for vblank before unpinning old fb Be paranoid and ensure that the vblank has passed and the scanout has switched to the new fb, before unpinning the old one and possibly tearing down its PTEs. Signed-off-by: Chris Wilson commit c6df541c00e53a4fdff7a130d4365f848075adcc Author: Chris Wilson Date: Wed Dec 15 09:56:50 2010 +0000 Revert "drm/i915: Avoid using PIPE_CONTROL on Ironlake" Restore PIPE_CONTROL once again just for Ironlake, as it appears that MI_USER_INTERRUPT does not have the same coherency guarantees, that is on Ironlake the interrupt following a GPU write is not guaranteed to arrive after the write is coherent from the CPU, as it does on the other generations. Reported-by: Zhenyu Wang Reported-by: Shuang He Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32402 Signed-off-by: Chris Wilson commit ed41390fa57a21d06e6e3a3c4bc238bab8957fbb Author: Tejun Heo Date: Tue Dec 14 16:23:10 2010 +0100 workqueue: deprecate cancel_rearming_delayed_work[queue]() There's no in-kernel user left for these two obsolete functions. Mark them deprecated and schedule for removal during 2.6.39 cycle. Signed-off-by: Tejun Heo Acked-by: David S. Miller commit afe2c511fb2d75f1515081ff1be15bd79cfe722d Author: Tejun Heo Date: Tue Dec 14 16:21:17 2010 +0100 workqueue: convert cancel_rearming_delayed_work[queue]() users to cancel_delayed_work_sync() cancel_rearming_delayed_work[queue]() has been superceded by cancel_delayed_work_sync() quite some time ago. Convert all the in-kernel users. The conversions are completely equivalent and trivial. Signed-off-by: Tejun Heo Acked-by: "David S. Miller" Acked-by: Greg Kroah-Hartman Acked-by: Evgeniy Polyakov Cc: Jeff Garzik Cc: Benjamin Herrenschmidt Cc: Mauro Carvalho Chehab Cc: netdev@vger.kernel.org Cc: Anton Vorontsov Cc: David Woodhouse Cc: "J. Bruce Fields" Cc: Neil Brown Cc: Alex Elder Cc: xfs-masters@oss.sgi.com Cc: Christoph Lameter Cc: Pekka Enberg Cc: Andrew Morton Cc: netfilter-devel@vger.kernel.org Cc: Trond Myklebust Cc: linux-nfs@vger.kernel.org commit 3b1826cebe1d534ec05417a29b9a9f82651a5cb5 Author: Mimi Zohar Date: Mon Dec 13 16:53:13 2010 -0500 encrypted-keys: style and other cleanup Cleanup based on David Howells suggestions: - use static const char arrays instead of #define - rename init_sdesc to alloc_sdesc - convert 'unsigned int' definitions to 'size_t' - revert remaining 'const unsigned int' definitions to 'unsigned int' Signed-off-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit 1f35065a9e2573427ce3fd6c4a40b355c2ddfb92 Author: Mimi Zohar Date: Mon Dec 13 16:53:12 2010 -0500 encrypted-keys: verify datablob size before converting to binary Verify the hex ascii datablob length is correct before converting the IV, encrypted data, and HMAC to binary. Reported-by: David Howells Signed-off-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit 1bdbb4024c309e470711b434a24fb356fc92edea Author: Mimi Zohar Date: Mon Dec 13 16:53:11 2010 -0500 trusted-keys: kzalloc and other cleanup Cleanup based on David Howells suggestions: - replace kzalloc, where possible, with kmalloc - revert 'const unsigned int' definitions to 'unsigned int' Signed-off-by: David Safford Acked-by: Mimi Zohar Acked-by: David Howells Signed-off-by: James Morris commit bc5e0af0b36b6cc9de301074426c279fc9b72675 Author: Mimi Zohar Date: Mon Dec 13 16:53:10 2010 -0500 trusted-keys: additional TSS return code and other error handling Previously not all TSS return codes were tested, as they were all eventually caught by the TPM. Now all returns are tested and handled immediately. This patch also fixes memory leaks in error and non-error paths. Signed-off-by: David Safford Acked-by: Mimi Zohar Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit df127ee375af4cb40b979605e0c336fc79bd38e7 Author: Tony Lindgren Date: Tue Dec 14 19:17:31 2010 -0800 omap: Fix setting omap_irq_base for 2430 We need to test for 24xx not 242x. Otherwise interrupts won't work. Reported-by: Rajendra Nayak Signed-off-by: Tony Lindgren commit 41263fc6716dea402125c95f38ed83ebf59d5172 Author: Ben Gardiner Date: Tue Dec 14 11:39:44 2010 -0500 kbuild: fix interaction of CONFIG_IKCONFIG and KCONFIG_CONFIG If you try to build a kernel with KCONFIG_CONFIG set (to a value not equal to .config) and that config sets CONFIG_IKCONFIG then the build will fail with: make[1]: *** No rule to make target `.config', needed by \ `kernel/config_data.gz'. Stop. because the kernel/Makefile contains a direct reference to .config. This issue has been present since the introduction of KCONFIG_CONFIG in 14cdd3c402bf7c66f0bcd76e290f0770a54a4b21. Signed-off-by: Ben Gardiner CC: Roman Zippel CC: Michal Marek Reviewed-by: Michal Marek Signed-off-by: Michal Marek commit ba9effa2ecdc08325bd297d541b4207b2df38184 Author: Kirill A. Shutemov Date: Mon Dec 13 19:10:29 2010 +0200 kbuild: export linux/{a.out,kvm,kvm_para}.h on headers_install_all Export linux/a.out.h, linux/kvm.h and linux/kvm_para.h on headers_install_all if at least one architecture has appropriate files in arch-dependent headers. Signed-off-by: Kirill A. Shutemov Signed-off-by: Michal Marek commit f6820308e025d645d9d766c97586badd4ddb8754 Author: Kirill A. Shutemov Date: Mon Dec 13 19:10:28 2010 +0200 kbuild: introduce HDR_ARCH_LIST for headers_install_all Using HDR_ARCH_LIST you can specify subset of architectures you want to get headers for. Signed-off-by: Kirill A. Shutemov Signed-off-by: Michal Marek commit 8990c1bc4be46473ad19bf2fa612ca57286f3df4 Merge: 2979076 c8ddb27 Author: Michal Marek Date: Tue Dec 14 22:01:55 2010 +0100 Merge commit 'v2.6.37-rc1' into kbuild/kbuild commit d33e455337ea2c71d09d7f4367d6ad6dd32b6965 Author: David S. Miller Date: Tue Dec 14 13:01:14 2010 -0800 net: Abstract default MTU metric calculation behind an accessor. Like RTAX_ADVMSS, make the default calculation go through a dst_ops method rather than caching the computation in the routing cache entries. Now dst metrics are pretty much left as-is when new entries are created, thus optimizing metric sharing becomes a real possibility. Signed-off-by: David S. Miller commit 88606e80da0e8d862a42ee19e5bb60b01b940ea7 Author: Thomas Gleixner Date: Tue Dec 14 21:37:13 2010 +0100 MAINTAINERS: Update timer related entries Bring the existing file list up to date and add a new entry for timekeeping and ntp. Assign John Stultz to this new entry so he gets all the blame :) Signed-off-by: Thomas Gleixner Cc: John Stultz commit 53a9ef15df8c0dc688fae33277a252f0dd2faf2d Author: Misael Lopez Cruz Date: Fri Dec 10 21:06:34 2010 -0600 ASoC: twl6040: Use correct offset for LineInAmp Right Gain for LineInAmp Right uses LINEGAIN[5:3], which means that offset for right channel should be 4. Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 9020808b4d9ff6b7eebb026492dba6a805309df8 Author: Olaya, Margarita Date: Fri Dec 10 21:06:39 2010 -0600 ASoC: twl6040: Fix TLV dB step values for gains Some gains were incorrectly configured for dB values. Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit cbd9cb5de3182d688544611c019b06bf04e2ad06 Author: Jorge Eduardo Candelaria Date: Fri Dec 10 21:06:30 2010 -0600 ASoC: twl6040: Increase timeout for power up After coming back from suspend, the timeout waiting for Phoenix chip to complete its power up sequence is not enough, which leaves the codec cache value for some registers in an outdated state. Increase the timeout value to wait for the power up sequence to correclty complete. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4f44ee1f494edef1fea3db20565b2e209bef6280 Author: Misael Lopez Cruz Date: Fri Dec 10 21:06:24 2010 -0600 ASoC: twl6040: Enable plug detection interrupts Enable plug detection interrupt mask in order to get headset PLUGINT/UNPLUGINT interrupts. Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit f1f489a6aa89993892cd7b4d08f67e7e110492cb Author: Jorge Eduardo Candelaria Date: Fri Dec 10 21:06:13 2010 -0600 ASoC: twl6040: Clear interrupt status at boot time On Phoenix 1.1, the INTID register default value is an invalid one, causing the interrupt handler to think the phoenix power on sequence is ready before it actually finishes. This causes some i2c errors when trying to configure twl. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 99903ea23655a43ce4f75b64fef69e341fd0b7df Author: Olaya, Margarita Date: Fri Dec 10 21:06:07 2010 -0600 ASoC: twl6040: Enable automatic power for phoenix 1.1 Phoenix 1.1 supports automatic power on sequence, a verification is added to use it with new revision of the chip. Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit cb973d78f82f038c7d8d78d469fb89842d246871 Author: Francois Mazard Date: Fri Dec 10 21:06:03 2010 -0600 ASoC: twl6040: Fix analog Mic L & R mux controls The mux control has 4 elements not 3 Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 60ea4cecddd03ed86b91bc8c057d3d305dc678be Author: Olaya, Margarita Date: Fri Dec 10 21:05:58 2010 -0600 ASoC: twl6040: Support other sample rates. The twl6040 can support more sample rates other than 88.2 and 96k. Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 4e624d0609081e4394695fba3d7c3b7ebb6171ce Author: Olaya, Margarita Date: Fri Dec 10 21:05:54 2010 -0600 ASoC: twl6040: Fix PCM error handling ops This patch moves all the PCM error handling for clock config out of trigger() and startup() and into prepare(). Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 6c311041c1d3d0b9d1fc6ddacd49e50d83ba158a Author: Olaya, Margarita Date: Fri Dec 10 21:05:46 2010 -0600 ASoC: twl6040: Restore bias level at resume This patch restores the CODEC bias level at resume(). Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 370a0314ff3e1315e7fdec32a88a7ae49ccd22c8 Author: Jorge Eduardo Candelaria Date: Fri Dec 10 21:05:32 2010 -0600 ASoC: twl6040: Add headset and handset mux controls This patch adds support for the twl6040 headset and handset MUX controls. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit cf370a5a0e9d3b111f93216a55f275d66daed952 Author: Olaya, Margarita Date: Fri Dec 10 21:05:30 2010 -0600 ASoC: twl6040: Modify the IRQ handler Multiples interrupts can be received. The irq handler is modified to attend all of them. Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 0dec1ec72317caa64f0174f8190c714ae4d51040 Author: Olaya, Margarita Date: Fri Dec 10 21:05:24 2010 -0600 ASoC: twl6040: Update twl IO macro Update the codec to use the new twl core register macros Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 96dc227c9086bc84ca23af70741b2a76e3dd08eb Author: Jorge Eduardo Candelaria Date: Fri Dec 10 20:45:19 2010 -0600 ASoC: sdp4430: Add Jack support Use jack framework to enable detection for the headset microphone and stereo output in the sdp4430. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: David Anders Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit a2d2362edf9f068bdee7d0411e0603b322f8415d Author: Jorge Eduardo Candelaria Date: Fri Dec 10 20:45:17 2010 -0600 ASoC: twl6040: Add jack support for headset and handset This patch adds support for reporting twl6040 headset and handset jack events. The machine driver retrieves and report the status through twl6040_hs_jack_detect. A workq is used to debounce of the irq. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Misael Lopez Cruz Signed-off-by: Margarita Olaya Cabrera Signed-off-by: Liam Girdwood commit 1b894b59247728b02d6363d458088cf438f5ec92 Author: Chris Wilson Date: Tue Dec 14 20:04:54 2010 +0000 drm/i915: Pass clock limits down to PLL matcher As we already know the limits for the hardware clock, pass it down rather than recomputing them for each match. Signed-off-by: Chris Wilson commit dcdeda4a60b2046dd18d3dd20cbd888f25d8916b Author: Peter Ujfalusi Date: Tue Dec 14 13:45:29 2010 +0200 ASoC: TWL4030: Fix 24bit support twl4030 series of codecs supports S32_LE with msbits=24. Replace the S24_LE with S32_LE format, and add constraint for 24msbit in case of 32 S32_LE format. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 9fe146aef44afe5ec677d8150b6ae94e09b773f7 Merge: 6389aa7 4e53f78 Author: David S. Miller Date: Tue Dec 14 11:33:23 2010 -0800 Merge branch 'vhost-net-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost commit ac61d143ffe2a6db4d4bcf47c21a5159d6a1b644 Author: Russell King Date: Mon Dec 6 10:38:14 2010 +0000 ARM: GIC: move enablement of PPI interrupts to gic.c Avoid adding nasty genirq-specific code to local timers to enable PPI interrupts. Instead, provide a gic function to do this. Signed-off-by: Russell King commit 7627dc802a98aebebc6a34e5b6558ea4717c968c Author: Russell King Date: Sun Dec 5 08:51:38 2010 +0000 ARM: GIC: private a standard get_irqnr_preamble assembler macro Provide a standard get_irqnr_preamble assembler macro for platforms to use, which retrieves the base address of the GIC CPU interface from gic_cpu_base_addr. Allow platforms to override this by defining HAVE_GET_IRQNR_PREAMBLE. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit bef8f9ee32511a28f1c9a7d3b8c51cdac030b564 Author: Russell King Date: Sat Dec 4 16:50:58 2010 +0000 ARM: GIC: move gic_data[] initialization into gic_init() This avoids writing unnecessarily to gic_data[] from other CPUs, making this a mostly read-only variable. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit ff2e27ae0b17f53a6a289c87d325f706598f3788 Author: Russell King Date: Sat Dec 4 16:13:29 2010 +0000 ARM: GIC: consolidate gic_cpu_base_addr to common GIC code Every architecture using the GIC has a gic_cpu_base_addr pointer for GIC 0 for their entry assembly code to use to decode the cause of the current interrupt. Move this into the common GIC code. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit 384895330e0f3954d9478fd0853145f9c169df12 Author: Russell King Date: Sat Dec 4 16:01:03 2010 +0000 ARM: GIC: Remove MMIO address from gic_cpu_init, rename to gic_secondary_init We don't need to re-pass the base address for the CPU interfaces to the GIC for secondary CPUs, as it will never be different from the boot CPU - and even if it was, we'd overwrite the boot CPU's base address. Get rid of this argument, and rename to gic_secondary_init(). Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit b580b899dd05a007ad232ee49a07b32d91876462 Author: Russell King Date: Sat Dec 4 15:55:14 2010 +0000 ARM: GIC: provide a single initialization function for boot CPU Provide gic_init() which initializes the GIC distributor and current CPU's GIC interface for the boot (or single) CPU. Reviewed-by: Catalin Marinas Tested-by: Abhijeet Dharmapurikar Signed-off-by: Russell King commit 6389aa73ab8c15084fce18307a8e198eaff818da Merge: 0dbaee3 1d212aa Author: David S. Miller Date: Tue Dec 14 10:52:54 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 465d7fcc913373783dbb4cdcf03ea05b430930d4 Author: Dimitris Papastamos Date: Tue Dec 14 15:15:36 2010 +0000 ASoC: soc-cache: A few minor stylistic changes Remove redundant parentheses/spaces in the use of the sizeof operator. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 83b6542533859d6ed6c95f8b869291e885eab5bd Author: Mark Brown Date: Tue Dec 14 11:25:18 2010 +0000 ASoC: Explicitly clear WM8993 ramp controls on power down This helps ensure that the ramp logic is reset when powering back up. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d52784eb3607bf887628742f99041b4f18d7d1de Author: akpm@linux-foundation.org Date: Tue Nov 30 13:52:14 2010 -0800 headers_check: Fix warning text Fix the warning text too, per Randy. Cc: Alexander Shishkin Cc: Michal Marek Cc: Randy Dunlap Cc: Stephen Hemminger Cc: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit de323f22a83b024b7432e813609c6efb74b1bbfc Author: akpm@linux-foundation.org Date: Tue Nov 30 13:51:13 2010 -0800 headers_check: better search for functions in headers Some headers don't bother with "extern" in function prototypes, which results in said prototypes being unnoticed and exported to userland. This patch slightly improves detection of such cases by checking for C type names as well in the beginning of a line. Signed-off-by: Alexander Shishkin Cc: Stephen Hemminger Cc: Michal Marek Cc: WANG Cong Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 2979076fbf17a0947d6eba367b0cac19c907c160 Author: Mike Frysinger Date: Tue Nov 23 19:54:02 2010 -0500 headers_install: check exit status of unifdef If unifdef fails for any reason (like segfaulting), we should be aborting the install steps. So check its exit status in this unlikely scenario. Reported-by: Diego Elio Pettenò Signed-off-by: Mike Frysinger Signed-off-by: Michal Marek commit 1874542d952bbea01997191aee868b472555fd9a Author: Florian Fainelli Date: Tue Dec 14 11:56:56 2010 +0100 HID: replace offsets values with their corresponding BTN_* defines Instead of using magic values, use their corresponding BTN_* defines from linux/input.h. Signed-off-by: Florian Fainelli Signed-off-by: Jiri Kosina commit b5ba177d8d71f011c23b1cabec99fdaddae65c4d Author: Chris Wilson Date: Tue Dec 14 12:17:15 2010 +0000 drm/i915: Poll for seqno completion if IRQ is disabled Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32288 Signed-off-by: Chris Wilson commit 9097eef024db4f1850015e837a84aca0aa40a288 Merge: b13c2b9 71f4566 Author: Chris Wilson Date: Tue Dec 14 11:34:51 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit b13c2b96bf15b9dd0f1a45fd788f3a3025c5aec6 Author: Chris Wilson Date: Mon Dec 13 16:54:50 2010 +0000 drm/i915/ringbuffer: Make IRQ refcnting atomic In order to enforce the correct memory barriers for irq get/put, we need to perform the actual counting using atomic operations. Signed-off-by: Chris Wilson commit d88429a695a4a9ec66e90068956bbccb25d4ac6d Author: Olaya, Margarita Date: Fri Dec 10 21:11:44 2010 -0600 ASoC: dapm: Add output driver widget In some cases it was not possible to follow the appropiate power ON/OFF sequence like in cases where the PGA needs to be enabled before the driver and disabled before the PGA for pop reduction. Add a widget to support output driver (speaker, haptic, vibra, etc) drivers where power ON/OFF ordering is important. Signed-off-by: Margarita Olaya Cabrera Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c25bcd340033bf5b8dc30c16a99e64259f099446 Author: Benjamin Tissoires Date: Mon Dec 13 15:59:13 2010 +0100 HID: hid-mosart: support suspend/resume The device has 2 modes. The first one is an emulation of a touchscreen by sending left and right button, and the second mode is the one used in dual-touch (sending trackingID, touch and else). In case of a suspend/resume, the device switch back to the first mode described above (with left and right buttons). This adds a hook in .reset_resume for the device to be switched to the correct mode (I just copied the code in mosart_probe). Signed-off-by: Benjamin Tissoires Signed-off-by: Jiri Kosina commit ad6d42670279da8f33f633f8a96a67cd7ef3b1da Author: Benjamin Tissoires Date: Tue Dec 14 11:38:18 2010 +0100 HID: hid-mosart: ignore buttons report This commit allows the device to be recognized as a touchscreen, and not a touchpad by xf86-input-evdev. The device has 2 modes. The first one is an emulation of a touchscreen by sending left and right button, and the second mode is the one used in dual-touch (sending trackingID, touch and else). That's why there is a hid report containing left and right buttons (9000001 and 9000002). The point is that xorg relies on these fields to determine if it's a touchpad or a touchscreen. Clearing the report (return -1) makes xorg detecting it out of the box as a quite pleasant (dual)touchscreen. Signed-off-by: Benjamin Tissoires Acked-by: Chase Douglas Signed-off-by: Jiri Kosina commit a8cc0f421b37956262a92591f7397b200d232da6 Author: Joe Perches Date: Mon Dec 13 13:42:22 2010 -0800 ALSA: ml403-ac97cr: Use vsprintf extension %pR for struct resource Signed-off-by: Joe Perches Signed-off-by: Takashi Iwai commit 72f4d57923d2aa651db060a71a6f6211654c119e Author: Magnus Damm Date: Tue Dec 14 16:57:11 2010 +0900 ARM: mach-shmobile: sh73a0 SMP support Add SMP support for ag5evm and the sh73a0 processor. Onlining and offlining works well, but at this point offlined processor cores are not put into sleep mode. There is no spinlock for syncing the secondary core with the first one in this implementation. The code instead relies on the cpu_online() check in __cpu_up(). Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4d7ec69576ca4427478405190bd32e560f06fe99 Author: Magnus Damm Date: Tue Dec 14 16:57:03 2010 +0900 ARM: mach-shmobile: Enable SMP support Allow SMP to be enabled on R-Mobile / SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1c51ed4fb9f11fa1e0873aa2d5b28f42a85ac299 Author: Magnus Damm Date: Tue Dec 14 16:56:55 2010 +0900 ARM: mach-shmobile: SMP base support Add SMP base support for R-Mobile / SH-Mobile processors. This patch contains all base code to support CONFIG_SMP regardless of ARCH_SHMOBILE processor type. Both local timer and CPU hotplug are supported, but no processor specific code is included. At this point only the default behavior is in place, so a single core will always be used even though CONFIG_SMP is enabled on multicore systems. The SMP Kconfig entry for arch/arm/Kconfig is excluded from this patch to simplify merging. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6dff7da2adbba9c5cd1b3a3f67191fe3471c663c Author: Yusuke Goda Date: Tue Dec 14 14:18:03 2010 +0900 ARM: mach-shmobile: mackerel: Add sdhi support Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 09dd7ded60019d6a4fd2ae20a08c4ad2bc3ed3e9 Author: Magnus Damm Date: Tue Dec 14 16:15:35 2010 +0900 ARM: mach-shmobile: Fix up pinmux entries in Makefile Compiling in multiple CPUs into the same kernel binary requires a Makefile update. With this patch in place it is possible to enable the pinmux code for both the SH7372 and the SH7377. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3b80ffdef001ac7ff53bdcb80ad2baadb5953f91 Author: Joe Perches Date: Mon Dec 13 13:42:21 2010 -0800 video: mx3fb: Use vsprintf extension %pR for struct resource Signed-off-by: Joe Perches Signed-off-by: Paul Mundt commit 28a4f908acb342350b9ecbfcdf0a999cb83e05aa Author: Fabio Estevam Date: Mon Dec 13 10:47:05 2010 -0200 ARM: mx5: check for error in ioremap Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit bb477de2efc560e55c4a830329273661f3664bc8 Author: Arnaud Patard (Rtp) Date: Wed Dec 1 09:37:17 2010 +0100 Fix imx cpufreq driver as module When building as module: ERROR: "cpufreq_gov_performance" [arch/arm/plat-mxc/cpufreq.ko] undefined! WARNING: modpost: Found 1 section mismatch(es). To see full details build your kernel with: 'make CONFIG_DEBUG_SECTION_MISMATCH=y' make[1]: *** [__modpost] Error 1 make: *** [modules] Error 2 It's due to the driver using CPUFREQ_DEFAULT_GOVERNOR, even it should not (see commit 8122c6cea033e8034e99d3b10a4e3f377ce23994 in Linus tree), so remove it. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit cdc3f10630ecddb7870e087ff9679eef3d7b4e21 Author: Peter Horton Date: Mon Dec 6 11:37:38 2010 +0000 mx51: support FIQ on TZIC, revised Add support for FIQ on mx51 TZIC TZIC changes tested with FIQ audio on an mx51 board AVIC changes build with mx3_defconfig, not tested Signed-off-by: Peter Horton Signed-off-by: Sascha Hauer commit 8be9252f7ccde4148e4b203bf64d38ae66b111e4 Author: Fabio Estevam Date: Tue Dec 7 17:14:45 2010 -0200 ARM: imx/mx27_3ds: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit bfdde3a90b6d1c508e4f305dd385efd234fcdd66 Author: Fabio Estevam Date: Tue Dec 7 17:14:44 2010 -0200 ARM: mx3/mx31_3ds: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit f25972233fbe4b60dc4b514def4caf40aa1bb85a Author: Peter Horton Date: Fri Dec 3 17:07:28 2010 +0000 mx51: add SSI3 Add SSI3 to MX51 Signed-off-by: Peter Horton Signed-off-by: Sascha Hauer commit 2c1f4672f0711e7f23ae49cbb7541088126fe576 Author: Fabio Estevam Date: Tue Dec 7 14:16:04 2010 -0200 watchdog: imx: use clk_get to acquire the watchdog clock Use clk_get to acquire the watchdog clock and also avoid hardcoding the clock name. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit e92b297cc72ade7a58eaec7e01c906d856f8ab6e Author: Zhao Yakui Date: Wed Dec 8 10:10:18 2010 +0800 IPMI/ACPI: Add the IPMI opregion driver to enable ACPI to access BMC controller ACPI 4.0 spec adds the ACPI IPMI opregion, which means that the ACPI AML code can also communicate with the BMC controller. This is to install the ACPI IPMI opregion and enable the ACPI to access the BMC controller through the IPMI message. It will create IPMI user interface for every IPMI device detected in ACPI namespace and install the corresponding IPMI opregion space handler. Then it can enable ACPI to access the BMC controller through the IPMI message. The following describes how to process the IPMI request in IPMI space handler: 1. format the IPMI message based on the request in AML code. IPMI system address. Now the address type is SYSTEM_INTERFACE_ADDR_TYPE IPMI net function & command IPMI message payload 2. send the IPMI message by using the function of ipmi_request_settime 3. wait for the completion of IPMI message. It can be done in different routes: One is in handled in IPMI user recv callback function. Another is handled in timeout function. 4. format the IPMI response and return it to ACPI AML code. At the same time it also addes the module dependency. The ACPI IPMI opregion will depend on the IPMI subsystem. Signed-off-by: Zhao Yakui cc: Bjorn Helgaas Signed-off-by: Corey Minyard Signed-off-by: Len Brown commit 37bf501bdda1d5d6ea73ce29d4b00d291b6f3811 Author: Zhao Yakui Date: Wed Dec 8 10:10:17 2010 +0800 IPMI: Add the document description of ipmi_get_smi_info Add the document description about how to use ipmi_get_smi_info. Signed-off-by: Zhao Yakui Signed-off-by: Corey Minyard Signed-off-by: Len Brown commit 16f4232ce4d6855361b4eb56262f4a202295c978 Author: Zhao Yakui Date: Wed Dec 8 10:10:16 2010 +0800 IPMI: Add one interface to get more info of low-level IPMI device The IPMI smi_watcher will be used to catch the IPMI interface as they come or go. In order to communicate with the correct IPMI device, it should be confirmed whether it is what we wanted especially on the system with multiple IPMI devices. But the new_smi callback function of smi_watcher provides very limited info(only the interface number and dev pointer) and there is no detailed info about the low level interface. For example: which mechansim registers the IPMI interface(ACPI, PCI, DMI and so on). This is to add one interface that can get more info of low-level IPMI device. For example: the ACPI device handle will be returned for the pnp_acpi IPMI device. Signed-off-by: Zhao Yakui Signed-off-by: Corey Minyard Signed-off-by: Len Brown commit 99fd1895ef603f1a0fa9af478c96c637a7b4529d Author: Zhang Rui Date: Mon Dec 6 15:04:27 2010 +0800 ACPI video: introduce module parameter video.use_bios_initial_backlight Introduce module parameter video.use_bios_initial_backlight. Some BIOSes claim they use the minimum backlight at boot, and this may bring dimming screen after boot. https://bugzilla.kernel.org/show_bug.cgi?id=21212 use video.use_bios_initl_backlight=0 to use the maximum backlight level after boot. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 82069552555cf951d9ade5c1aec61dd40b0765b5 Author: Zhang Rui Date: Mon Dec 6 15:04:24 2010 +0800 ACPI video: check cap._DDC flag before getting EDID cap._DDC is defined but never used. Check this flag now and don't try to get EDID for video output devices with this flag cleared. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 677bd810eedce61edf15452491781ff046b92edc Author: Zhang Rui Date: Mon Dec 6 15:04:21 2010 +0800 ACPI video: remove output switching control Remove the ACPI video output switching control as it never works. With the patch applied, ACPI video driver still catches the video output notification, but it does nothing but raises the notification to userspace. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit cef6e8a3790d6bdc305496629c357a56001d59a6 Author: Zhang Rui Date: Mon Dec 6 15:04:15 2010 +0800 ACPI processor: remove processor throttling control procfs I/F Remove deprecated ACPI process procfs I/F for throttling control. This is because the t-state control should only be done in kernel, when system is in a overheating state. Now users can only change the processor t-state indirectly, by poking the cooling device sysfs I/F of the processor. Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit 32c361f574f85fa47600d84900598e2efc99082e Author: Huang Ying Date: Tue Dec 7 10:22:31 2010 +0800 ACPI, APEI, Report GHES error information via printk printk is one of the methods to report hardware errors to user space. This patch implements hardware error reporting for GHES via printk. Signed-off-by: Huang Ying Signed-off-by: Len Brown commit f59c55d04b43bd72df8efa692dd07224fe94d1ac Author: Huang Ying Date: Tue Dec 7 10:22:30 2010 +0800 ACPI, APEI, Add APEI generic error status printing support In APEI, Hardware error information reported by firmware to Linux kernel is in the data structure of APEI generic error status (struct acpi_hes_generic_status). While now printk is used by Linux kernel to report hardware error information to user space. So, this patch adds printing support for the data structure, so that the corresponding hardware error information can be reported to user space via printk. PCIe AER information printing is not implemented yet. Will refactor the original PCIe AER information printing code to avoid code duplicating. The output format is as follow: := APEI generic hardware error status severity: , section: , severity: , flags:
fru_id: fru_text: section_type:
* := recoverable | fatal | corrected | info
# := [primary][, containment warning][, reset][, threshold exceeded]\ [, resource not accessible][, latent error]
:= generic processor error | memory error | \ PCIe error | unknown,
:= | | \ | := [processor_type: , ] [processor_isa: , ] [error_type: ] [operation: , ] [flags: ] [level: ] [version_info: ] [processor_id: ] [target_address: ] [requestor_id: ] [responder_id: ] [IP: ] * := IA32/X64 | IA64 * := IA32 | IA64 | X64 # := [cache error][, TLB error][, bus error][, micro-architectural error] * := unknown or generic | data read | data write | \ instruction execution # := [restartable][, precise IP][, overflow][, corrected] := [error_status: ] [physical_address: ] [physical_address_mask: ] [node: ] [card: ] [module: ] [bank: ] [device: ] [row: ] [column: ] [bit_position: ] [requestor_id: ] [responder_id: ] [target_id: ] [error_type: , ] * := unknown | no error | single-bit ECC | multi-bit ECC | \ single-symbol chipkill ECC | multi-symbol chipkill ECC | master abort | \ target abort | parity error | watchdog timeout | invalid address | \ mirror Broken | memory sparing | scrub corrected error | \ scrub uncorrected error := [port_type: , ] [version: .] [command: , status: ] [device_id: ::. slot: secondary_bus: vendor_id: , device_id: class_code: ] [serial number: , ] [bridge: secondary_status: , control: ] * := PCIe end point | legacy PCI end point | \ unknown | unknown | root port | upstream switch port | \ downstream switch port | PCIe to PCI/PCI-X bridge | \ PCI/PCI-X to PCIe bridge | root complex integrated endpoint device | \ root complex event collector Where, [] designate corresponding content is optional All description with * has the following format: field: , Where value of should be the position of "string" in description. Otherwise, will be "unknown". All description with # has the following format: field: Where each string in corresponding to one set bit of . The bit position is the position of "string" in description. For more detailed explanation of every field, please refer to UEFI specification version 2.3 or later, section Appendix N: Common Platform Error Record. Signed-off-by: Huang Ying Signed-off-by: Len Brown commit c9aa308fd5c373faeda588cfb02b04f116904613 Author: Huang Ying Date: Tue Dec 7 10:22:29 2010 +0800 Add CPER PCIe error section structure and constants definition On some machine, PCIe error is reported via APEI (ACPI Platform Error Interface). The error data is passed from firmware to Linux via CPER PCIe error section structure. This patch adds CPER PCIe error section structure and constants definition. Signed-off-by: Huang Ying Signed-off-by: Len Brown commit 3fb82d56ad003e804923185316236f26b30dfdd5 Author: Suresh Siddha Date: Tue Nov 23 16:11:40 2010 -0800 x86, suspend: Avoid unnecessary smp alternatives switch during suspend/resume During suspend, we disable all the non boot cpus. And during resume we bring them all back again. So no need to do alternatives_smp_switch() in between. On my core 2 based laptop, this speeds up the suspend path by 15msec and the resume path by 5 msec (suspend/resume speed up differences can be attributed to the different P-states that the cpu is in during suspend/resume). Signed-off-by: Suresh Siddha LKML-Reference: <1290557500.4946.8.camel@sbsiddha-MOBL3.sc.intel.com> Cc: Rafael J. Wysocki Signed-off-by: H. Peter Anvin commit 65af8dea26aa89ae4a810bdaa05545a8e670b636 Author: Wey-Yi Guy Date: Wed Dec 8 07:51:50 2010 -0800 iwlagn: code clean up to remove duplicate code Multiple devices use almost the same .cfg with minor differences. Use macro and remove the duplication. By doing this, reduce the chance for mistake while modify .cfg parameters Signed-off-by: Wey-Yi Guy commit f21dd005df95e0fc6a578342c61b5333ce2abc2b Author: Wey-Yi Guy Date: Wed Dec 8 15:34:52 2010 -0800 iwlwifi: keep track of bt coex enable/disable stage For debugging purpose, keep track of the bt coex enable/disable state. Signed-off-by: Wey-Yi Guy commit 50619ac9ba48f5ab0c6bcfa10f5d50e4115cdca8 Author: Wey-Yi Guy Date: Tue Dec 7 08:06:31 2010 -0800 iwlwifi: do not reload fw if WiMAX own the RF For WiFi/WiMAX combo devices, if WiMAX own the RF, WiFi driver try to access RF and fail. This is the W/A to To avoid WiFi keep reloading firmware and try to access RF again. Signed-off-by: Wey-Yi Guy commit 33c68770a8605d84aea35c2cd90009edfc4b161a Author: Wey-Yi Guy Date: Fri Dec 3 10:33:36 2010 -0800 iwlagn: More detail tx power logging For enhanced tx power table in EEPROM, add more detail logging to help debugging Signed-off-by: Wey-Yi Guy commit d058ff8b9255b2a15bcb040cc9901baca66dc9c4 Author: Wey-Yi Guy Date: Fri Dec 3 10:33:35 2010 -0800 iwlwifi: use IWL_DEBUG_EEPROM for EEPROM related info For logging EEPROM related info, instead of using IWL_DEBUG_INFO, use the dedicated logging (IWL_DEBUG_EEPROM) for easier debugging Signed-off-by: Wey-Yi Guy commit fb4c32bba1e0941db5972e2b612cbfdf10522a43 Author: Wey-Yi Guy Date: Fri Dec 3 10:33:34 2010 -0800 iwlwifi: add new EEPROM debug log type Adding new debug type to log EEPROM related data Signed-off-by: Wey-Yi Guy commit c6fc108776e77e38e099d5b13c4f57a2172c6698 Author: Johannes Berg Date: Thu Dec 9 12:56:42 2010 -0800 iwlagn: remove old EEPROM TX power reading This removes the old TX power reading code, it isn't necessary since the new code is able to read all the various EEPROM layouts due to relying on information contained in the EEPROM. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 8d6748ca73a0caffed4304a47a9cb4cd0aba361e Author: Johannes Berg Date: Thu Dec 9 09:30:14 2010 -0800 iwlagn: implement layout-agnostic EEPROM reading The current EEPROM reading code has some layout assumptions that now turned out to be false with some newer versions of the EEPROM. Luckily, we can avoid all such assumptions by using data in the EEPROM itself, so implement using that. However, for risk mitigation purposes, keep the old reading code for current hardware for now. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit e7362a0069f8448bb346d65f07d98b319f243e30 Author: Johannes Berg Date: Tue Nov 30 11:03:44 2010 -0800 iwlagn: rename enhanced txpower fields Some fields we didn't previously use from the enhanced TX power structure will be needed in the next patch, so rename them to their correct names to be able to use them and change code reading them accordingly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 17423ea8776362100b0a9a162cdd4b16b886a4a2 Author: Wey-Yi Guy Date: Mon Dec 6 11:51:39 2010 -0800 iwlagn: rx antenna diversity For the new 1x1 devices, hw and uCode will support rx antenna diversity, but we need to indicate 1x1 device to AccessPoint to make sure it won't use MIMO. Signed-off-by: Wey-Yi Guy commit 9decde95be8a77a16f5668544bee45d41a7ae665 Author: Johannes Berg Date: Tue Nov 30 13:24:36 2010 -0800 iwlagn: fix debug variable access The compiler correctly warns: iwl-agn-tx.c: In function ‘iwlagn_tx_status_reply_compressed_ba’: iwl-agn-tx.c:1240: warning: ‘bitmap’ may be used uninitialized in this function Move the debug print to the branch that reads the bitmap, and move the variables too so it's more obvious where they are needed. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit ae0b693c12cc78913085733d28e0e0e6020db6f4 Author: Shanyu Zhao Date: Thu Dec 2 11:02:28 2010 -0800 iwlagn: check ready in iwlagn_bss_info_changed() In function iwlagn_bss_info_changed(), we need to check if the driver is ready before doing real work. Also, the previously put WARN() is removed because the vif is not guaranteed to be valid. uCode restart routine will clear the vif. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit a1da077bc36368eb7d6312e7e49260f0a3d92c77 Author: Shanyu Zhao Date: Thu Dec 2 11:02:54 2010 -0800 iwlwifi: clear dbg_fixed_rate during init This prevent bad fixed_rate keeps crashing uCode in an endless loop. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit 4fb33244d17b973f17cbc7cf8b7efd0875950474 Author: Wey-Yi Guy Date: Mon Nov 29 10:45:16 2010 -0800 iwlagn: change led compensation for 6005 and 6030 devices For both 6005 and 6030 devices, change the led compensation to 57 Signed-off-by: Wey-Yi Guy commit 96c8f06a0fb359a9a89701a7afab6d837e466ab0 Author: Thomas Gleixner Date: Mon Dec 13 22:45:48 2010 +0100 rtc: Namespace fixup rtctimer_* is already occupied by sound/core/rtctimer.c. Instead of fiddling with that, rename the new functions to rtc_timer_* which reads nicer anyway. Signed-off-by: Thomas Gleixner Cc: John Stultz commit 0dbaee3b37e118a96bb7b8eb0d9bbaeeb46264be Author: David S. Miller Date: Mon Dec 13 12:52:14 2010 -0800 net: Abstract default ADVMSS behind an accessor. Make all RTAX_ADVMSS metric accesses go through a new helper function, dst_metric_advmss(). Leave the actual default metric as "zero" in the real metric slot, and compute the actual default value dynamically via a new dst_ops AF specific callback. For stacked IPSEC routes, we use the advmss of the path which preserves existing behavior. Unlike ipv4/ipv6, DecNET ties the advmss to the mtu and thus updates advmss on pmtu updates. This inconsistency in advmss handling results in more raw metric accesses than I wish we ended up with. Signed-off-by: David S. Miller commit cc6f02dd490dac4ad821d5077b934c9b37037cd0 Author: Eric Dumazet Date: Mon Dec 13 12:50:49 2010 -0800 net: change ip_default_ttl documentation Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit cfb7e5f187e787bb1430decea339fdea6a669f92 Author: Tomoya Date: Sun Dec 12 20:24:26 2010 +0000 pch_can: Replace netif_rx to netif_receive_skb Since this driver is implemented as NAPI, netif_receive_skb must be used not netif_rx. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 0c78ab76a05cd788af0383354ffe819e0617f6a0 Author: Tomoya Date: Sun Dec 12 20:24:25 2010 +0000 pch_can: Add setting TEC/REC statistics processing Add setting TEC/REC statistics processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit fea9294c5f2902c45613681ad995ca27899d2016 Author: Tomoya Date: Sun Dec 12 20:24:24 2010 +0000 pch_can: Optimize "if" condition in rx/tx processing For reduce "if" condition, easy to read/understand the code, optimize "if" condition in rx/tx processing. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 3332bc5446e034566e8a56bf7a7cd479ca35bd6d Author: Tomoya Date: Sun Dec 12 20:24:23 2010 +0000 pch_can: Fix incorrect return processing Fix incorrect return processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit a6f6d6b51b110e661ae5f862d60c27da4970bec6 Author: Tomoya Date: Sun Dec 12 20:24:22 2010 +0000 pch_can: Move MSI processing to probe/remove processing Currently, in case this driver is integrated as module, and when this module is re-installed, no interrupts is to be occurred. For the above issue, move MSI processing to open/release processing. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit c755145649fa73bd197ac1a73d141047c61b543a Author: Tomoya Date: Sun Dec 12 20:24:21 2010 +0000 pch_can: Comment optimization Comment optimization Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit d06848be64e13d5d1d73e581fb185e815893d8b7 Author: Tomoya Date: Sun Dec 12 20:24:20 2010 +0000 pch_can: Fix miss-setting status issue Modify miss-setting status issue at suspend. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 0e0805c4063d0611e282bb7fdebe2e223bfe7220 Author: Tomoya Date: Sun Dec 12 20:24:19 2010 +0000 pch_can: Fix bit timing calculation issue Modify like use calculated value directly passed by CAN core module. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 8714fcaca63203fe10331fe530ff48d3dd31de4e Author: Tomoya Date: Sun Dec 12 20:24:18 2010 +0000 pch_can: Delete unnecessary/redundant code Delete unnecessary/redundant code Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 9388b166a323f8f7e35eb7a0d17b297ca695fa91 Author: Tomoya Date: Sun Dec 12 20:24:17 2010 +0000 pch_can: Fix coding rule violation Fix coding rule violation. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 435b4efe93d4cec3aa0b36e8707df8d292d3641b Author: Tomoya Date: Sun Dec 12 20:24:16 2010 +0000 pch_can: Replace netdev_dbg instead of dev_dbg partly For easy to readable, use netdev_dbg instead of dev_dbg partly Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit e91530ea959295a31911488c62088d5c372032ea Author: Tomoya Date: Sun Dec 12 20:24:15 2010 +0000 pch_can: Change Copyright and module description Currently, Copyright and module description are not formal. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 44c9aa890a2587f48920485b7487bc6d516dbbdf Author: Tomoya Date: Sun Dec 12 20:24:14 2010 +0000 pch_can: Reduce register access For improve tx/rx speed, reduce register access. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit ca2b004e89484e89b1815157fae2d7f933c5af9e Author: Tomoya Date: Sun Dec 12 20:24:13 2010 +0000 pch_can: Change functions type Currently, these two functions spec(returned value) is unnatural. Thus, change the return value's spec Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit bd58cbc322e97550af5e12584324b7117180435d Author: Tomoya Date: Sun Dec 12 20:24:12 2010 +0000 pch_can: Rename function/macro name For easy to read/understand, Rename function/macro name. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 7f2bc50efeaeb1dff62ef7e128ae36499fbcf35d Author: Tomoya Date: Sun Dec 12 20:24:11 2010 +0000 pch_can: Fix warnings Currently, in case CONFIG_PM is disabled, compiler outputs warnings. Move six functions which are used only CONFIG_PM is enabled, into "#ifdef CONFIG_PM" area. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 1d5b4b2778e8e40f42ae5d9556777583f3556d81 Author: Tomoya Date: Sun Dec 12 20:24:10 2010 +0000 pch_can: Improve rx processing Replace complex "goto" to "do~while". For easy to read/understand, it divides a rx function into some functions. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 8ac9702b9d5d81b819fc7d6b4f6abad22af01f3c Author: Tomoya Date: Sun Dec 12 20:24:09 2010 +0000 pch_can: Fix endianness issue there is endianness issue both Tx and Rx. Currently, data is set like below. Register: MSB--LSB x x D0 D1 x x D2 D3 x x D4 D5 x x D6 D7 But Data to be sent must be set like below. Register: MSB--LSB x x D1 D0 x x D3 D2 x x D5 D4 x x D7 D6 (x means reserved area.) Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit e489ccebf14657774fd877dc841b458703730586 Author: Tomoya Date: Sun Dec 12 20:24:08 2010 +0000 pch_can: Divide poll function To easy to read/understand, divide poll function into two sub-functions. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 76d94b232940ca91e9b26c590cb7312ab88ff722 Author: Tomoya Date: Sun Dec 12 20:24:07 2010 +0000 pch_can: Add flow control processing Currently, there is no flow control processing. Thus, Add flow control processing as when there is no empty of tx buffer, netif_stop_queue is called. When there is empty buffer, netif_wake_queue is called. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 412b31334b831a8c2909afaca017c5a236ac2dd0 Author: Wolfgang Kufner Date: Mon Dec 13 12:39:39 2010 +0100 rt2x00: Fix firmware loading regression on x86_64. Commit 6175ddf06b6172046a329e3abfd9c901a43efd2e changes the way memcpy_toio() works for x86_64, causing firmware loading to fail for some Ralink WLAN devices with the rt2800pci driver since linux 2.6.34. This causes the log message: "phy0 -> rt2800pci_load_firmware: Error - PBF system register not ready.". Fix this by using __iowrite32_copy instead of memcpy_toio(). Signed-off-by: Wolfgang Kufner Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 739fd9405416e22732e46a9226a8cac379bd57fc Author: Wolfgang Kufner Date: Mon Dec 13 12:39:12 2010 +0100 rt2x00: Pad beacon to multiple of 32 bits. Pad beacon to a multiple of 32 bits in preparation for the change from memcpy_toio() to __iowrite32_copy() in register_multiwrite(). Signed-off-by: Wolfgang Kufner Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit e85b4c04646f7fa62ebf0afe11cd8dffde689da7 Author: Johannes Stezenbach Date: Mon Dec 13 12:38:49 2010 +0100 rt2x00: remove stray semicolon The stray semicolon after DEBUG_PRINTK_MSG causes things like "if (...) WARNING(...); else {}" to fail with syntax error. Signed-off-by: Johannes Stezenbach Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f615e9a38a8e6239d35891a05f2ac1159088780a Author: Ivo van Doorn Date: Mon Dec 13 12:36:38 2010 +0100 rt2x00: Fix WMM Queue naming The Queue names were incorrectly copied from the legacy drivers, as a result the queue names were inversed to what was expected. This renames the queues using this mapping: QID_AC_BK -> QID_AC_VO (priority 0) QID_AC_BE -> QID_AC_VI (priority 1) QID_AC_VI -> QID_AC_BE (priority 2) QID_AC_VO -> QID_AC_BK (priority 3) Note that this was a naming problem only, which didn't affect the assignment of frames to their respective queues. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit dba5dc1ae9764902f46d5225c9ff40e4f7b614c7 Author: Ivo van Doorn Date: Mon Dec 13 12:36:18 2010 +0100 rt2x00: Introduce extra queue entry sanity flag Add a queue entry flag ENTRY_DATA_STATUS_PENDING, which can be used to indicate a queue entry has returned from the hardware and is waiting for status processing. Using this flag we can add some extra sanity checks to prevent queue corruption. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 64e7d72384c2ecef5a892b2243623af265dd83cc Author: Ivo van Doorn Date: Mon Dec 13 12:36:00 2010 +0100 rt2x00: Cleanup RX index counting Add the rt2x00_dmastart function to rt2x00lib which marks the queue_entry as "owned by device", and increased the Q_INDEX number. This cleanups up the index handling by rt2x00lib which at until so far used hackish approaches to keep the RX queue index numbering sane. The rt2x00pci.c changes are from Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 5be65609fec2e331c7d804471be3d59089a30d98 Author: Ivo van Doorn Date: Mon Dec 13 12:35:40 2010 +0100 rt2x00: Add "flush" queue command Add a new command to the queue handlers: "flush", this moves the flush() callback from mac80211 into rt2x00queue and adds support for flushing the RX queue as well. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 0b7fde54f94979edc67bbf86b5adba702ebfefe8 Author: Ivo van Doorn Date: Mon Dec 13 12:35:17 2010 +0100 rt2x00: Protect queue control with mutex Add wrapper functions in rt2x00queue.c to start & stop queues. This control must be protected using a mutex. Queues can also be paused which will halt the flow of packets between the driver and mac80211. This doesn't require a mutex protection. Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit dbba306f2ae574450a7a5133d6637fe6f5fafc72 Author: Ivo van Doorn Date: Mon Dec 13 12:34:54 2010 +0100 rt2x00: Reorganize queue callback functions As part of the queue refactoring, change the queue callback function names to have 3 different actions: start, kick & stop. We can now also remove the STATE_RADIO_RX_ON/STATE_RADIO_RX_OFF device_state flags, and replace the usage with using the start_queue/stop_queue callback functions. This streamlines the RX queue handling to the similar approach as all other queues. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 5450b7e2f0b47e52175b31399d8186a74ef3c46d Author: Ivo van Doorn Date: Mon Dec 13 12:34:22 2010 +0100 rt2x00: Introduce 3 queue commands in drivers (start, kick, stop). As part of the queue refactoring, we now introduce 3 queue commands: start, kick, stop. - Start: will enable a queue, for TX this will not mean anything, while for beacons and RX this will update the registers to enable the queue. - Kick: This will kick all pending frames to the hardware. This is needed for the TX queue to push all frames to the HW after the queue has been started - Stop: This will stop the queue in the hardware, and cancel any pending work (So this doesn't mean the queue is empty after a stop!). Move all code from the drivers into the appropriate functions, and link those calls to the old rt2x00lib callback functions (we will fix this later when we refactor the queue control inside rt2x00lib). Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 094a1d92fdb18c4455758b1c33e99d647c837ee9 Author: Johannes Stezenbach Date: Mon Dec 13 12:34:00 2010 +0100 rt2x00: trivial: add missing \n on warnings Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 89b25f60e08180d7e00e6239398b467142aaec01 Author: Helmut Schaa Date: Mon Dec 13 12:33:36 2010 +0100 rt2x00: Don't frequently reset beacon interval in AdHoc mode Commit 0204464329c17ba6d293e1899f71223599a0e582 "Check for specific changed flags when updating the erp config" changed the way in which a new beacon interval gets handled. However, due to a bug in rt2800usb and rt2800pci the beacon interval was reset during each scan, thus causing problems in AdHoc mode. Fix this by not cleaning up the beacon interval when killing the beacon queue but just prevent the device from sending out beacons. Reported-by: Wolfgang Kufner Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a061a93b6eb8db8227b251666436da1e344771a0 Author: Gertjan van Wingerde Date: Mon Dec 13 12:33:12 2010 +0100 rt2x00: Ensure TX-ed frames are returned in the original state. Recent changes to the TX-done code of rt2x00 resulted in TX-ed frames not being returned to mac80211 in the original state, and therefore with insufficient headroom for re-transmissions. Fix this by reverting the changes done and by ensuring we remove the inserted L2pad by moving the header backwards instead of the data forwards. At the same time also make sure that the rt2x00queue_remove_l2pad will not move any memory when a frame has no data at all. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Cc: Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit d7bb5f845f437662296adbfeaab8fbfce1c32289 Author: Johannes Stezenbach Date: Mon Dec 13 12:32:49 2010 +0100 rt2x00: fix hang when unplugging USB device in use When an rt2x00 USB device is unplugged while in use, it reliably hangs the whole system. After some time the watchdog prints: BUG: soft lockup - CPU#0 stuck for 64s! [kworker/u:0:5] ... [] (usb_submit_urb+0x0/0x2ac) from [] (rt2x00usb_kick_rx_entry+0xb4/0xe8 [rt2x00usb]) [] (rt2x00usb_kick_rx_entry+0x0/0xe8 [rt2x00usb]) from [] (rt2x00usb_clear_entry+x28/0x2c [rt2x00usb]) [] (rt2x00usb_clear_entry+0x0/0x2c [rt2x00usb]) from [] (rt2x00lib_rxdone+0x2e0/0x2f8 [rt2x00lib]) [] (rt2x00lib_rxdone+0x0/0x2f8 [rt2x00lib]) from [] (rt2x00usb_work_rxdone+0x54/0x74 [rt2x00usb]) [] (rt2x00usb_work_rxdone+0x0/0x74 [rt2x00usb]) from [] (process_one_work+0x20c/0x35c) Clear the DEVICE_STATE_PRESENT flag when usb_submit_urb() returns -ENODEV to fix this. Signed-off-by: Johannes Stezenbach Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8d4ff3f3045e57f57634559c063bf70993a1d00a Author: RA-Jay Hung Date: Mon Dec 13 12:32:22 2010 +0100 rt2x00: Add RF chip definition Add RF chip definition Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 977206d79fdc9fc1b153e0b52c56e0be59586f37 Author: Helmut Schaa Date: Mon Dec 13 12:31:58 2010 +0100 rt2x00: Implement get_survey callback for rt2800 Implement the get_survey callback to allow user space to read statistics about the current channel condition. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 38c8a566fcfe080c910bb6b348d40121df2b8e88 Author: RA-Jay Hung Date: Mon Dec 13 12:31:27 2010 +0100 rt2x00: Add rt2800 EEPROM definition Add and modify NIC Configuration and LED definition of EEPROM Signed-off-by: RA-Jay Hung Acked-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 7a7793ef078e56fa395f96567630032c44ab5951 Author: Felix Fietkau Date: Mon Dec 13 08:40:56 2010 +0100 ath9k_hw: update AR9003 initvals to improve carrier leak calibration/correction Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e172e0f8c25a513d253c07b1dc1d7e3c66a811ff Author: Felix Fietkau Date: Mon Dec 13 08:40:55 2010 +0100 ath9k_hw: update AR9003 initvals for improved radar detection Reduces the likelihood of false pulse detects in the hardware Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1bf38661822049931a0ab8d2b43153b26cc919f6 Author: Felix Fietkau Date: Mon Dec 13 08:40:54 2010 +0100 ath9k_hw: fix PA predistortion training power selection The EEPROM contains scale factors for the tx power, which define the range of allowable difference between target power and training power. If the difference is too big, PA predistortion cannot be used. For 2.4 GHz there is only one scale factor, for 5 GHz there are three, depending on the specific frequency range. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1782352d4908c79d195b43e0c1b6b109e0d93d05 Author: Felix Fietkau Date: Mon Dec 13 08:40:53 2010 +0100 ath9k_hw: fix the PA predistortion rate mask The EEPROM PAPRD rate mask fields only contain mask values for actual rates in the low 25 bits. The upper bits are reserved for tx power scale values. Add the proper mask definitions and use them before writing the values to the register. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7607cbe2ad6931400c5d15ced342ab329ab8f92c Author: Felix Fietkau Date: Mon Dec 13 08:40:52 2010 +0100 ath9k: fix PA predistortion thermal measurement handling To be able to measure the thermal values correctly for PAPRD, we need to send training frames before setting up the gain table for the measurement, and then again afterwards for the actual training. For further improvement, send training frames at MCS0 instead of 54 MBit/s legacy. That way we can use the No-ACK flag for the transmission, which speeds up PAPRD training in general, as the hardware won't have to retransmit and wait for ACK timeout (was previously set to 4 * 6 transmission attempts). Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit caabf2bf228cd6b1c6197dbb25bddb4682d30c9d Author: Felix Fietkau Date: Mon Dec 13 08:40:51 2010 +0100 ath9k_hw: fix the slot time setting for long distance links Testing shows that adjusting the slot time based on the coverage class produces very high latencies and very low throughput on long distance links. Adjusting only the ACK timeout and leaving the slot time at the regular values - while technically not optimal for CSMA - works a lot better on long links (tested with 10 km distance) Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4357c6bfc83d4e8b1f18588f640be27bf4b0d0f7 Author: Felix Fietkau Date: Mon Dec 13 08:40:50 2010 +0100 ath9k_hw: initialize ah->slottime (u32) -1 is not particularly useful as a slottime default, so even though the ath9k_hw default should never get used, it's better to pick something sane here. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 452d7dd816744efb5d0c22c2b038f2ffa5c7ec14 Author: Sujith Manoharan Date: Mon Dec 13 07:39:32 2010 +0530 ath9k_htc: Add Ubiquiti wifistation ext to supported devices Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 62a957e99f6edced4a87f79cc49bfca42fe9a1a0 Author: Felix Fietkau Date: Sun Dec 12 00:51:14 2010 +0100 ath9k_hw: remove ah->txpower_indexoffset Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5f65c309be7b9eae06136a5e7df43ea08b25d3f9 Author: Felix Fietkau Date: Sun Dec 12 00:51:13 2010 +0100 ath9k_hw: remove ah->beacon_interval Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6da5a720bab3866ba23a37841f6a61d96e498a3f Author: Felix Fietkau Date: Sun Dec 12 00:51:12 2010 +0100 ath9k_hw: clean up SREV version checks There's no need to have separate callbacks for pre-AR9003 vs AR9003 SREV version checks, so just merge those into one function. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit df3c8b2b10b47429d2f3fe79d00daa38a3381aad Author: Felix Fietkau Date: Sun Dec 12 00:51:11 2010 +0100 ath9k_hw: remove antenna configuration eeprom ops and variables AR9280 based hardware with 3 antennas and slow antenna diversity has not been seen in the wild and ath9k does not support that form of antenna diversity, so remove the EEPROM ops for it. These EEPROM ops are currently only used for setting the AR_PHY_SWITCH_COM register, which is being done in the EEPROM specific file already. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 940cd2c12ebff688cfdc14f21c4b0e5b845ad47f Author: Felix Fietkau Date: Sun Dec 12 00:51:10 2010 +0100 ath9k_hw: merge the ar9287 version of ath9k_hw_get_gain_boundaries_pdadcs Also add a comment about a potential array overrun that needs to be reviewed. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 115277a3bc0683d04da797268ddafdc3bf67ca33 Author: Felix Fietkau Date: Sun Dec 12 00:51:09 2010 +0100 ath9k_hw: merge ath9k_hw_get_gain_boundaries_pdadcs between eeprom_def.c and eeprom_4k.c Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4ddfcd7daf57247ff718b849a152d97a80b7ae4d Author: Felix Fietkau Date: Sun Dec 12 00:51:08 2010 +0100 ath9k_hw: clean up duplicate and unnused eeprom related defines AR*_MAX_RATE_POWER => MAX_RATE_POWER AR*_EEPROM_MODAL_SPURS => AR_EEPROM_MODAL_SPURS AR*_OPFLAGS_* => AR5416_OPFLAGS_* ... Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 040b74f741b20dbf07359716d5c540356a036ade Author: Felix Fietkau Date: Sun Dec 12 00:51:07 2010 +0100 ath9k_hw: only use the PCIe disable register write sequence for AR5416 Newer chips do not need this, and maybe these register writes could have negative side effects on newer hardware. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 248a38d0ed754bf9f002e66f3d607e12ae6a673c Author: Felix Fietkau Date: Fri Dec 10 21:16:46 2010 +0100 ath9k: fix sequence number assigment for non-AMPDU QoS data frames wireless-testing commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435 ('ath9k: more tx setup cleanups') merged tx path code for HT vs non-HT frames, however it did not pass the tid pointer to ath_tx_send_normal, causing an inconsistency between AMPDU vs non-AMPDU sequence number handling. Fix this by always passing in the tid pointer for all QoS data frames. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 207aba6018a7b1757b5248ced2b280d20790c498 Author: Johannes Berg Date: Fri Dec 10 17:10:44 2010 +0100 mac80211: support IBSS RSN with SW crypto When software crypto is used, mac80211 will support IBSS RSN, it doesn't depend on the driver in that case. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 9abbfb27dd96361187bb3872b2c349a76f5e09e9 Author: Sujith Manoharan Date: Fri Dec 10 11:27:06 2010 +0530 ath9k: Use power save wrappers for TSF get/set The HW has to be awake when accessing registers. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 44316cb1e97a1e7f76eb3f07e5b0ba91d72e9693 Author: Bing Zhao Date: Thu Dec 9 18:24:41 2010 -0800 ieee80211: add Parameter Set Count bitmask WMM IE QoS Info field lower 4 bits: Parameter Set Count Signed-off-by: Bing Zhao Signed-off-by: John W. Linville commit 91f44b02992f632ac6c070f985cd58d5acee4199 Author: Tim Harvey Date: Thu Dec 9 13:15:45 2010 -0800 mac80211 default tx_last_beacon false (congestion) The 802.11 spec states that the STA that generated the last Beacon frame shall be the STA that response to a probe request. This is important for congestion reduction when a probe request is received - only 1 node in an adhoc BSS will transmit a response. While mac80211 drivers should provide the tx_last_beacon function to report if they transmitted the last beacon many do not. As an attempt to reduce probe response congestion default this to 0 such that a node not implementing this capability does not contribute to unnecessary congestion. In a modern medium sized office environment I see upwards of 100 probe requests per second received at a given node from various hardware/OS/drivers doing zeroconf 'active probing' as opposed to passively listening for beacons. With a modest 10-node adhoc network consisting of drivers that do not implement this tx_last_beacon feature, I have seen this result in the simultaneous xmit of probe responses accumulating to 500 probe responses per second because of collisions which brings the adhoc network to its knees as well as causes needless congestion. Signed-off-by: John W. Linville commit 42ab135fe78025910bed8ff56e00a375f2b04db1 Author: Rafał Miłecki Date: Thu Dec 9 20:56:01 2010 +0100 b43: rename TMS defines, drop useless condition from core reset As discussed we do not know band width at core reset time and it is not a good idea to reset whole just to change band. So just set unconditionally 20 MHz band width as default during core reset. As for defines PHY clock changed to band width in specs and it makes much more sens to call defines by band width which is self-explainable. Updated specs do not mention 0 value, but comparing to old ones you can notice lineral relation between PHY clock speed and band width. So it makes sense for 0x0 value to be 10 MHz band width. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d242b90adf4e1918ac86433dfbb32a1136515bdd Author: Rafał Miłecki Date: Thu Dec 9 20:56:00 2010 +0100 b43: N-PHY: use designed function and macro for writing tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit ea85ffd627b5da346b348d784fafec0ce4632d4d Author: Rafał Miłecki Date: Thu Dec 9 20:55:59 2010 +0100 b43: N-PHY: one more fix for order of tables initialization I missed that part in previous reordering. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f61afc291a64d0362258f5a1ab45c828fe15ab04 Author: Rafał Miłecki Date: Thu Dec 9 20:55:58 2010 +0100 b43: N-PHY: use correct bit for controlling MAC and PHY Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f7e0104c1a4e77cc4f23d5969b0677bdc4f62c63 Author: Johannes Berg Date: Thu Dec 9 19:49:02 2010 +0100 mac80211: support separate default keys Add support for split default keys (unicast and multicast) in mac80211. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit dbd2fd656f2060abfd3a16257f8b51ec60f6d2ed Author: Johannes Berg Date: Thu Dec 9 19:58:59 2010 +0100 cfg80211/nl80211: separate unicast/multicast default TX keys Allow userspace to specify that a given key is default only for unicast and/or multicast transmissions. Only WEP keys are for both, WPA/RSN keys set here are GTKs for multicast only. For more future flexibility, allow to specify all combiations. Wireless extensions can only set both so use nl80211; WEP keys (connect keys) must be set as default for both (but 802.1X WEP is still possible). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 897bed8b4320774e56f282cdc1cceb4d77442797 Author: Johannes Berg Date: Thu Dec 9 19:49:00 2010 +0100 mac80211: clean up RX key checks Using the default key for "any key set" isn't quite what we should do. It works, but with the upcoming changes it makes life unnecessarily complex, so do something better here and really check for "any key". Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f33fdcf1b3a02fb92971a577d194ec6c579374af Author: Mohammed Shafi Shajakhan Date: Thu Dec 9 21:48:54 2010 +0530 ath9k: clean up hardware code for beacon handling The registers TBTT_TIMER ,DMA_BEACON_ALERT ,NEXT_SWBA are need to be configured only for AP and IBSS mode. SWBA register is used for generating software interrupts so that beacon frames will be created by the software.DMA beacon alert register is to indicate the hardware to DMA the contents of beacon buffer to PCU buffer and TBTT to start transmitting the packet buffer to the base band. Clearly these things are not needed for station/monitor mode so remove configuring them. Cc: doug dahlby Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 01123e233193a544c85b622e1690f44532052c5b Author: Sven Neumann Date: Thu Dec 9 15:05:24 2010 +0100 cfg80211: update information elements in cached BSS struct When a cached BSS struct is updated because a new beacon was received, the code replaces the cached information elements by the IEs from the new beacon. However it did not update the pub.information_elements and pub.len_information_elements fields leaving them either pointing to the old beacon IEs or in an inconsistent state where the data is replaced by the new beacon IEs but len_information_elements still has its value from the first beacon. Fix this by updating the information elements fields if they are pointing to beacon IEs. Signed-off-by: Sven Neumann Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 998d516d9546eba04dd99ae49a78acb0cf770478 Author: Rajkumar Manoharan Date: Wed Dec 8 20:01:05 2010 +0530 ath: Missed to clear key4 of micentry key4 of micentry is used, if ATH_CRYPT_CAP_MIC_COMBINED is set. But is not cleared on key cache reset. Cc: stable@kernel.org Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 6b3b991dbdb66a65a2167abbd9503e519fa999f3 Author: Rajkumar Manoharan Date: Wed Dec 8 19:38:55 2010 +0530 ath9k: Add change_interface callback Add support to change interface type without bringing down the interface. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit a7ffac9591a2a0ee74c431396ae475a8d0caa51e Author: Bruno Randolf Date: Wed Dec 8 13:59:24 2010 +0900 cfg80211: Add antenna availability information Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed. Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises. The antenna configuration is now also checked against the availabe antennas and rejected if it does not match. Signed-off-by: Bruno Randolf -- v3: always apply available antenna mask (for "all" antennas case). v2: reject antenna configurations which don't match the available antennas Signed-off-by: John W. Linville commit a08e7ade9ddf4fe79576f953cc5c1725e944d26c Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:20 2010 -0800 ath9k: fix assumptions for idle calls on suspend/resume mac80211 will notify drivers when to go idle and ath9k assumed that it would get further notifications for idle states after a device stop() config call but as per agreed semantics the idle state of the radio is left up to driver after mac80211 issues the stop() callback. The driver is resposnbile for ensuring the device remains idle after that even between suspend / resume calls. This fixes suspend/resume when you issue suspend and resume twice on ath9k when ath9k_stop() was already called. We need to put the radio to full sleep in order for resume to work correctly. What might seem fishy is we are turning the radio off after resume. The reason why we do this is because we know we should not have anything enabled after a mac80211 tells us to stop(), if we resume and never get a start() we won't get another stop() by mac80211 so to be safe always bring the 802.11 device with the radio disabled after resume, this ensures that if we suspend we already have the radio disabled and only a start() will ever trigger it on. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c2731b814e2aaaa40072ee761b7373c052d86e37 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:19 2010 -0800 ath9k: Fix power save count imbalance on ath_radio_enable() Upon a failure we never call ath9k_ps_restore() on ath_radio_enable(), this will throw off the sc->ps_usecount. When the sc->ps_usecount is > 0 we never put the chip to full sleep. This drains battery, and will also make the chip fail upon resume with: ath: Starting driver with initial channel: 5745 MHz ath: timeout (100000 us) on reg 0x7000: 0xdeadbeef & 0x00000003 != 0x00000000 This would make the chip useless upon resume. I cannot prove this can happen but in theory it is so best to avoid this race completely and not have users complain about a broken device after resume. Cc: stable@kernel.org Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1d212aa96e1b63459486f729af9a3fa38768b801 Merge: 8c4877a b761337 Author: John W. Linville Date: Mon Dec 13 15:20:45 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 249fab773dd5f689318c969ed649c4db077cdfc3 Author: Eric Dumazet Date: Mon Dec 13 12:16:14 2010 -0800 net: add limits to ip_default_ttl ip_default_ttl should be between 1 and 255 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit b9d41052794385f9d47ebb7acf4a772f3ad02398 Author: Namhyung Kim Date: Mon Dec 13 13:42:24 2010 -0600 dlm: sanitize work_start() in lowcomms.c The create_workqueue() returns NULL if failed rather than ERR_PTR(). Fix error checking and remove unnecessary variable 'error'. Signed-off-by: Namhyung Kim Cc: Tejun Heo Signed-off-by: David Teigland commit c4d6fd40df38eb4c187565d48807f5f902481ba8 Author: Maxim Levitsky Date: Mon Nov 29 04:09:53 2010 +0200 firewire: net: ratelimit error messages Unfortunately its easy to trigger such error messages by removing the cable while sending streams of data over the link. Such errors are normal, and therefore this patch stops firewire-net from flooding the kernel log with these errors, by combining series of same errors together. Signed-off-by: Maxim Levitsky (Stefan R:) Eventually we should remove this logging when firewire-net and related firewire-ohci facilities have been stabilized. Signed-off-by: Stefan Richter commit dd23736e092035b71df1117482b71fdfb5634239 Author: Maxim Levitsky Date: Mon Nov 29 04:09:50 2010 +0200 firewire: ohci: restart iso DMA contexts on resume from low power mode Restore iso channels DMA so that iso channels could continue to work after resume from RAM/disk. Signed-off-by: Maxim Levitsky Signed-off-by: Stefan Richter commit 8662b6b029636c35e5876e184d90daf6b0072667 Author: Maxim Levitsky Date: Mon Nov 29 04:09:49 2010 +0200 firewire: ohci: restore GUID on resume. Some lousy BIOSes, e.g. my Aspire 5720 BIOS forget to restore the GUID register on resume from RAM. Fix that by setting it to the last value that was read from it. Signed-off-by: Maxim Levitsky Signed-off-by: Stefan Richter commit ec766a7970126f99665992c0b0b10bd60a4d6208 Author: Clemens Ladisch Date: Tue Nov 30 08:25:17 2010 +0100 firewire: ohci: use common buffer for self IDs and AR descriptors The buffers used for the selfIDs packets and the AR request and response descriptors end up using three pages because dma_alloc_coherent() allocates at least one page per call. However, these data structures would all fit into 4 KB, so we can save space by using a common buffer for them. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 2dd5bed59356e03610bebe1a37c397788df50b9b Author: Clemens Ladisch Date: Tue Nov 30 08:25:05 2010 +0100 firewire: ohci: optimize iso context checks in the interrupt handler When the isochRx/isochTx bit is clear, we do not need to read the corresponding iso interrupt event register. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 5b06db166c4d38638980283505259fa165d4f369 Author: Clemens Ladisch Date: Tue Nov 30 08:24:47 2010 +0100 firewire: make PHY packet header format consistent Change the header of PHY packets to be sent to include a pseudo transaction code. This makes the header consistent with that of received PHY packets, and allows at_context_queue_packet() and log_ar_at_event() to see the packet type directly instead of having to deduce it from the header length or even from the header contents. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 8327b37b18addfc6f8cf41a2f1a4490b656377b9 Author: Clemens Ladisch Date: Tue Nov 30 08:24:32 2010 +0100 firewire: ohci: properly clear posted write errors To remove the error information from the controller's queue and to allow more posted writes, the driver has to read the failed posted write address before clearing the postedWriteErr interrupt bit. Signed-off-by: Clemens Ladisch (Stefan R:) The spec is somewhat fuzzy about the actual requirements. To err on the safe side, let's do these two read accesses. Signed-off-by: Stefan Richter commit e597e9898abe45beff4696159c7fe5c96f53e581 Author: Clemens Ladisch Date: Tue Nov 30 08:24:19 2010 +0100 firewire: ohci: flush MMIO writes in the interrupt handler Make sure that interrupt event clear bit writes are executed before the interrupt handler returns. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit c088ab30ebf184afae01d919c77cebcfdce39df3 Author: Clemens Ladisch Date: Tue Nov 30 08:24:01 2010 +0100 firewire: ohci: fix AT context initialization error handling Add proper error handling for the context_init() calls. Signed-off-by: Clemens Ladisch Signed-off-by: Stefan Richter commit 7a39d8b82165462729d09066bddb395a19025acd Author: Clemens Ladisch Date: Fri Nov 26 08:57:31 2010 +0100 firewire: ohci: Asynchronous Reception rewrite Move the AR DMA descriptors out of the buffer pages, and map the buffer pages linearly into the kernel's address space. This allows the driver to ignore any page boundaries in the DMA data and thus to avoid any copying around of packet payloads. This fixes the bug where S800 packets that are so big (> 4080 bytes) that they can be split over three pages were not handled correctly. Due to the changed algorithm, we can now use arbitrarily many buffer pages, which improves performance because the controller can more easily unload its DMA FIFO. Furthermore, using streaming DMA mappings should improve perfomance on architectures where coherent DMA mappings are not cacheable. Even on other architectures, the caching behaviour should be improved slightly because the CPU no longer writes to the buffer pages. v2: Detect the last filled buffer page by searching the descriptor's residual count value fields in order (like in the old code), instead of going backwards through the transfer status fields; it looks as if some controllers do not set the latter correctly. v3: Fix an old resume bug that would now make the handler run into a BUG_ON, and replace that check with more useful error handling. Increase the buffer size for better performance with non-TI chips. Signed-off-by: Clemens Ladisch Maxim Levitsky writes: Works almost perfectly. I can still see RCODE_BUSY errors sometimes, not very often though. 64K here eliminates these errors completely. This is most likely due to nouveau drivers and lowest perf level I use to lower card temperature. That increases latencies too much I think. Besides that the IO is just perfect. Tested-by: Maxim Levitsky Signed-off-by: Stefan Richter commit a388eb1727c15a7da1f64fcf16e60fcb7aca40bd Author: Haiyang Zhang Date: Fri Dec 10 12:04:00 2010 -0800 staging: hv: Convert camel cased struct fields in rndis.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 53d21fdbf4d38dcfe27173d746acf74ea1a19958 Author: Haiyang Zhang Date: Fri Dec 10 12:03:59 2010 -0800 staging: hv: Convert camel cased struct fields in netvsc.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 72a2f5bd53bf83302f4dcfe8500d4ec440545d27 Author: Haiyang Zhang Date: Fri Dec 10 12:03:58 2010 -0800 staging: hv: Convert camel cased struct fields in netvsc_api.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 9c26aa0d763a8390177f50ae841148706a249793 Author: Haiyang Zhang Date: Fri Dec 10 12:03:57 2010 -0800 staging: hv: Convert camel cased functions in rndis_filter.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit c2a4efddc73bfd44479fc8d84dadbb352c4efb07 Author: Haiyang Zhang Date: Fri Dec 10 12:03:56 2010 -0800 staging: hv: Convert camel cased variables in rndis_filter.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 5a71ae303c0f82968d93d86724c1d94d753b34d7 Author: Haiyang Zhang Date: Fri Dec 10 12:03:55 2010 -0800 staging: hv: Convert camel cased functions in netvsc.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 85799a37553f89b23797ec4f69e45f6c5e9109df Author: Haiyang Zhang Date: Fri Dec 10 12:03:54 2010 -0800 staging: hv: Convert camel cased variables in netvsc.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit e1b8a37ede8b47dbad002ec61a67706b70b23ccf Author: L. Alberto Giménez Date: Sun Dec 12 18:56:30 2010 +0100 Staging: rt2860: Avoid extern in .c file rt28xx_close and rt28xx_open are already declared in a file included in rt_config.h, so there is no need to declare them again. Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit ced17a68b727d8509a4bde0b2ee7d0d120371e66 Author: L. Alberto Giménez Date: Sun Dec 12 18:56:29 2010 +0100 Staging: rt2860: Clean spaces before tabs Fix checkpatch complains Signed-off-by: L. Alberto Giménez Signed-off-by: Greg Kroah-Hartman commit 6292817d58637f85dd623cfe563c7f5ec4f4c470 Author: Ruben Smits Date: Sat Dec 11 08:26:18 2010 +0100 staging: comedi: add support for newer jr3 1-channel pci board add DEVICE_ID to table Signed-off-by: Ruben Smits Cc: stable Signed-off-by: Greg Kroah-Hartman commit ed271e049d4e0bf8c6586c9626964a01d1c62fa2 Author: Xenofon Foukas Date: Fri Dec 10 21:07:25 2010 +0200 Staging: comedi: Fix coding style issues in ni_tiocmd.c This patch fixes the following issues in ni_tiocmd.c: WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks WARNING: printk() should include KERN_ facility level WARNING: line over 80 characters __func__ should be used instead of gcc specific __FUNCTION__ ERROR: that open brace { should be on the previous line WARNING: EXPORT_SYMBOL(foo); should immediately follow its function/variable Signed-off-by: Xenofon Foukas Signed-off-by: Greg Kroah-Hartman commit 448d40140196b33f63a0a3f3f8bcad8f14c9c432 Author: Marek Belisko Date: Mon Dec 13 10:39:20 2010 +0100 staging: ft1000: Always extract device number from netdev name. Using gCardIndex as global variable was not correctly used because for every plugged device was set to 0 in init_ft1000_netdev. Remove global definition. Use it locally and for every plugged device extract number from net device name. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 8c4877a4128e7931077b024a891a4b284d8756a3 Author: Joe Perches Date: Mon Dec 13 10:05:14 2010 -0800 ehea: Use the standard logging functions Remove ehea_error, ehea_info and ehea_debug macros. Use pr_fmt, pr_, netdev_ and netif_ as appropriate. Fix messages to use trailing "\n", some messages had an extra one as the old ehea_ macros added a trailing "\n". Coalesced long format strings. Signed-off-by: Joe Perches Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 5a7743edac3d720a52e721229938d21d40f045ce Author: Mark Brown Date: Mon Dec 13 15:07:40 2010 +0000 regulator: Update LDO2 for WM8958 LDO2 has a slightly different range of supported voltages on WM8958 so update the selector<->voltage mappings to match. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7d8316df44053687625eef792d53b3ac62e82248 Author: Mark Brown Date: Mon Dec 13 17:03:27 2010 +0000 ASoC: Fix AC'97 registration unwind soc_unregister_ac97_dai_link() takes a CODEC as an argument, not a rtd like the registration function, so give it what it's looking for. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 5f29805a4f4627e766f862ff9f10c14f5f314359 Author: Don Zickus Date: Mon Dec 13 10:31:58 2010 -0500 x86, watchdog: Compile fix when CONFIG_LOCAL_APIC not enabled When adjusting the code to handle removing the old nmi watchdog, I forgot to consider the compile case when the local apic is not enabled. This change fixes the following build error: arch/x86/kernel/apic/hw_nmi.c:28:6: error: redefinition of ‘touch_nmi_watchdog’ Signed-off-by: Don Zickus Acked-by: Randy Dunlap Cc: Randy Dunlap Cc: Stephen Rothwell Cc: Rakib Mullick LKML-Reference: <20101213153719.GD18577@redhat.com> Signed-off-by: Ingo Molnar commit 0f0e25282b93242780a405585a8e3e6f0cc7fa91 Author: Jarkko Nikula Date: Fri Dec 10 20:54:49 2010 +0200 ASoC: Fix build error caused by merging a fix for 2.6.37 into 2.6.38 Fix "ASoC: Fix bias power down of non-DAPM codec" for 3.6.37 will cause a build error when merging into ASoC for-2.6.38. Fix the issue by doing a change that commit ce6120c "ASoC: Decouple DAPM from CODECs" would do. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 90986dc98d71242e764e1f98017c041511e1c3b1 Merge: 474b9c8 862af8a Author: Mark Brown Date: Mon Dec 13 16:48:38 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 474b9c86b0c65e9ca6a77d8b7bf132c4d5993b9c Merge: 49db7e7 fdea057 Author: Mark Brown Date: Mon Dec 13 15:53:31 2010 +0000 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38 commit fb410aef0314ef183fe6da879d29536311971a20 Author: Shawn Guo Date: Thu Dec 9 23:12:37 2010 +0800 ARM: mxs: Add helper definition and function Add helper definition and function for MXS-based. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit b0b6e42aa63fbd00a3b509e75702aca4be8618cd Author: Shawn Guo Date: Mon Dec 13 20:54:58 2010 +0800 ARM: mxs: Add core definitions Add core definitions for MXS-based SoC MX23 and MX28. Signed-off-by: Shawn Guo Signed-off-by: Uwe Kleine-König commit e4ea0c16a85d221ebcc3a21f32e321440459e0fc Author: Shaohua Li writes Date: Mon Dec 13 14:32:22 2010 +0100 block cfq: select new workload if priority changed If priority is changed, continuing to check workload_expires and service tree count of the previous workload does not make sense. We should always choose the workload with lowest key of new priority in such case. Signed-off-by: Shaohua Li Reviewed-by: Jeff Moyer Signed-off-by: Jens Axboe commit fdea0571ddca8e3f22448f66d72a034575abea28 Author: Takashi Iwai Date: Mon Dec 13 12:55:39 2010 +0100 ASoC: Fix merge errors with flush_scheduled_work() removal delayed_work was moved to dapm in the commit ce6120cca2589ede530200c7cfe11ac9f144333c ASoC: Decouple DAPM from CODECs Signed-off-by: Takashi Iwai commit 3c097b800816c0e4c2a34c38f8b2409427770f7a Author: Tadeusz Struk Date: Mon Dec 13 19:51:15 2010 +0800 crypto: aesni-intel - Fixed build with binutils 2.16 This patch fixes the problem with 2.16 binutils. Signed-off-by: Aidan O'Mahony Signed-off-by: Adrian Hoban Signed-off-by: Gabriele Paoloni Signed-off-by: Tadeusz Struk Signed-off-by: Herbert Xu commit fbb5bb563925db138a8bbfa6a0ea0e089fbd2405 Author: Takashi Iwai Date: Mon Dec 13 12:48:35 2010 +0100 ALSA: hda - Mute speakers when line-out jack is plugged with Conexant auto mode Mute speakers when a line-out jack is plugged as well as headphone jacks with the new Conexant codec parser in the auto mode. Signed-off-by: Takashi Iwai commit 49db7e7b995f5c61c5e24198f833ed01d99f5e7d Author: Mark Brown Date: Wed Dec 8 13:49:43 2010 +0000 ASoC: Fix widgets for WM8994/58 AIF2 source control The compiler really ought to have been warning about unreferenced variables... Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a8760eca6cf60ed303ad494ef45901f63165d2c8 Author: Thomas Gleixner Date: Mon Dec 13 11:28:02 2010 +0100 x86: Check tsc available/disabled in the delayed init function The delayed TSC init function does not check whether the system has no TSC or TSC is disabled at the kernel command line, which results in a crash in the work queue based extended calibration due to division by zero because the basic calibration never happened. Add the missing checks and do not touch TSC when not available or disabled. Signed-off-by: Thomas Gleixner Cc: John Stultz commit 354d14b3f53cc749c5d26d4ba7280d1e931d6bc4 Merge: 5144c53 5b84ba2 Author: Takashi Iwai Date: Mon Dec 13 09:29:52 2010 +0100 Merge branch 'topic/workq-update' into topic/misc commit 20aeeb356ba2e8daa99b5942c528ae2b3ea28433 Merge: 07a9e2b 5b84ba2 Author: Takashi Iwai Date: Mon Dec 13 09:28:43 2010 +0100 Merge branch 'topic/workq-update' into topic/asoc Conflicts: sound/soc/codecs/wm8350.c sound/soc/codecs/wm8753.c sound/soc/sh/fsi.c sound/soc/soc-core.c commit 5b84ba26a9672e615897234fa5efd3eea2d6b295 Author: Tejun Heo Date: Sat Dec 11 17:51:26 2010 +0100 sound: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. * cancel[_delayed]_work() + flush_scheduled_work() -> cancel[_delayed]_work_sync(). * wm8350, wm8753 and soc-core use custom code to cancel a delayed work, execute it immediately if it was pending and wait for its completion. This is equivalent to flush_delayed_work_sync(). Use it instead. Signed-off-by: Tejun Heo Acked-by: Mark Brown Signed-off-by: Takashi Iwai commit 598e227ea9af687547d46bff6906151e728f7b7b Merge: 2818b19 f6d84f4 cd8ab00 Author: Paul Mundt Date: Mon Dec 13 15:36:36 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/mackerel' into rmobile-latest commit c43328e890b9e3a4ab8e8cb1020a8b1e9fda9ed1 Merge: 7d0dbea 80fbf83 852af59 Author: Paul Mundt Date: Mon Dec 13 15:35:10 2010 +0900 Merge branches 'sh/urgent' and 'sh/rsk-updates' into sh-latest commit 852af59f6084bf1c48df16d2728216705621d598 Author: Paul Mundt Date: Mon Dec 13 15:33:16 2010 +0900 sh: mach-rsk: Add polled GPIO buttons support for RSK+7203. Now that there's an upstream polled gpio-keys driver, add the outstanding platform data for it. Signed-off-by: Paul Mundt commit 323e126f0c5995f779d7df7fd035f6e8fed8764d Author: David S. Miller Date: Sun Dec 12 21:55:08 2010 -0800 ipv4: Don't pre-seed hoplimit metric. Always go through a new ip4_dst_hoplimit() helper, just like ipv6. This allowed several simplifications: 1) The interim dst_metric_hoplimit() can go as it's no longer userd. 2) The sysctl_ip_default_ttl entry no longer needs to use ipv4_doint_and_flush, since the sysctl is not cached in routing cache metrics any longer. 3) ipv4_doint_and_flush no longer needs to be exported and therefore can be marked static. When ipv4_doint_and_flush_strategy was removed some time ago, the external declaration in ip.h was mistakenly left around so kill that off too. We have to move the sysctl_ip_default_ttl declaration into ipv4's route cache definition header net/route.h, because currently net/ip.h (where the declaration lives now) has a back dependency on net/route.h Signed-off-by: David S. Miller commit a02e4b7dae455151c423e2f69ef222c502a321fd Author: David S. Miller Date: Sun Dec 12 21:39:02 2010 -0800 ipv6: Demark default hoplimit as zero. This is for consistency with ipv4. Using "-1" makes no sense. It was made this way a long time ago merely to be consistent with how the ipv6 socket hoplimit "default" is stored. Signed-off-by: David S. Miller commit 5170ae824ddf1988a63fb12cbedcff817634c444 Author: David S. Miller Date: Sun Dec 12 21:35:57 2010 -0800 net: Abstract RTAX_HOPLIMIT metric accesses behind helper. Signed-off-by: David S. Miller commit abbf46ae0e4954584eac599bec73502c1c805e9e Author: David S. Miller Date: Sun Dec 12 21:14:46 2010 -0800 ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls. Signed-off-by: David S. Miller commit cd8ab0041d131e8e210c4b5ded7257da50473dcb Author: Tony SIM Date: Thu Dec 9 01:55:55 2010 +0000 ARM: mach-shmobile: mackerel: Add keypad tca6408a support This patch maps key0/key1/key2/key3 as HOME/MENU/BACK/POWER buttons on mackerel board. Signed-off-by: Tony SIM Signed-off-by: Paul Mundt commit bce5feeab418fb1df9ce1c3fcc14f0aacf740208 Author: David S. Miller Date: Sun Dec 12 14:57:53 2010 -0800 sparc: Eliminate prom_stdin. Completely unused. Based upon a patch by Julian Calaby. Signed-off-by: David S. Miller commit 154337688bfa970453836e65a27de011aba55331 Author: Julian Calaby Date: Fri Dec 3 17:56:45 2010 +0000 sparc: prom: Sanitize return value from prom_nbputchar() Signed-off-by: Julian Calaby Signed-off-by: David S. Miller commit 7496351ad87e61e96b49dd7b43c6534e3401f566 Author: Christoph Lameter Date: Tue Nov 30 14:05:53 2010 -0600 timers: Use this_cpu_read Eric asked for this. [tglx: Because it generates faster code according to Erics ] Signed-off-by: Christoph Lameter Cc: Pekka Enberg Cc: Eric Dumazet Cc: Mathieu Desnoyers Cc: Tejun Heo Cc: linux-mm@kvack.org LKML-Reference: Signed-off-by: Thomas Gleixner commit 1635953305694ece16d99078ca6d32f3d4e7eb36 Author: Tejun Heo Date: Sun Dec 12 16:45:15 2010 +0100 hostap: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. Drop flush_scheduled_work() from prism2_free_local_data() and replace it with explicit flushing of work items on the respective free functions. Work items in ap_data are flushed from hostap_free_data() and the ones in local_info from prism2_free_local_data(). Flush is used instead of cancel as some process and free items from queue. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Jes Sorensen Cc: netdev@vger.kernel.org commit 781ba4567698be9db7ca94d827c4b38d8583c168 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 i2400m: drop i2400m_schedule_work() i2400m implements dynamic work allocation and queueing mechanism in i2400_schedule_work(); however, this is only used for reset and recovery which can be served equally well with preallocated per device works. Replace i2400m_schedule_work() with two work structs in struct i2400m. These works are explicitly canceled when the device is released making calls to flush_scheduled_work(), which is being deprecated, unnecessary. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Inaky Perez-Gonzalez Cc: linux-wimax@intel.com Cc: netdev@vger.kernel.org commit fe8998c5e3b173f3d5c450bbde6173e7fbe5158d Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 sungem: update gp->reset_task flushing gp->reset_task_pending is always set right before reset_task is scheduled and as there is no synchronization between the setting and scheduling, busy looping on reset_task_pending before flushing reset_task doesn't really buy anything. Directly flush gp->reset_task on suspend and cancel on detach. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: netdev@vger.kernel.org commit 760141a53e5d72d4cc1d8c6e2a0232a24bedb36b Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 igb[v],ixgbe: don't use flush_scheduled_work() All three drivers use flush_scheduled_work() similarly during driver detach. Replace it with explicit cancels. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: e1000-devel@lists.sourceforge.net Cc: netdev@vger.kernel.org commit 9beb4896cec71e40738a7752072174fbf0d5b7b4 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 iseries_veth: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. Remove its usage from iseries_veth. * Cancelling a delayed work, queueing it for immediate execution if cancelled and then waiting for completion can be done by simply calling flush_delayed_work_sync(). * Explicitly cancel cnx->statemachine_wq on module unload. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Santiago Leon Cc: netdev@vger.kernel.org commit f5c35cc191afd08d660e6db0fecc9f431dc8f273 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 ehea: don't use flush_scheduled_work() Directly cancel port->reset_task from ehea_shutdown_single_port() instead. As this cancels the work for each port on driver detach, flushing system_wq from ehea_remove() or ehea_module_exit() is no longer necessary. Signed-off-by: Tejun Heo Cc: Breno Leitao Cc: netdev@vger.kernel.org commit 3d6b892bcc4c810071e36d8aff25aa171f55f93d Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 ehea: kill unused ehea_rereg_mr_task ehea_rereg_mr_task is not used. Remove it and drop @work parameter from ehea_rereg_mrs(). Signed-off-by: Tejun Heo Cc: Breno Leitao Cc: netdev@vger.kernel.org commit 23f333a2bfafba80339315b724808982a9de57d9 Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 drivers/net: don't use flush_scheduled_work() flush_scheduled_work() is on its way out. This patch contains simple conversions to replace flush_scheduled_work() usage with direct cancels and flushes. Directly cancel the used works on driver detach and flush them in other cases. The conversions are mostly straight forward and the only dangers are, * Forgetting to cancel/flush one or more used works. * Cancelling when a work should be flushed (ie. the work must be executed once scheduled whether the driver is detaching or not). I've gone over the changes multiple times but it would be much appreciated if you can review with the above points in mind. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Jay Cliburn Cc: Michael Chan Cc: Divy Le Ray Cc: e1000-devel@lists.sourceforge.net Cc: Vasanthy Kolluri Cc: Samuel Ortiz Cc: Lennert Buytenhek Cc: Andrew Gallatin Cc: Francois Romieu Cc: Ramkrishna Vepa Cc: Matt Carlson Cc: David Brownell Cc: Shreyas Bhatewara Cc: netdev@vger.kernel.org commit 6e07ebd84eef00be9e169a6d15a0bc20b06578fa Author: Tejun Heo Date: Sun Dec 12 16:45:14 2010 +0100 drivers/net: remove unnecessary flush_scheduled_work() calls janz-ican3, sh_eth, skge and vxge don't use workqueue at all and there is no reason to flush the system_wq. Drop flush_scheduled_work() calls and references to workqueue. Signed-off-by: Tejun Heo Cc: "David S. Miller" Cc: Wolfgang Grandegger Cc: Stephen Hemminger Cc: Ramkrishna Vepa Cc: Sivakumar Subramani Cc: Sreenivasa Honnur Cc: Jon Mason Cc: netdev@vger.kernel.org commit 5878730be4e3d0c9527d6f2f688874e38acacc98 Author: Joe Perches Date: Sat Oct 30 14:08:27 2010 -0700 firewire: core: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Stefan Richter commit 60a74a6ff86b4e90b9558956589390efdeb4e924 Author: Stefan Richter Date: Sat Oct 23 13:18:56 2010 +0200 firewire: nosy: char device is not seekable Amend .open handler accordingly and remove the .llseek handler. .llseek = NULL means no_llseek (return error) since commit 776c163b1b93. The only client that uses this interface is nosy-dump in linux/tools/firewire and it knows not to seek in this char dev. Signed-off-by: Stefan Richter commit ad1184c6cf067a13e8cb2a4e7ccc407f947027d0 Author: Manuel Lauss Date: Sat Dec 11 09:53:42 2010 +0000 net: au1000_eth: remove unused global variable. The driver global au_macs[] is unused in the entire kernel tree, so remove it. Signed-off-by: Manuel Lauss Signed-off-by: David S. Miller commit 85a564983aff948b9ea8b6e734b3e80b5755d12a Author: Jon Mason Date: Fri Dec 10 15:40:04 2010 +0000 s2io: Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 109387 389 24432 134208 20c40 drivers/net/s2io.o.old 109358 389 24432 134179 20c23 drivers/net/s2io.o.new Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit 11410b62cf9bdaed5863696c7994286a900424c7 Author: Jon Mason Date: Fri Dec 10 15:40:03 2010 +0000 s2io: Update Driver Version Update Driver Version Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit c0dbf37e78c5c1e3e6cfeb39de30518fdde33e83 Author: Jon Mason Date: Fri Dec 10 15:40:02 2010 +0000 s2io: make strings at tables const Put immutable data in read/only section. Signed-off-by: Stephen Hemminger Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1853e2e15dc95ff3430530941b5856581251ef70 Author: Jon Mason Date: Fri Dec 10 15:40:01 2010 +0000 s2io: rx_ring_sz bounds checking modparm rx_ring_sz can be set to be greater than the maximum allowable number of blocks. This results in an array overrun when probing the driver, and causes memory corruption. Also, the MAX_RX_DESC_1 multiply the max number of rings by max number of blocker per ring by 127, but the driver does the same calculation with 127+1. This results in the possibility of the value being set being larger than the maximum allowable value. Finally, clean-up the s2io_ethtool_gringparam code to be more intuitive. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit c4ffafa51bb0bea648a4ca119033a95057799c9d Author: Tejun Heo Date: Sat Dec 11 17:51:36 2010 +0100 HID: hid-picolcd: don't use flush_scheduled_work() flush_scheduled_work() is deprecated and scheduled to be removed. Directly flush picolcd_fb_cleanup on exit instead. Signed-off-by: Tejun Heo Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit 69fff9bbbc4d214ed22c8f89681af3871a128e35 Author: Mark Brown Date: Fri Dec 10 19:17:08 2010 +0000 ASoC: Automatically manage WM8903 deemphasis rate Provide the user with a boolean control then automatically select the deemphasis filter most closely matching the sample rate. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit f2c1fe090093ed62271473342f093df53c4f8a59 Author: Mark Brown Date: Fri Dec 10 19:17:07 2010 +0000 ASoC: Remove open coded symmetry implementation from WM8903 We're already flagged as using symmetric rates so we don't need to have a custom implementation. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit dcf9ada3bce67feab4482845f5e8e78fd278a176 Author: Mark Brown Date: Fri Dec 10 19:17:06 2010 +0000 ASoC: Implement WM8903 oversampling rate controls Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 460f4aae8f9c6e414f17bfaaf9b89942ed5984a6 Author: Mark Brown Date: Fri Dec 10 18:42:58 2010 +0000 ASoC: Implement WM8903 high pass filter support Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 45f74264e18449cf3c93cccaf098ee6e9524ab78 Author: Thomas Gleixner Date: Sat Dec 11 12:34:34 2010 +0100 timerqueue: Make timerqueue_getnext() static inline No point in calling a function just to dereference a pointer. Signed-off-by: Thomas Gleixner Cc: John Stultz commit e4a2b3565fc7ac2d70361a36337be57a59d783da Author: Sergei Shtylyov Date: Fri Dec 10 22:48:28 2010 +0300 usb: musb: core: kill unneeded #include's musb_core.c #include's a bunch of ARM and DaVinci specific headers, goodness knows why -- it happily compiles without them... Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi commit 5a166f4f9999355720f829e94cf3bd306bae6f8b Author: Sergei Shtylyov Date: Fri Dec 10 20:23:06 2010 +0300 DA8xx: assign name to MUSB IRQ resource Commit fcf173e4511193b1efeccb0f22a8c641b464353b (usb: musb: add names for IRQs in structure resource) forgot to assign name to the DA8xx MUSB IRQ resource. Because of that MUSB driver fails to load on DA8xx machines. Signed-off-by: Sergei Shtylyov Signed-off-by: Felipe Balbi commit 042620a018afcfba1d678062b62e463b9e43a68d Author: John Stultz Date: Thu Oct 14 16:22:33 2010 -0700 RTC: Remove UIE emulation Since we provide UIE interrupts via a rtc_timer, the old emulation code can be removed. Signed-off-by: John Stultz LKML Reference: <1290136329-18291-5-git-send-email-john.stultz@linaro.org> Acked-by: Alessandro Zummo Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit 6610e0893b8bc6f59b14fed7f089c5997f035f88 Author: John Stultz Date: Thu Sep 23 15:07:34 2010 -0700 RTC: Rework RTC code to use timerqueue for events This patch reworks a large portion of the generic RTC code to in-effect virtualize the rtc interrupt code. The current RTC interface is very much a raw hardware interface. Via the proc, /dev/, or sysfs interfaces, applciations can set the hardware to trigger interrupts in one of three modes: AIE: Alarm interrupt UIE: Update interrupt (ie: once per second) PIE: Periodic interrupt (sub-second irqs) The problem with this interface is that it limits the RTC hardware so it can only be used by one application at a time. The purpose of this patch is to extend the RTC code so that we can multiplex multiple applications event needs onto a single RTC device. This is done by utilizing the timerqueue infrastructure to manage a list of events, which cause the RTC hardware to be programmed to fire an interrupt for the next event in the list. In order to preserve the functionality of the exsting proc,/dev/ and sysfs interfaces, we emulate the different interrupt modes as follows: AIE: We create a rtc_timer dedicated to AIE mode interrupts. There is only one per device, so we don't change existing interface semantics. UIE: Again, a dedicated rtc_timer, set for periodic mode, is used to emulate UIE interrupts. Again, only one per device. PIE: Since PIE mode interrupts fire faster then the RTC's clock read granularity, we emulate PIE mode interrupts using a hrtimer. Again, one per device. With this patch, the rtctest.c application in Documentation/rtc.txt passes fine on x86 hardware. However, there may very well still be bugs, so greatly I'd appreciate any feedback or testing! Signed-off-by: John Stultz LKML Reference: <1290136329-18291-4-git-send-email-john.stultz@linaro.org> Acked-by: Alessandro Zummo Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit b007c389d3e09b823eccda1503390fa2a9adca0d Author: John Stultz Date: Fri Dec 10 22:19:53 2010 -0800 hrtimer: fix timerqueue conversion flub In converting the hrtimers to timerqueue, I missed a spot in hrtimer_run_queues where we loop running timers. We end up not pulling the new next value out and instead just use the last next value, causing boot time hangs in some cases. The proper fix is to pull timerqueue_getnext each iteration instead of using a local next value. Reported-by: Ingo Molnar Signed-off-by: John Stultz commit 9835fd7321a67feba6432e63bf2cba43f5a56bd9 Author: Carolyn Wyborny Date: Mon Nov 22 17:17:21 2010 +0000 igb: Add new function to read part number from EEPROM in string format New adapters will have part numbers stored in string format rather than simple hex format. This function will read part number formats in either hex or string. Signed-off-by: Carolyn Wyborny Signed-off-by: Jeff Kirsher commit c920aa8b87bfec3dbd926ae777430e613e5088df Author: Bruce Allan Date: Wed Dec 1 08:45:24 2010 +0000 e1000e: increment the driver version Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 61c758166701c4f156c0aba10260f5729b1a6f43 Author: Bruce Allan Date: Thu Dec 9 23:04:25 2010 +0000 e1000e: static analysis tools complain of a possible null ptr p dereference Adding this default case resolves the issue. v2- Removed "break" in default case based on feedback Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit e9262447233037e9336d5866628821156a17366f Author: Bruce Allan Date: Wed Nov 24 06:02:06 2010 +0000 e1000e: minor error message corrections Correct error messages when setting up Rx resources and when checking module parameters. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 36b973df713e1395b79896de667ad7dbb1925fa7 Author: Bruce Allan Date: Wed Nov 24 07:42:43 2010 +0000 e1000e: prevent null ptr dereference in e1000_tx_queue() tx_desc can be dereferenced as a null pointer when count is passed in as 0. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 073287c037083497ebaaf75ead469b769f218615 Author: Bruce Allan Date: Wed Nov 24 06:01:51 2010 +0000 e1000e: support new PBA format from EEPROM Provide support to e1000e for displaying the new format of the PBA found in the EEPROM. The unique PBA identifier is no longer restricted to hexadecimal numbers and must now be read and displayed as a string. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 664dc878ed6f0476b875547547a49e06f7a4e73b Author: Bruce Allan Date: Wed Nov 24 06:01:46 2010 +0000 e1000e: 82579 PHY incorrectly identified during init During init, reading the 2 PHY ID registers back-to-back in the default fast mode could return invalid data (all F's) and in slow mode could return data to the second read the data from the first read. To resolve the issue in fast mode, set to slow mode before any PHY accesses; to resolve the issue in slow mode, put in a delay for every 82579 PHY access. Since this PHY is currently only paired with the pch2lan MAC and the PHY type is not known before the first PHY access which can fail this way, check for this based on MAC-type. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit ce54afd16d874ac07378a8bb55d26f7f5b613c0e Author: Bruce Allan Date: Wed Nov 24 06:01:41 2010 +0000 e1000e: 82577/8/9 mis-configured OEM bits during S0->Sx The LPLU (Low Power Link Up) and Gigabit Disable bits (a.k.a. OEM bits) were being configured incorrectly when device goes to D3 state. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit d9c76f99c2a79feb413e3e751362d59c0f5323f6 Author: Bruce Allan Date: Wed Nov 24 06:01:35 2010 +0000 e1000e: 82571 Serdes can fail to get link When link partner is sending continuous Config symbols, the 82571 Serdes FIFO can overflow resulting in Invalid bit getting set. To resolve this, if Sync and Config bits are both 1 ignore the Invalid bit and restart auto-negotiation. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit cbd006cb7d4e7b76c6febf7f51e970bced132914 Author: Bruce Allan Date: Wed Nov 24 06:01:30 2010 +0000 e1000e: 82577/8 must acquire h/w semaphore before workaround The workaround function e1000_configure_k1_pchlan() assumes the h/w semaphore is already acquired. This was originally missed when setting up the part for the ethtool loopback test. Signed-off-by: Bruce Allan Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit ed5c2b0b78e5467f7948bef92b21f3c76823f392 Author: Bruce Allan Date: Wed Nov 24 06:01:25 2010 +0000 e1000e: 82574/82583 performance improvement Increasing the transmit fifo by 4K (by decreasing the receive fifo size specified in .pba by the same amount) increases Tx performance. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit a82a14f4cdcfedb27eacec8eb4d9e47d42c10d43 Author: Bruce Allan Date: Wed Nov 24 06:01:20 2010 +0000 e1000e: 82571-based mezzanine card can fail ethtool link test On certain 82571-based mezzanine NICs in some blade servers, the ethtool link test can fail due to the serdes_has_link flag not set correctly. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 9633e63bb1d82c02950983d5d3317e6656b11c8e Author: Holger Eitzenberger Date: Wed Nov 17 15:43:52 2010 +0000 e1000e: fix double initialization in blink path The kernel goes BUG() at the time 'ethtool -p eth0 3' comes back, which is due to adapter->led_blink_task initialized several times. At the time it is still running this results in a corrupted task_list of the associated workqueue. The fix is to move the workqueue initialization to the probe function instead. Signed-off-by: Holger Eitzenberger Reviewed-by: Jesse Brandeburg Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 9fe93afdd07aba52a018eb52784124579a80470e Author: Don Skidmore Date: Fri Dec 3 09:33:54 2010 +0000 ixgbe: cleanup string function calls to use bound checking versions. Some minor cleanup to use string calls that use bound checks just to be extra safe. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 5136cad37b276e3e11c4f8ad0bcf9cb2eec0e5af Author: Emil Tantilov Date: Wed Dec 1 05:47:05 2010 +0000 ixgbe: fix ntuple support commit f62bbb5e62c6e4a91fb222d22bc46e8d4d7e59ef ixgbe: Update ixgbe to use new vlan accleration. removed ETH_FLAG_NTUPLE from the supported flags. This patch puts it back on to allow for setting ntuple via ethtool. CC: Jesse Gross Signed-off-by: Emil Tantilov Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit d994653db465616a7bf27703e733170c47488cdf Author: Don Skidmore Date: Thu Dec 9 06:55:19 2010 +0000 ixgbe: fix X540 to use it's own info struct This patch enables X540 hardware to use it's own set of support functions. This is useful as it has no need of SFP+ support. A couple minor bugs with the eeprom semaphore were also cleaned up. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 2b264909c660717a67da997a181a4a4f551ef9b6 Author: Don Skidmore Date: Thu Dec 9 06:55:14 2010 +0000 ixgbe: fix X540 phy id to correct value The existing PHY ID for X540 was from early production hardware and is no longer correct. This patch corrects that. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit ae54496f9e8d40c89e5668205c181dccfa9ecda1 Author: Emil Tantilov Date: Sat Dec 4 05:35:17 2010 +0000 ixgb: Don't check for vlan group on transmit Based on a patch from Jesse Gross. Enable vlan tag insertion even when vlan group is not configured. For ixgb HW both CTRL0.VME and VLE bit in the Tx descriptor need to be set in order to enable HW acceleration. Introduced separate functions for enabling/disabling of vlan tag stripping similar to ixgbe. CC: Jesse Gross Signed-off-by: Emil Tantilov Tested-by: Jeff Pieper Signed-off-by: Jeff Kirsher commit 667445008db3f45a760c235d771be0c9671e59e5 Author: Jeff Kirsher Date: Wed Dec 1 19:59:50 2010 +0000 Intel Wired LAN drivers: Use static const Based on work by Joe Perches Using static const to decrease data and overall object size. CC: Joe Perches Signed-off-by: Jeff Kirsher Tested-by: Emil Tantilov commit 19a0b67afd174c4db261d587b5c67704dcd53c17 Author: Dean Nelson Date: Thu Nov 11 05:50:25 2010 +0000 e1000: fix return value not set on error Dean noticed that 'err' wasn't being set when the "goto err_dma" statement is executed in the following hunk from the commit. It's value will be zero as a result of a successful call to e1000_init_hw_struct(). This patch changes the error condition to be correctly propagated. CC: stable@kernel.org Signed-off-by: Dean Nelson Signed-off-by: Jesse Brandeburg Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit fa795e6b9c59a14c80a475428df7e4cb97396f47 Author: Jeff Kirsher Date: Fri Dec 10 00:09:08 2010 -0800 MAINTAINERS: Update Intel Wired LAN info Update with Intel Wired Ethernet public git trees. Signed-off-by: Jeff Kirsher commit dabee56860bc6b617c7ea481bb9b00fba41c9c48 Author: Jeff Kirsher Date: Fri Dec 10 00:01:44 2010 -0800 Documentation/networking/ixgbevf.txt: Update documentation Update Intel Wired LAN ixgbevf documentation. Signed-off-by: Jeff Kirsher commit 872857a84e18f4bf9b56b298309a977b2ce77b5b Author: Jeff Kirsher Date: Thu Dec 9 23:55:47 2010 -0800 Documentation/networking/ixgbe.txt: Update ixgbe documentation Update Intel Wired LAN ixgbe documentation. Signed-off-by: Jeff Kirsher commit f2be1429798785c6b7d4747ac1fda2c40b3f26eb Author: Jeff Kirsher Date: Thu Dec 9 23:49:34 2010 -0800 Documentation/networking/igbvf.txt: Update documentation Update Intel Wired LAN igbvf documentation. Signed-off-by: Jeff Kirsher commit 1ffd7246445038569f4c2f4b39bda1e71e68f1a2 Author: Jeff Kirsher Date: Thu Dec 9 23:47:39 2010 -0800 Documentation/networking/igb.txt: update documentation Update Intel Wired LAN igb documentation. v2- Updated the ethtool support link, removed the LRO section and anti-spoofing sections. Signed-off-by: Jeff Kirsher commit 072ed34fa97374b390a2493fa281ec8a7888b312 Author: Jeff Kirsher Date: Thu Dec 9 23:44:42 2010 -0800 Documentation/networking/e1000e.txt: Update documentation Update Intel Wired LAN e1000e documentation. Signed-off-by: Jeff Kirsher commit 96c3c0330dea8856f02fc59e25c866d6d5eebed5 Author: Jeff Kirsher Date: Thu Dec 9 23:42:00 2010 -0800 Documentation/networking/e1000.txt: Update documentation Update Intel Wired LAN e1000 documentation. Signed-off-by: Jeff Kirsher commit a5d62a149bb8f5359aff7ed7dce339752fbabfd9 Author: David S. Miller Date: Fri Dec 10 16:49:24 2010 -0800 isdn: Fix printed out copy_from_user() return value after previous change. Signed-off-by: David S. Miller commit 23bcbf1b63350ed529f7dfb8a5c459e6e0c1a3ca Merge: 6313e3c 595a251 Author: David S. Miller Date: Fri Dec 10 16:34:10 2010 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit f073c7ca29a4a7e14060d9d3ddf09bfbb7cd9cc0 Author: Taku Izumi Date: Thu Dec 9 15:17:13 2010 +0000 bonding: add the debugfs facility to the bonding driver This patch provides the debugfs facility to the bonding driver. The "bonding" directory is created in the debugfs root and directories of each bonding interface (like bond0, bond1...) are created in that. # mount -t debugfs none /sys/kernel/debug # ls /sys/kernel/debug/bonding bond0 bond1 Signed-off-by: Taku Izumi Signed-off-by: Jay Vosburgh Signed-off-by: David S. Miller commit 6c2c9d964e71770e7d6efc1a82f3621005d12185 Author: Roopa Prabhu Date: Fri Dec 10 12:02:33 2010 +0000 enic: Move enic port profile handling code to a new 802.1Qbh provisioning info type Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 36accaed22347f4b09cbc3c9fe2c1163a3575ea1 Author: Dan Carpenter Date: Fri Dec 10 02:40:09 2010 +0000 isdn: return -EFAULT if copy_from_user() fails We should be returning -EFAULT here. Mostly this patch is to silence a smatch warning. The upper levels of this driver turn all non-zero return values from isar_load_firmware() into 1. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 5d52040d4d1eabb56a4d51b760ab8f74eabb9001 Author: Jon Mason Date: Fri Dec 10 14:03:02 2010 +0000 vxge: update driver version Update vxge driver version to 2.5.1 Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit b55e7b153f698bb027102759388d0c09542f68bd Author: Jon Mason Date: Fri Dec 10 14:03:01 2010 +0000 vxge: independent interrupt moderation Configure the workload clock register and TIM register for independent interrupt moderation based on the individual vpath utilization instead of common link utilization. This greatly improves latency. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 9c1638871671721e8f3693a0dfbb0e2e05b08742 Author: Jon Mason Date: Fri Dec 10 14:03:00 2010 +0000 vxge: hotplug stall When hot-unplugging a vxge adapter while running, the driver's remove routine prints warning and then stalls the calling thread. This is due to vxge_remove calling vxge_device_unregister to unregister the netdev before calling flush_scheduled_work clear any pending work. Swapping the order of these two functions resolves the issue. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 2e41f6449c561e6e3f572e11d0f2240bd51104db Author: Jon Mason Date: Fri Dec 10 14:02:59 2010 +0000 vxge: transmit timeout deadlock Use a workqueue to handle the device reset during a transmit timeout, as there can be a deadlock during bringup. Also, set the netif carrier off before the watchdog reset is started to prevent the timeout from reoccurring while still processing the first. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit dc66daa9be40369ead5a4ee33c6bcfb44cb3c8ee Author: Jon Mason Date: Fri Dec 10 14:02:58 2010 +0000 vxge: use pci_request_region() Only BAR0 is ever accessed, thus making the calls to pci_request_regions overkill. Change calls of pci_request_regions to pci_request_region to reduce the size of the mapped area. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit c92bf70dcb9d08f821e4c9f09f8fc328495ba998 Author: Jon Mason Date: Fri Dec 10 14:02:57 2010 +0000 vxge: fix crash of VF when unloading PF Calling pci_disable_sriov when unloading a SR-IOV physical function driver from a host when a guest is using a virtual function from that device can cause a host crash or VM crash. The crash is caused by the virtual config space no longer being present when PF is removed (due to the pci_disable_sriov). This can be avoided by not calling pci_disable_sriov to disable the PCI space when shutting down the PF. Each function in the X3100 operates independently and in this case will operate properly in the absence of the PF. Also, added improved logic in the detection of SR-IOV initialization. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 528f727279ae840db8a06c94f5e82cdaeb00da6f Author: Jon Mason Date: Fri Dec 10 14:02:56 2010 +0000 vxge: code cleanup and reorganization Move function locations to remove the need for internal declarations and other misc clean-ups. Signed-off-by: Jon Mason Signed-off-by: Arpit Patel Signed-off-by: David S. Miller commit deef4b522b814593407cfd56216840c2b75e9f15 Author: Herbert Xu Date: Thu Dec 9 17:38:11 2010 +0000 bridge: Use consistent NF_DROP returns in nf_pre_routing The nf_pre_routing functions in bridging have collected two distinct ways of returning NF_DROP over the years, inline and via goto. There is no reason for preferring either one. So this patch arbitrarily picks the inline variant and converts the all the gotos. Also removes a redundant comment. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit c053fd96d0d3d18c721f880b8fdd0b925894d9c4 Author: Changli Gao Date: Fri Dec 10 16:02:20 2010 -0800 af_packet: use swap() instead of the open coded macro XC() Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit ed4ba4b5b96742d29225308ccccbdb1810b63064 Author: Ben Hutchings Date: Thu Dec 9 12:10:25 2010 +0000 netdev: Use default implementation of ethtool_ops::get_link where possible Various drivers are using implementations of ethtool_ops::get_link that are equivalent to the default ethtool_op_get_link(). Change them to use that instead. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit e596e6e4d578f2639416e620d367a3af34814a40 Author: Ben Hutchings Date: Thu Dec 9 12:08:35 2010 +0000 ethtool: Report link-down while interface is down While an interface is down, many implementations of ethtool_ops::get_link, including the default, ethtool_op_get_link(), will report the last link state seen while the interface was up. In general the current physical link state is not available if the interface is down. Define ETHTOOL_GLINK to reflect whether the interface *and* any physical port have a working link, and consistently return 0 when the interface is down. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 29639059a0122d95b34b5475bd9fee3910b401a3 Author: Roopa Prabhu Date: Wed Dec 8 13:54:03 2010 +0000 enic: Use VF mac set by IFLA_VF_MAC in port profile provisioning data This patch adds support in enic 802.1Qbh port profile provisioning code to use the mac address set by IFLA_VF_MAC. For now we handle this mac as a special case for a VM mac address sent to us by libvirt. The VM mac address is sent to the switch along with the rest of the port profile provisioning data. This patch also adds calls to register and deregister the mac address during port profile association/deassociation. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 0b1c00fc3e9f8d658e0632da7e7ee57bed779ec7 Author: Roopa Prabhu Date: Wed Dec 8 13:53:58 2010 +0000 enic: Add ndo_set_vf_mac support for enic dynamic devices This patch implements the ndo_set_vf_mac netdev operation for enic dynamic devices. It treats the mac address set by IFLA_VF_MAC as a special case to use it in the port profile provisioning data. Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit 319d7e847355ec7e03d3c865917b2b0e2e592fb8 Author: Roopa Prabhu Date: Wed Dec 8 13:19:58 2010 +0000 enic: Add ndo_set_rx_mode support for enic vnics Add ndo_set_rx_mode support to register unicast and multicast address filters for enic devices Signed-off-by: Roopa Prabhu Signed-off-by: Vasanthy Kolluri Signed-off-by: David Wang Signed-off-by: Christian Benvenuti Signed-off-by: David S. Miller commit a8d764b9832d3cc86019f71916665dd2d337d7c2 Author: Junchang Wang Date: Wed Dec 8 16:55:16 2010 +0000 pktgen: adding prefetchw() call We know for sure pktgen is going to write skb->data right after *_alloc_skb, causing unnecessary cache misses. Idea is to add a prefetchw() call to prefetch the first cache line indicated by skb->data. On systems with Adjacent Cache Line Prefetch, it's probably two cache lines are prefetched. With this patch, pktgen on Intel SR1625 server with two E5530 quad-core processors and a single ixgbe-based NIC went from 8.63Mpps to 9.03Mpps, with 4.6% improvement. Signed-off-by: Junchang Wang Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit e4f05af136016958f52455da3070ca6622439b10 Author: Ondrej Puzman Date: Sat Dec 4 21:17:38 2010 +0100 8250: fix uninitialized FIFOs I have found a bug in 8250.c driver which causes that 16550A uart FIFOs are not turned on during initialization if they are manually configured by setserial. UART is then working only as plain 16450 without FIFOs. On systems with higher interrupt latency this causes buffer overruns and loss of received data when using higher communication speeds. I'm working for a company which produces industrial computers. These devices typically contain high number (8 or more) of traditional 16550A uarts - we use TL16C554A chips, but that is not much relevant. UARTs are connected to the CPU by ISA bus (Celeron based devices) or LPC bus (Atom based devices). In the Linux the UARTs are using standard 8250.c driver and are initialized using setserial command: setserial /dev/ttyS4 uart 16550A port 0x3E0 irq 10 baud_base 115200 This executes the UART initialization through serial8250_startup() function. At the beginning of the function up->capabilities is initialized from uart_config: up->capabilities = uart_config[up->port.type].flags; Please note that neither up->port.fifosize nor up->tx_loadsz is initialized here!! Later in the same function serial8250_clear_fifos() is called and disables FIFOs. The above comment says that they will be reenabled in set_termios (they won't ...) After serial8250_startup() the serial8250_set_termios() is called. In this function the following check fails because up->port.fifosize is zero because it is not initialized correctly. if (up->capabilities & UART_CAP_FIFO && up->port.fifosize > 1) { if (baud < 2400) fcr = UART_FCR_ENABLE_FIFO | UART_FCR_TRIGGER_1; else fcr = uart_config[up->port.type].fcr; } fcr variable remains zero and in the end the FCR register is set to zero which results in disabled FIFOs even if the UART type is 16550A. This is also true for other types of UARTs with FIFOs. If the UART is autoconfigured via 'setserial /dev/ttySx autoconfig' then port.fifosize and tx_loadsz are initialized correctly in the autoconfig() function and the UART is working correctly then. I checked the source codes and I can say that this bug is present in 2.6.x series of kernels for a couple of years. Namely I can confirm its presence in 2.6.16.57, 2.6.32.24 and 2.6.36.1 (tested all of them on our hardware). I think it was not noticed before because not many people use manually configured non PNP UARTs on ISA/LPC bus these days. Also the data loss caused by buffer overruns occures only if IRQ latency is higher then time needed to receive one character on given communication speed. For example our hardware looses received characters only if the UARTs are connected throught LPC bus with SERIRQ (serial IRQ transport) and not if they are connected to ISA bus because LPC SERIRQ has higher interrupt latency then parallel ISA interupt lines. Here is the patch to correct the bug created against 2.6.36.1: Signed-off-by: Ondrej Puzman Signed-off-by: Greg Kroah-Hartman commit 53139e36cdd7bbc5efcbdc5e70fbff66e2da3c09 Author: Namhyung Kim Date: Tue Dec 7 23:27:43 2010 +0900 ip2: fix compiler warning on ip2main_pci_tbl Annotate ip2main_pci_tbl as '__used' to fix following warning: CC drivers/char/ip2/ip2main.o drivers/char/ip2/ip2main.c:3227: warning: ‘ip2main_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Cc: "Michael H. Warfield" Signed-off-by: Greg Kroah-Hartman commit fd0f5c54eeb66e3e89e3cdd34c5abf8d5fbcf61c Author: Namhyung Kim Date: Tue Dec 7 23:27:42 2010 +0900 specialix: fix compiler warning on specialix_pci_tbl Annotate specialx_pci_tbl as '__used' to fix following warning: CC drivers/char/specialix.o drivers/char/specialix.c:2358: warning: ‘specialx_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Cc: Roger Wolff Signed-off-by: Greg Kroah-Hartman commit 6835a209f6c24b3704aa58d8b558a513a5a08c52 Author: Namhyung Kim Date: Tue Dec 7 23:27:41 2010 +0900 rocket: fix compiler warning on rocket_pci_ids Annotate rocket_pci_ids as '__used' to fix following warning: CC drivers/char/rocket.o drivers/char/rocket.c:1767: warning: ‘rocket_pci_ids’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit a3ae0fc34f58e7163b7724feb3d77aa4603f0dc3 Author: Jamie Iles Date: Wed Dec 1 23:39:36 2010 +0000 8250: add a UPIO_DWAPB32 for 32 bit accesses Some platforms contain a Synopsys DesignWare APB UART that is attached to a 32-bit APB bus where sub-word accesses are not allowed. Add a new IO type (UPIO_DWAPB32) that performs 32 bit acccesses to the UART. v2: - don't test for 32 bit in the output fast path, provide a separate dwabp32_serial_out() function. Refactor dwabp_serial_out() so that we can reuse the LCR saving code. v3: - rebased on top of "8250: use container_of() instead of casting" Signed-off-by: Jamie Iles Signed-off-by: Greg Kroah-Hartman commit 49d5741be27aa90301b89bf254972b355ed9c8ee Author: Jamie Iles Date: Wed Dec 1 23:39:35 2010 +0000 8250: use container_of() instead of casting The 8250 driver structure uart_8250_port took advantage of the fact that the struct uart_port was the first member of its structure and used an explicit cast to convert to the derived class. Replace the explicit casts with container_of() for safety and clarity. Signed-off-by: Jamie Iles Signed-off-by: Greg Kroah-Hartman commit 1b41dbc1296269797efbb2b0837732b74de4731d Author: Cosmin Cojocar Date: Sun Dec 5 16:15:10 2010 +0100 serial: omap-serial: Add support for kernel debugger The kgdb invokes the poll_put_char and poll_get_char when communicating with the host. This patch also changes the initialization order because the kgdb will check at the very beginning, if there is a valid serial driver. Signed-off-by: Cosmin Cojocar Signed-off-by: Greg Kroah-Hartman commit 5ac387d983149d4658aad17242d24eef85a43fa8 Author: Randy Dunlap Date: Thu Dec 2 09:19:48 2010 -0800 serial: fix pch_uart kconfig & build The dma_request_channel/dma_release_channel interfaces are not built when DMADEVICES is not enabled, so make the driver depend on DMADEVICES. Also, the help text says that the driver enables & uses PCH_DMA, which is not enabled, so select that. ERROR: "__dma_request_channel" [drivers/serial/pch_uart.ko] undefined! ERROR: "dma_release_channel" [drivers/serial/pch_uart.ko] undefined! Signed-off-by: Randy Dunlap Cc: Tomoya MORINAGA Reported-by: Zimny Lech Signed-off-by: Greg Kroah-Hartman commit 4afb7527ac8cc7bd8f03570e12f6eed0eca03363 Author: stephen hemminger Date: Mon Dec 6 12:33:01 2010 +0000 sfc: convert references to LRO to GRO This driver now uses Generic Receive Offload, not the older LRO. Change references to LRO in names and comments. Signed-off-by: Stephen Hemminger Acked-by: Ben Hutchings Signed-off-by: David S. Miller commit 376d940ee91318cc6becefbb9454bb4454d7473f Author: Tobias Klauser Date: Thu Dec 9 04:37:48 2010 +0000 inet6: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 0e51d67ebb8e109a0990a13dafa937fb469aa3fb Author: Tobias Klauser Date: Thu Dec 9 04:50:22 2010 +0000 stmmac: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit a6cea9655bfa821dbf53c6fffb9b2b99fe77367c Author: Peter Ujfalusi Date: Fri Dec 10 13:26:31 2010 +0200 ASoC: tlv320dac33: Power down digital parts, when not needed If the following scenario has been followed: 1. Enable analog bypass amixer sset 'Analog Left Bypass' on amixer sset 'Analog Right Bypass' on 2. Start playback aplay -fdat -d3 /dev/zero After the playback stopped (3 sec), and the soc timeout (5 sec), the digital parts of the codec will remain powered up. This means that the DAI clocks are continue to run, the oscillator remain operational, etc. Use the SND_SOC_DAPM_POST_PMD widget to get notification about the stopped stream, and power down the digital part of the codec. If the analog bypass is enabled, than the codec will remain in BIAS_ON level, and things will work correctly. In case, if the bypass is disabled, than the codec will fall to BIAS_STANDBY than to BIAS_OFF level, as it used to. The digital part of DAC33 is initialized at every stream start (DAPM_PRE:PRE_PMU event), so subsequent streams (within 5 sec) will have working DAI. When the codec is coming out from BIAS_OFF, the full power-up sequence followed by the same DAPM_PRE widget event will power up the digital part. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 040253c931e336360453c8d81f76d1b010b2b5e7 Author: Martin Willi Date: Wed Dec 8 04:37:51 2010 +0000 xfrm: Traffic Flow Confidentiality for IPv6 ESP Add TFC padding to all packets smaller than the boundary configured on the xfrm state. If the boundary is larger than the PMTU, limit padding to the PMTU. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit d979e20f2b9f8a50c8d5f889e0b5d78580440d1f Author: Martin Willi Date: Wed Dec 8 04:37:50 2010 +0000 xfrm: Traffic Flow Confidentiality for IPv4 ESP Add TFC padding to all packets smaller than the boundary configured on the xfrm state. If the boundary is larger than the PMTU, limit padding to the PMTU. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 35d2856b4693e8de5d616307b56cef296b839157 Author: Martin Willi Date: Wed Dec 8 04:37:49 2010 +0000 xfrm: Add Traffic Flow Confidentiality padding XFRM attribute The XFRMA_TFCPAD attribute for XFRM state installation configures Traffic Flow Confidentiality by padding ESP packets to a specified length. Signed-off-by: Martin Willi Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 957fca95e3521e471aac4c2e4cfbc21f399bdd84 Author: Changli Gao Date: Sat Dec 4 15:01:52 2010 +0000 ifb: use the lockless variants of skb_queue rq and tq are both protected by tx queue lock, so we can simply use the lockless variants of skb_queue. skb_queue_splice_tail_init() is used instead of the open coded and slow one. Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c6350362cbb19882ba0eb3578cc1abc07e6ea204 Author: Changli Gao Date: Fri Dec 3 19:55:20 2010 +0000 ifb: remove unused macro TX_TIMEOUT Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit e1f91505025db74c261962dc16d58f79b9b0c83c Author: Changli Gao Date: Fri Dec 3 19:55:19 2010 +0000 ifb: remove the useless debug stats These debug stats are not exported, and become useless. Signed-off-by: Changli Gao Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 6c34d2888221ca3df81e29f598873b4fb6cf838d Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:06 2010 +0200 usb: gadget: g_ncm added This patches makes possible to use composite framework and f_ncm NCM function driver to build a standalone NCM gadget device. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 9f6ce4240a2bf456402c15c06768059e5973f28c Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:05 2010 +0200 usb: gadget: f_ncm.c added Initial submittion of NCM link function driver. The driver's logic is based on f_ecm driver and does not use most of the NCM advantages like frame grouping and alignment. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit 5c1168dbc508282f7717a4472477d52d64403060 Author: Yauheni Kaliuta Date: Wed Dec 8 13:12:04 2010 +0200 usb: gadget: u_ether: prepare for NCM NCM is a Network Control Model, subclass of USB CDC class, specification is available at http://www.usb.org/developers/devclass_docs This patch makes possible for u_ether to use multiply of wMaxPacketSize predefined size transfers without ZLP (Zero Length Packet), required by NCM spec. Signed-off-by: Yauheni Kaliuta Signed-off-by: Greg Kroah-Hartman commit a6a5ff26975c87a97f88c6ea077c325ff20c4cf2 Author: Jan Glauber Date: Wed Dec 8 02:58:01 2010 +0000 qeth: buffer count imbalance The used buffers counter is not incremented in case of an error so the counter can become negative. Increment the used buffers counter before checking for errors. Signed-off-by: Jan Glauber Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 91d4576bfe87980b1b86305c29912d96b96ce98e Author: Frank Blaschka Date: Wed Dec 8 02:58:00 2010 +0000 qeth: l3 add vlan hdr in passthru frames OSA l3 mode is hw accelerated VLAN only for IPv4. Take care we add the vlan hdr to a passthru frame in the device driver. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f154b79cd7db221240ab6e8e4d844d3a3f10b04c Author: Einar Lueck Date: Wed Dec 8 02:57:59 2010 +0000 qeth: support VIPA add/del in offline mode Only work through the IP adddress to do list if the card is UP or SOFTSETUP. Enables to configure VIPA add/del in offline mode. Signed-off-by: Einar Lueck Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit d0ddf30fdd2b98fb547ffa33bb79a7a96ef8d7dd Author: Einar Lueck Date: Wed Dec 8 02:57:58 2010 +0000 qeth: support ipv6 query arp cache for HiperSockets Function qeth_l3_arp_query now queries for IPv6 addresses, too, if QETH_QARP_WITH_IPV6 is passed as parameter to the ioctl. HiperSockets and GuestLAN in HiperSockets mode provide corresponding entries. Signed-off-by: Einar Lueck Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit ff176a4e2972bdc7a8d65cdcb0bd0d26ab1528cf Author: Richard Röjfors Date: Tue Dec 7 17:28:33 2010 +0100 usb: pch_udc: Fix setup transfers with data out This patch fixes an issue where the driver does not handle out data in setup transactions. The per endpoint cached status register is cleared in the pch_udc_svc_control_out function. When there is out data available the function pch_udc_svc_data_out is called which tries to pick it up the status, which now is cleared to 0. When the status is 0, the function doesn't start reading the data from the FIFO. There is a second bug in all this, pch_udc_svc_data_out takes the endpoint number (0 for EP0), while pch_udc_svc_control_out passes the endpoint index (1 for EP0). Effectively pch_udc_svc_data_out picks up the wrong internal ep structure. This patch makes sure to put back the cached status and pass the endpoint number rather than index when calling pch_udc_svc_data_out. Signed-off-by: Richard Röjfors Signed-off-by: Greg Kroah-Hartman commit 49e208346616328e535b5d6ecd510ab38f210858 Author: Richard Röjfors Date: Tue Dec 7 17:28:30 2010 +0100 usb: pch_udc: Fix compile error, warnings and checkpatch warnings Building pch_udc in linux-next fails, this patch fixes the a compile error: drivers/usb/gadget/pch_udc.c: In function ‘usb_gadget_register_driver’: drivers/usb/gadget/pch_udc.c:2645: error: ‘struct usb_gadget_driver’ has no member named ‘bind’ drivers/usb/gadget/pch_udc.c:2664: error: ‘struct usb_gadget_driver’ has no member named ‘bind’ And a couple of compiler warnings and checkpatch warnings. Signed-off-by: Richard Röjfors Signed-off-by: Greg Kroah-Hartman commit 969152341e852ae7a5e1b11c33ef6244f3cb3579 Author: Mian Yousaf Kaukab Date: Tue Dec 7 15:00:09 2010 +0100 usb: add ab8500 usb transceiver driver Basic driver for ab8500 usb otg transceiver TODO: -Regulators support -Host and OTG testing -Interface with PRCMU -Charging support Signed-off-by: Mian Yousaf Kaukab Acked-by: Linus Walleij Signed-off-by: Greg Kroah-Hartman commit 2d0cdcc5a0e4e5e467fc4be4d00cc6c531c80b64 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:05 2010 +0530 USB: gadget: Implement runtime PM for MSM bus glue driver OTG driver takes care of putting hardware in low power mode. Hence not registered for any runtime PM callbacks. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit c036019ed2b729cb9517806c2b388b4f4323a904 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:04 2010 +0530 USB: gadget: Implement runtime PM for ci13xxx gadget The actual suspend/resume work is delegated to bus glue driver, which is responsible for putting hardware in low power mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 33f82f387b9cb27bc903e1368fce88b73213910a Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:03 2010 +0530 USB: gadget: Add USB controller driver for MSM SoC MSM SoC has chipidea USB controller. So use ci13xxx_udc core. This driver depends on transceiver driver for clock control, PHY initialization, VBUS detection. Register for notify_event callback to perform MSM specific quirks after controller is reset and stopped. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit f01ef5748f4c4dcd2e49ccb7d75dc113219559d2 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:02 2010 +0530 USB: gadget: Introduce ci13xxx_udc_driver struct Introduces ci13xxx_udc_driver struct for bus glue drivers to hint ci13xxx_udc core about their special requirements. The flags include avoiding hardware register access when controller is not in peripheral mode, enabling pull-up upon VBUS, disabling streaming mode and dependency on transceiver driver. Initialize gadget_ops in udc_probe so that transceiver can notify VBUS presence even when no gadget driver is bounded. A notify_event callback is embedded in the same struct. This patch implements two events called CONTROLLER_RESET_EVENT and CONTROLLER_STOPPED_EVENT to notify the bus glue driver after resetting and stopping the controller for performing SoC specific quirks. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 61948ee4d525174cceee2135a38a482124fcc02c Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:01 2010 +0530 USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask dma_alloc_coherent() which is internally called by dma_pool_alloc() flags a warning if device's coherent DMA mask. Hence initialize gadget device's coherent DMA mask to it's parent mask. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 0a91efa2f951d790969dec96fb675ca7869eca83 Author: Pavankumar Kondeti Date: Tue Dec 7 17:54:00 2010 +0530 USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc dma_pool_alloc() require sleeping context when called with GFP_KERNEL argument. Hence release the spin lock before calling dma_pool_alloc(). usb_ep_alloc_request can also be called with non-atomic GFP flags. Hence get rid off spin lock while allocation request memory. Use GFP_ATOMIC flag for allocating request for ep0 in interrupt handler. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 409a15da9851b6e6a5e1c5787be31a987184b7cf Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:59 2010 +0530 USB: gadget: Separate out PCI bus code from ci13xxx_udc Move PCI bus code from ci13xxx_udc to a new file ci13xxx_pci. SoC's which has MIPS USB core can include the ci13xxx_udc and keep bus glue code in their respective gadget controller drivers. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 87c0104af742af2acfcbd685f2b9a40f33770dc0 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:58 2010 +0530 USB: OTG: msm: Add support for power management Implement runtime and system pm ops to put hardware into low power mode (LPM). As part of LPM, USB clocks are turned off, PHY is put into suspend state and PHY comparators are turned off if VBUS/Id notifications are not required from PHY. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 8bb6a164b906bb7ca319202f85b30e3ef096cd65 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:57 2010 +0530 USB: EHCI: msm: Add support for power management Enable runtime PM and mark no_callbacks flag. OTG device, parent of HCD takes care of putting hardware into low power mode. Adjust port power wakeup flags during system suspend and resume. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit b0848aea10da186372582f33152efdda43944f26 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:56 2010 +0530 USB: EHCI: Add MSM Host Controller driver This patch adds support for EHCI compliant HSUSB Host controller found on MSM chips. The root hub has a single port and TT is built into it. This driver depends on OTG driver for PHY initialization, clock management and powering up VBUS. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit e0c201f339fe7fc38d1b0f6f4755ff627686c7e0 Author: Pavankumar Kondeti Date: Tue Dec 7 17:53:55 2010 +0530 USB: Add MSM OTG Controller driver This driver implements PHY initialization, clock management, ULPI IO ops and simple OTG state machine to kick host/peripheral based on Id/VBUS line status. VBUS/Id lines are tied to a reference voltage on some boards. Hence provide debugfs interface to select host/peripheral mode. Signed-off-by: Pavankumar Kondeti Signed-off-by: Greg Kroah-Hartman commit 05570297ecbe834b1756b522412b68eaffb9ab11 Author: Alex He Date: Tue Dec 7 10:10:08 2010 +0800 USB: EHCI: ASPM quirk of ISOC on AMD SB800 When ASPM PM Feature is enabled on UMI link, devices that use ISOC stream of data transfer may be exposed to longer latency causing less than optimal per- formance of the device. The longer latencies are normal and are due to link wake time coming out of low power state which happens frequently to save power when the link is not active. The following code will make exception for certain features of ASPM to be by passed and keep the logic normal state only when the ISOC device is connected and active. This change will allow the device to run at optimal performance yet minimize the impact on overall power savings. Signed-off-by: Alex He Acked-by: David Brownell Cc: stable Signed-off-by: Greg Kroah-Hartman commit 66921edd7df109196bd1a41309c17896ea0913d7 Author: Peter Huewe Date: Thu Dec 9 23:27:35 2010 +0100 USB: serial: usb_wwan: Add missing uaccess.h / fix build failure This patch fixes a build failure[1] by adding the missing uaccess.h needed for copy_from_user and copy_to_user References: http://kisskb.ellerman.id.au/kisskb/buildresult/3607218/ Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 352a337832774a6929c16b569abe9cedc3db01cc Author: Guennadi Liakhovetski Date: Thu Dec 9 22:46:29 2010 +0100 USB: otg: fix link breakage, when the NOP USB Xceiver is a module If the NOP USB OTG transceiver driver is built as a module, the otg.h header declares external functions, but if they are referenced from the kernel proper, as, e.g., in the OMAP3 case, where the omap3evm board is calling the usb_nop_xceiv_register() function, linkage breaks. This patch fixes this problem. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Greg Kroah-Hartman commit 537baabbdfebe7f9514f05b62eac91b4bfa0bdf2 Author: Tobias Klauser Date: Thu Dec 9 15:52:39 2010 +0100 usb: gadget: f_fs: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 16325f18eaa6066c4b913a5661fc8190ce564f7c Author: Tobias Ollmann Date: Thu Dec 9 14:24:27 2010 +0100 USB: host: uhci-q: Fixed minor coding style issues Fixed coding style issues (delete trailing whitespaces, break long line) Signed-off-by: Tobias Ollmann Signed-off-by: Greg Kroah-Hartman commit 34404082bbdc5d981fa8eb2f9f5dfaae74463877 Author: Uwe Kleine-König Date: Mon Dec 6 17:38:24 2010 +0100 usb: gadget/imx-udc: fix interrupt name again Commit 06c3859 (usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0) was a bit precipitant because the name used instead didn't match the usual naming scheme for irqs on arm/imx. I renamed the irq to the right name in e083000 (ARM: imx: dynamically allocate imx_udc device) when 06c3859 didn't hit Linus' tree, so I missed to add a compat #define. This patch allows compiling imx_udc.c with and without e083000. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 8170344cb8aaa726bf1afae83288946b7cfcb556 Author: Namhyung Kim Date: Tue Dec 7 01:03:32 2010 +0900 USB: whci-hcd: fix compiler warning Annotate whci_hcd_id_table as '__used' to fix following warning: CC drivers/usb/host/whci/hcd.o drivers/usb/host/whci/hcd.c:359: warning: ‘whci_hcd_id_table’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit c07224005dd3fe746246acadc9be652a588a4d7f Author: Jiri Pirko Date: Thu Dec 9 03:40:30 2010 +0000 net/ipv6/udp.c: fix typo in flush_stack() skb1 should be passed as parameter to sk_rcvqueues_full() here. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller commit 457de4383ec6144df7d5a82cdfb110c825305a51 Author: David S. Miller Date: Fri Dec 10 13:16:09 2010 -0800 ipv6: Fix 'release_it' logic in tcp_v6_get_peer() We accidently set it to "true" for the case where we are using a route bound peer. Signed-off-by: David S. Miller commit 4c0833bcd4d302fe783b9f8286a00ca2999d6200 Author: Tobias Klauser Date: Fri Dec 10 03:18:04 2010 +0000 bridge: Fix return values of br_multicast_add_group/br_multicast_new_group If br_multicast_new_group returns NULL, we would return 0 (no error) to the caller of br_multicast_add_group, which is not what we want. Instead br_multicast_new_group should return ERR_PTR(-ENOMEM) in this case. Also propagate the error number returned by br_mdb_rehash properly. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit 998adc3dda59f811966b3ccb21eb223680b25ec4 Author: John Stultz Date: Mon Sep 20 19:19:17 2010 -0700 hrtimers: Convert hrtimers to use timerlist infrastructure Converts the hrtimer code to use the new timerlist infrastructure Signed-off-by: John Stultz LKML Reference: <1290136329-18291-3-git-send-email-john.stultz@linaro.org> Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit 9bb99b147018945366c763b3d4d7008927dc8557 Author: John Stultz Date: Mon Dec 6 13:32:12 2010 -0800 timers: Fixup allmodconfig build issue Adds missed EXPORT_SYMBOL lines that cause the following build failures with allmodconfig: ERROR: "timerqueue_add" [drivers/rtc/rtc-core.ko] undefined! ERROR: "timerqueue_getnext" [drivers/rtc/rtc-core.ko] undefined! ERROR: "timerqueue_del" [drivers/rtc/rtc-core.ko] undefined! Reported-by: Ingo Molnar Reported-by: Thomas Gleixner Signed-off-by: John Stultz commit c04bfc6b223662c42a77727342c1df7d39e686a2 Author: Ben Hutchings Date: Fri Dec 10 01:24:16 2010 +0000 sfc: Remove ancient support for nesting of TX stop Long before this driver went into mainline, it had support for multiple TX queues per port, with lockless TX enabled. Since Linux did not know anything of this, filling up any hardware TX queue would stop the core TX queue and multiple hardware TX queues could fill up before the scheduler reacted. Thus it was necessary to keep a count of how many TX queues were stopped and to wake the core TX queue only when all had free space again. The driver also previously (ab)used the per-hardware-queue stopped flag as a counter to deal with various things that can inhibit TX, but it no longer does that. Remove the per-channel tx_stop_count, tx_stop_lock and per-hardware-queue stopped count and just use the networking core queue state directly. Signed-off-by: Ben Hutchings commit 6ecfd0c70c05531b2850649d0cec46833cd6c381 Author: Ben Hutchings Date: Fri Dec 10 01:19:53 2010 +0000 sfc: Remove unused field and comment on a previously removed field Signed-off-by: Ben Hutchings commit 1f5a24794a54588ea3a9efd521be31d826e0b9d7 Author: John Stultz Date: Thu Dec 9 12:02:18 2010 -0800 timers: Rename timerlist infrastructure to timerqueue Thomas pointed out a namespace collision between the new timerlist infrastructure I introduced and the existing timer_list.c So to avoid confusion, I've renamed the timerlist infrastructure to timerqueue. Reported-by: Thomas Gleixner Signed-off-by: John Stultz commit 79b357c2171ab3e52148503f0efa66d64a13413e Merge: b2d6fef 5de62b8 Author: Tony Lindgren Date: Fri Dec 10 11:37:47 2010 -0800 Merge branch 'devel-gpio' into omap-for-linus commit eaa7dcde1d092c792cbca4be81d2e506e84c6122 Merge: cf78f8e b7ec19a Author: David S. Miller Date: Fri Dec 10 11:22:57 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit 983bbfd091be5b3e1a729f31cce29431fbff2d27 Author: Greg Kroah-Hartman Date: Fri Dec 10 10:56:18 2010 -0800 Staging: iio: fix up world writable sysfs files. You should not be able to write to sysfs files from any user. Cc: Graf Yang Cc: Michael Hennerich Cc: Jonathan Cameron Cc: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 64d74c6cbe52fbec90ead8f3bf53bfb10a1540d5 Author: Greg Kroah-Hartman Date: Fri Dec 10 10:55:27 2010 -0800 Staging: ft1000: fix world writable debugfs file You should not be able to write to a debugfs file from any user. Cc: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit b8b739941eb57ec4c5fc87a73e7e7b554cf395fb Author: Greg Kroah-Hartman Date: Fri Dec 10 10:46:30 2010 -0800 Staging: cxt1e1: rename global log_level variable The driver should not have such a generic global variable name. Reported-by: Zimny Lech Cc: Bob Beers Signed-off-by: Greg Kroah-Hartman commit bc657f6e9130108651915fe37624e47638c46e0f Author: Mark Allyn Date: Fri Dec 10 07:37:48 2010 -0800 staging: sep: fix comments in sep_get_static_pool_addr_handler Original comments were inaccurate Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e91eb2ff1f713837caebbb86a06974cd4b3e8e46 Author: Dan Carpenter Date: Fri Dec 10 15:41:18 2010 +0300 Staging: rtl8192u: add missing curly braces The if condition was ignored in the original code and we just used the default channel. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4 Merge: 1e13f86 c39d35e Author: David S. Miller Date: Fri Dec 10 10:20:43 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 commit 1e13f863ca88014d9550876c05c939fdab1017d1 Merge: f404c2f f435d9e Author: David S. Miller Date: Fri Dec 10 09:50:47 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c commit b2d6fef51223a1913c0d3230df4252ab49990bc1 Author: Tony Lindgren Date: Fri Dec 10 09:46:25 2010 -0800 omap1: Delete old defconfigs Please use omap1_defconfig instead, or search online for a more optimized defconfig for your omap1 board. Signed-off-by: Tony Lindgren commit 6cfce27c14aad746fe6f1b0bbeefab52b8b6217f Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap1: Add omap1_defconfig The omap1_defconfig this should be eventually usable for booting all omap1 machines. Generated based on: $ grep ARCH_OMAP1=y arch/arm/configs/* | cut -d: -f1 | xargs cat | \ sort | uniq >> arch/arm/configs/omap1_defconfig Then change few things manually, like use Nokia 770 CONFIG_CMDLINE as it does not allow setting it in the bootloader. Finally ran make savedefconfig on it. Signed-off-by: Tony Lindgren commit 7f9187c26fd120bd2f0ce089e5f46c4bd3c4193b Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap1: Add initcall checks for omap1 and booted board Otherwise multi-omap1 configurations will fail. Tested-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit df1e9d1c218ba696e376cad371b57c0109fe98c9 Author: Tony Lindgren Date: Fri Dec 10 09:46:24 2010 -0800 omap: Split omap_read/write functions for omap1 and omap2+ Otherwise multi-omap1 support for omap1 won't work as the cpu_class_is_omap1() won't work until the SoC is detected. Note that eventually these will go away, please use ioremap + read/write instead. Signed-off-by: Tony Lindgren commit 67b738ef32df7ec429004866d2a739a3775894d2 Merge: c451278 5d190c4 Author: Tony Lindgren Date: Fri Dec 10 09:44:39 2010 -0800 Merge branch 'devel-omap-irq' into omap-for-linus commit 5d190c40100793a6dfc37bf325677c10f3c80edf Author: Tony Lindgren Date: Thu Dec 9 15:49:23 2010 -0800 omap2+: Initialize omap_irq_base for entry-macro.S from platform code This way we can use the generic omap SoC detection code instead. Signed-off-by: Tony Lindgren commit 1957668be903b2c98e1dfb295510850531eea135 Author: Vasily Khoruzhick Date: Thu Dec 9 21:17:56 2010 +0200 ASoC: Add HP iPAQ H1940 support Add glue driver to make s3c24xx-i2s and uda1380 produce some sound on H1940. Signed-off-by: Vasily Khoruzhick Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 154b26aa9ec4aaeaa7258fe85a036613f3713a59 Author: Mark Brown Date: Thu Dec 9 12:07:44 2010 +0000 ASoC: Implement WM8994/58 DAC and ADC oversampling control The oversampling rate of the DAC and ADC can be controlled to optimise for either low power consumption or maximum performance. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 249c5156b8a743e3df5386c5cb7ae3df1d754e50 Author: Mario Becroft Date: Sat Dec 4 11:51:34 2010 +1300 ASoC: Optimise WM9081 FLL performance Tune the FLL gain for optimal performance according to evaluation results. Signed-off-by: Mario Becroft Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 22ca466847ad477d060baed84733c495bc6e81c8 Author: Kevin Hilman Date: Fri Nov 19 07:25:30 2010 -0800 davinci: kconfig: select at24 eeprom for selected boards Ensure that the at24 eeprom driver is selected for certain boards that need boot data (e.g. MAC address) from EEPROM. Signed-off-by: Kevin Hilman commit 3506f27731439bf6ff3bfa86f04e0104f7edad68 Author: Ben Gardiner Date: Fri Nov 19 16:43:04 2010 -0500 da850-evm, trivial: use da850_evm prefix for consistency There was a single case of 'da850evm' prefix in the board-da850-evm.c file where the reset of the prefixes were 'da850_evm'; change it to 'da850_evm' for consistency. Signed-off-by: Ben Gardiner Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit d5539ca0a5c9abd5cbf9ddcbbc1c2a507b5fd63c Author: Ben Gardiner Date: Fri Nov 19 09:17:35 2010 -0500 da850-evm: allow pca953x module build Change the mach-davinci Kconfig file so that GPIO_PCA953X is default when MACH_DAVINCI_DA850_EVM is set instead of always selecting. This allows users to compile pca953x as a module. Signed-off-by: Ben Gardiner CC: Sergei Shtylyov CC: Nori, Sekhar Reviewed-by: Kevin Hilman Signed-off-by: Kevin Hilman commit 47e7cb148a12f6f825302a85cd2b78a0948be741 Author: Ben Gardiner Date: Mon Nov 15 09:42:52 2010 -0500 davinci: da850-evm: UI expander gpio_set_value can sleep, use _cansleep When the RMII PHY on the UI board is enabled with CONFIG_DA850_UI_RMII then then following will be printed to the console when warnings are also enabled: WARNING: at drivers/gpio/gpiolib.c:1567 __gpio_set_value+0x4c/0x5c() Modules linked in: [] (unwind_backtrace+0x0/0xf8) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_null+0x1c/0x24) [] (warn_slowpath_null+0x1c/0x24) from [] (__gpio_set_value+0x4c/0x5c) [] (__gpio_set_value+0x4c/0x5c) from [] (da850_evm_ui_expander_setup+0x1e4/0x2 44) [] (da850_evm_ui_expander_setup+0x1e4/0x244) from [] (pca953x_probe+0x1f8/0x29 0) Traced the WARN_ON to the gpio_set_value(rmii_sel,0) call in da850_evm_setup_emac_rmii. Replacing the call with the _cansleep variant results in no more warning. Also replacing the gpio_set_value calls in the teardown function. Signed-off-by: Ben Gardiner Reviewed-by: Chris Cordahi Signed-off-by: Kevin Hilman commit 12cdd3d71954c2cd6dd556eec25dd7d346735831 Author: Nicolas Kaiser Date: Mon Nov 15 19:40:28 2010 +0100 davinci: aemif: signedness bug in davinci_aemif_setup_timing() aemif_calc_rate() can return a negative error value, so all the variables that get tested for this value need to be signed. The maximum bit width of WSETUP(WSETUP_MAX) appears to be 30 bits (0xf << 26). Using a signed instead of an unsigned integer shouldn't make a difference here. Signed-off-by: Nicolas Kaiser Acked-by: Sekhar Nori Signed-off-by: Kevin Hilman commit 1a07bfb5215e11227403f121097ed72187dc3241 Author: Nicolas Kaiser Date: Mon Oct 25 14:41:18 2010 +0200 davinci: psc: simplify if-statement A common do-while loop can be factored out from the end of the branches. Signed-off-by: Nicolas Kaiser Signed-off-by: Kevin Hilman commit ced98628bf6ca7705b2d06df9c71a80cd1cd49bb Author: Cyril Chemparathy Date: Wed Oct 20 17:49:57 2010 -0400 davinci: minor tnetv107x clock tree fixes This patch applies the following modifications to the tnetv107x clock tree: - reparent tnetv107x usb clocks to usbss - mark timer1 as always enabled - enable set_rate on pll divider output clocks - adjust tnetv107x tsc sysclk rate lower to fix invalid reset defaults Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit b1d05be61f5d29118c2934e684628a5034186825 Author: Cyril Chemparathy Date: Wed Oct 20 17:49:56 2010 -0400 davinci: use divide ratio limits from pll_data This patch modifies the sysclk rate setting code to use the divider mask specified in pll_data. Without this, devices with different divider ranges (e.g. tnetv107x) fail. Signed-off-by: Cyril Chemparathy Signed-off-by: Kevin Hilman commit 6d1c57c84cc474a0fa63aadaa260b13dc5c7d68b Author: Andreas Gaeer Date: Wed Oct 6 10:38:55 2010 +0200 davinci: Implement sched_clock() Overwrite the default implementation of sched_clock that is based on jiffies by something more precise. This improves timestamps in ftrace. Implementation is copied from OMAP platform code. Signed-off-by: Andreas Gaeer Signed-off-by: Kevin Hilman commit c0d8768af260e2cbb4bf659ae6094a262c86b085 Author: Namhyung Kim Date: Fri Dec 10 12:11:50 2010 +0900 anon_inodes: fix wrong function name in comment Signed-off-by: Namhyung Kim Signed-off-by: Jiri Kosina commit a34f0b31398020e2d3be653eb695bd17a9cf3b55 Author: Uwe Kleine-König Date: Fri Dec 10 14:55:42 2010 +0100 fix comment typos concerning "consistent" Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 2ade0c1d9d93b7642212657ef76f4a1e30233711 Merge: 504499f 6313e3c Author: Jiri Kosina Date: Fri Dec 10 15:19:18 2010 +0100 Merge branch 'master' into upstream commit 504499f22c08a03e2e19dc88d31aa0ecd2ac815e Author: Joe Perches Date: Thu Dec 9 19:29:08 2010 -0800 HID: simplify an index check in hid_lookup_collection Save the struct hid_collection * in a temporary to shorten the generated code a bit and perhaps improve readability. $ size drivers/hid/hid-core.o* text data bss dec hex filename 16460 78 8 16546 40a2 drivers/hid/hid-core.o.new 16469 78 8 16555 40ab drivers/hid/hid-core.o.old Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit a3789a1783d37f2772ba5046b26416c98dfe1bfa Author: Joe Perches Date: Thu Dec 9 19:29:07 2010 -0800 HID: Hoist assigns from ifs Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit 16ee4cc82b5dbb81a5dbfedcdb268b9467fe4605 Author: Joe Perches Date: Thu Dec 9 19:29:05 2010 -0800 HID: Remove superfluous __inline__ Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit fe2580204d8bbcd18540736a283ed0b784c6a024 Author: Joe Perches Date: Thu Dec 9 19:29:04 2010 -0800 HID: Use vzalloc for vmalloc/memset(,0...) Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit 4291ee305e9bb0699504a66f0e2b7aefcf0512a5 Author: Joe Perches Date: Thu Dec 9 19:29:03 2010 -0800 HID: Add and use hid_: dev_ equivalents Neaten current uses of dev_ by adding and using hid specific hid_ macros. Convert existing uses of dev_ uses to hid_. Convert hid-pidff printk uses to hid_. Remove err_hid and use hid_err instead. Add missing newlines to logging messages where necessary. Coalesce format strings. Add and use pr_fmt(fmt) KBUILD_MODNAME ": " fmt Other miscellaneous changes: Add const struct hid_device * argument to hid-core functions extract() and implement() so hid_ can be used by them. Fix bad indentation in hid-core hid_input_field function that calls extract() function above. Signed-off-by: Joe Perches Signed-off-by: Jiri Kosina commit dac36dd87de10d1fd81dc7b7a40256cb2e965abc Author: Namhyung Kim Date: Fri Dec 10 01:57:07 2010 +0900 poll: fix a typo in comment Convert duplicated sys_poll to select. As Kosaki suggests, sys_poll() and sys_select() are now hidden by SYSCALL_DEFINEx() macros so it would be better to use plain select/poll syscall name. Signed-off-by: Namhyung Kim Reviewed-by: KOSAKI Motohiro Signed-off-by: Jiri Kosina commit 09e7200221a04ab899e15a0a3cf4b230afd1ab86 Author: Hema HK Date: Fri Dec 10 18:11:42 2010 +0530 arm: OMAP4430: musb: Configure musb to OTG mode Enabling the musb OTG mode for SDP and PANDA boards. Signed-off-by: Hema HK Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 594632efbb9a4ac323cbf8dbf37c608d418ca8c1 Author: Hema HK Date: Fri Dec 10 18:10:51 2010 +0530 usb: musb: Adding musb support for OMAP4430 OMAP4430 supports UTMI and ULPI types of transceiver interface. In UTMI mode: The PHY is embedded within OMAP4430. The transceiver functionality is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY functionality is embedded within the OMAP4430. There is no direct interactions between the MUSB controller and TWL6030 chip to communicate the session-valid, session-end and ID-GND events. It has to be done through a software by setting/resetting bits in one of the control module register of OMAP4430 which in turn toggles the appropriate signals to MUSB controller. musb driver is register for blocking notifications from the transceiver driver to get the event notifications for connect/disconnect and ID-GND. Based on these events call the transceiver init/shutdown function to configure the transceiver to toggle the VBUS valid, session end and ID_GND signals to musb and power on/off the internal PHY. For ID_GND event notifications, toggle the ID_GND signal and then wait for musb to be configured as "A" device, and then call the transceiver function to set the VBUS. In OTG mode and musb as a host, When the Micro A connector used, VBUS is turned on and session bit set. When the device is connected, enumeration goes through. When the device disconnected from the other end of the connector(ID is still grounded), link will detect the disconnect and end the session. When the device is connected back, there are no events generated in the TWL6030-usb, and link is already down. So the device is not detected. Removed the session bit disable code which will recognize the connect of the device. Limitation: In OTG host mode, if device is connected during boot, it does not get detected. If disconnect and connect it back or connect after boot only it works. Fix for this, I will submit seperate patch later. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit 221946d04aa9bd3cffd93e4876bcb2e616941df9 Author: Hema HK Date: Fri Dec 10 18:10:37 2010 +0530 usb: otg: TWL6030: Add twl6030_usb file for compilation Add the twl6030_usb transceiver file for compilation. Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit e70357e35c522776d9f56f6800af4ed7a5bdbaaf Author: Hema HK Date: Fri Dec 10 18:09:52 2010 +0530 mfd: TWL6030: OMAP4: Registering the TWL6030-usb device Registering the twl6030-usb transceiver device as a child to twl6030 core. Removed the NOP transceiver init call from board file. Populated twl4030_usb_data platform data structure with the function pointers for OMAP4430 internal PHY operation to be used by twl630-usb driver. Signed-off-by: Hema HK Cc: Samuel Ortiz Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 0aa002fe602939370e9476e5ec32b562000a0425 Author: Tejun Heo Date: Thu Dec 9 11:47:21 2010 +0100 x86: apic: Cleanup and simplify setup_local_APIC() setup_local_APIC() is used to setup local APIC early during CPU initialization and already assumes that preemption is disabled on entry. However, The function unnecessarily disables and enables preemption and uses smp_processor_id() multiple times in and out of the nested preemption disabled section. This gives the wrong impression that the function might be able to handle being called with preemption enabled and/or migrated to another processor in the middle. Make it clear that the function is always called with preemption disabled, drop the confusing preemption disable block and call smp_processor_id() once at the beginning of the function. Signed-off-by: Tejun Heo Acked-by: Cyrill Gorcunov Reviewed-by: Pekka Enberg Cc: Yinghai Lu Cc: brgerst@gmail.com LKML-Reference: <4D00B3B9.7060702@kernel.org> Signed-off-by: Thomas Gleixner commit 4c42fbc99fc8656efc7d2b5e92be0d430ccefdc6 Author: Hema HK Date: Fri Dec 10 18:09:35 2010 +0530 usb: musb: TWL6030: Selecting TWL6030_USB transceiver Selecting the twl6030-usb for OMAP4430SDP and OMAP4PANDA boards and adding OMAP4 internal phy code for compilation Signed-off-by: Hema HK Cc: Tony Lindgren Signed-off-by: Felipe Balbi commit 6b296123cc1d958fe5045114f7ae0c1e19cbb29a Author: Hema HK Date: Fri Dec 10 18:08:48 2010 +0530 usb: otg: Kconfig: Add Kconfig option for TWL6030 transceiver. Added the TWL6030-usb transceiver option in the Kconfig Signed-off-by: Hema HK Cc: David Brownell Signed-off-by: Felipe Balbi commit c33fad0c37481c4ba5c8b98cb62de3f4d95a44da Author: Hema HK Date: Fri Dec 10 17:58:20 2010 +0530 usb: otg: Adding twl6030-usb transceiver driver for OMAP4430 Adding the twl6030-usb transceiver support for OMAP4 musb driver. OMAP4 supports 2 types of transceiver interface. 1. UTMI: The PHY is embedded within OMAP4. The transceiver functionality is split between the twl6030 PMIC chip and OMAP4430. The VBUS, ID pin sensing and OTG SRP generation part is integrated in TWL6030 and UTMI PHY functionality is embedded within the OMAP4430. There is no direct interactions between the MUSB controller and TWL6030 chip to communicate the session-valid, session-end and ID-GND events. It has to be done through a software by setting/resetting bits in one of the control module register of OMAP4430 which in turn toggles the appropriate signals to MUSB controller. The internal transceiver has functional clocks and powerdown bits to powerdown the PHY for power saving. Since there is no option available for having 2 transceiver drivers for one USB controller, internal PHY specific APIs are passed through plaform_data function pointers to use in the twl6030-usb transceiver driver. 2. ULPI interface is provided for off-chip transceivers. Signed-off-by: Hema HK Cc: Tony Lindgren Cc: David Brownell Signed-off-by: Felipe Balbi commit 77b1d3fa88dcb9d6e885926f972c421e4069b849 Author: Hema HK Date: Fri Dec 10 17:55:37 2010 +0530 mfd: TWL6030: USBOTG VBUS event generation on With TWL6030-usb, VBUS SESS_VLD and SESS_END events are not generated as expected. When these interrupts are enabled, charger VBUS detection interrupt does not get generated. So USBOTG has to be dependent on charger VBUS interrupts. So added one bit for USBOTG and changed the handler to call the USBOTG handler whenever there is a charger VBUS interrpt. VBUS SESS_VLD and SESS_END event generation issue is under debug with HW team. This fix might not be required once after fixing the issue. Signed-off-by: Balaji TK Signed-off-by: Hema HK Cc: Samuel Ortiz Signed-off-by: Felipe Balbi commit b7ec19af63b467e30189984fb24e6157603608e3 Author: Shan Wei Date: Fri Dec 10 12:49:23 2010 +0100 dccp: remove unused macros Remove macros which have been unused since the initial implementation (commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial implementation from Tue Aug 9 20:14:34 2005 -0700). Signed-off-by: Shan Wei Acked-by: Gerrit Renker commit 5144c534d16529bc469396211131e8935589f833 Author: Axel Lin Date: Fri Dec 10 17:34:26 2010 +0800 ALSA: aoa: Remove wrong i2c_set_clientdata in onyx_i2c_remove() It does not make sense to set clientdata to onyx in onyx_i2c_remove() as we are going to kfree onyx. What we really want here is i2c_set_clientdata(client, NULL); Since the i2c core will take care of it now, so this patch just removes it. Signed-off-by: Axel Lin Signed-off-by: Takashi Iwai commit 4bc36fd31b07054bdf7378cca7162c10598f3eff Author: Mian Yousaf Kaukab Date: Thu Dec 9 13:05:01 2010 +0100 usb: musb: add support for ux500 platform Initial support for u8500 and u5500 platform. Signed-off-by: Mian Yousaf Kaukab Acked-by: Linus Walleij Signed-off-by: Felipe Balbi commit a9c037832e9624e240c5019d0e01e9352e8f638d Author: Ajay Kumar Gupta Date: Tue Dec 7 18:57:45 2010 +0530 musb: am35x: fix compile error due to control apis commit 4814ced5116e3b73dc4f63eec84999739fc8ed11 (OMAP: control: move plat-omap/control.h to mach-omap2/control.h) moved to another location, preventing drivers from accessing it, so we need to pass function pointers from arch code to be able to talk to internal PHY on AM35x. Signed-off-by: Ajay Kumar Gupta Signed-off-by: Felipe Balbi commit 46960847ef3e3a5d395121635fffa5dfa279fe90 Author: Felipe Balbi Date: Tue Dec 7 09:57:59 2010 +0200 arm: omap4: enable usb on 4430sdp Let musb work on 4430sdp as well. We can now test any problems with multi-omap builds. Signed-off-by: Felipe Balbi commit 92b48df24eec49ed1eb0ec9c5f6165d8282153ea Author: Felipe Balbi Date: Thu Dec 2 14:30:06 2010 +0200 usb: musb: drop board_set_vbus that's not used anymore. So let's drop it. Signed-off-by: Felipe Balbi commit 784173723e2fd23332af948a90612950964cd140 Author: Felipe Balbi Date: Thu Dec 2 13:17:53 2010 +0200 usb: musb: drop musb_platform_suspend/resume all glue layers are now fully moved to the new setup. We are now using dev_pm_ops to implement suspend/resume functionality and thus, musb_platform_suspend/resume has become deprecated and useless. This patch drops those function pointers and its uses. Signed-off-by: Felipe Balbi commit fcd22e3b1f12e026dfefca20c97ff550a0e11b2b Author: Felipe Balbi Date: Thu Dec 2 13:13:09 2010 +0200 usb: musb: blackfin: usb dev_pm_ops structure instead of using musb_platform_suspend_resume, we can use dev_pm_ops and let platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit 6f783e287c074afe1e9cf3f32ded9948e184b45e Author: Felipe Balbi Date: Thu Dec 2 12:53:22 2010 +0200 usb: musb: am35x: usb dev_pm_ops structure instead of using musb_platform_suspend_resume, we can use dev_pm_ops and let platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit c20aebb92796cf54ae8171ad7f53a8fa7c61d2d8 Author: Felipe Balbi Date: Thu Dec 2 12:44:40 2010 +0200 usb: musb: omap2430: use dev_pm_ops structure instead of using musb_platform_suspend/resume, we can use dev_pm_ops and let the platform_device core handle when to call musb_core's suspend and glue layer's suspend. Signed-off-by: Felipe Balbi commit e6326358a43a9ac23f6df69ed1f4707c0d1ac473 Author: Felipe Balbi Date: Thu Dec 2 12:35:59 2010 +0200 usb: musb: omap2430: drop the nops we don't need those nops, so drop them. Signed-off-by: Felipe Balbi commit 3c8a5fcc051c05cfdd8e3f0d37ba3c183d509cb9 Author: Felipe Balbi Date: Thu Dec 2 12:28:39 2010 +0200 usb: musb: mark musb_save/restore_context static those aren't used outside musb_core.c, so mark them as static. Signed-off-by: Felipe Balbi commit 496351413a227a6c0ea1a704d3d4c775d413fd08 Author: Felipe Balbi Date: Thu Dec 2 12:27:35 2010 +0200 usb: musb: drop musb_platform_save/restore_context ... that can be easily folded into the musb_platform_suspend/resume calls. Signed-off-by: Felipe Balbi commit fa56df915d101770a495569473b4c13b1904087b Author: Felipe Balbi Date: Thu Dec 2 10:55:29 2010 +0200 usb: musb: drop the set_clock magic now that platform glue layer handles clock completely, that function is completely useless for us. Drop it. Signed-off-by: Felipe Balbi commit 0349176120aa3024e96ae4fd7dc0e0181dc55f52 Author: Felipe Balbi Date: Thu Dec 2 09:57:08 2010 +0200 usb: musb: move clock handling to glue layer musb core doesn't need to know about platform specific details. So start moving clock handling to platform glue layer and make musb core agnostic about that. Signed-off-by: Felipe Balbi commit 3b7029670d39d22f288ece95254e9ba5ceddd6ba Author: Felipe Balbi Date: Thu Dec 2 09:51:00 2010 +0200 usb: musb: mark ->set_clock deprecated ... we will completely drop that need by moving clock handling to platform glue layer. Marking as deprecated will allow us to catch all users easily. Signed-off-by: Felipe Balbi commit f7ec94370f417fedad4db1054228ef958d48b926 Author: Felipe Balbi Date: Thu Dec 2 09:48:58 2010 +0200 usb: musb: pass platform_ops via platform_data ... then we don't need to export any symbols from glue layer to musb_core. Signed-off-by: Felipe Balbi commit a023c631f546ef95d58969385825a47652ab9039 Author: Felipe Balbi Date: Thu Dec 2 09:42:50 2010 +0200 usb: musb: blackfin: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit e6480faa1067af91ab403fd3aaf6db2fe1134b13 Author: Felipe Balbi Date: Thu Dec 2 09:40:34 2010 +0200 usb: musb: da8xx: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit e110de4d5358f2e67c333d23d608cbabe26b6220 Author: Felipe Balbi Date: Thu Dec 2 09:38:12 2010 +0200 usb: musb: davinci: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 1add75d2bd1a44553e2c40e30db5f90a500dc1ab Author: Felipe Balbi Date: Thu Dec 2 09:35:58 2010 +0200 usb: musb: tusb6010: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 0919dfc12a43d5ea21411e67984c268e84d05204 Author: Felipe Balbi Date: Thu Dec 2 09:33:24 2010 +0200 usb: musb: am35x: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit a3cee12aa9129b576c5403a31e37d0e0113235b3 Author: Felipe Balbi Date: Thu Dec 2 09:27:29 2010 +0200 usb: musb: omap2430: give it a context structure that structure currently only holds a device pointer to our own platform_device and musb's platform_device, but soon it will hold pointers to our clock structures and glue-specific bits and pieces. Signed-off-by: Felipe Balbi commit 9cb0308eec7a965136fe9fc6d1be3548c01a4a1e Author: Felipe Balbi Date: Thu Dec 2 09:21:05 2010 +0200 usb: musb: split blackfin to its own platform_driver Just adding its own platform_driver, not really using it yet. Later patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 8ceae51ed5d1739d4ed5c4b947d12ff1d7df0e89 Author: Felipe Balbi Date: Thu Dec 2 09:19:35 2010 +0200 usb: musb: split da8xx to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 73b089b052a69020b953312a624a6e1eb5b81fab Author: Felipe Balbi Date: Thu Dec 2 09:16:55 2010 +0200 usb: musb: split davinci to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 18688fbeb09665725c842291bbadd88295a359e1 Author: Felipe Balbi Date: Thu Dec 2 09:13:54 2010 +0200 usb: musb: split tusb6010 to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit ce40c5767a0ea1e77ca5d0b73269cb86301a35cf Author: Felipe Balbi Date: Thu Dec 2 09:06:51 2010 +0200 usb: musb: split am35x to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit dc09886bfa781e2b442301116c18199519e36f0f Author: Felipe Balbi Date: Wed Dec 1 15:01:11 2010 +0200 usb: musb: split omap2430 to its own platform_driver Just adding its own platform_driver, not really using it yet. When all HW glue layers are converted, more patches will come to split power management code from musb_core and move it completely to HW glue layer. Signed-off-by: Felipe Balbi commit 05ac10dd6862a3fcce33d2203fbb2ef285e3ca87 Author: Felipe Balbi Date: Thu Dec 2 08:49:26 2010 +0200 usb: musb: trivial search and replace patch change all ocurrences of musb_hdrc to musb-hdrc. We will call glue layer drivers musb-, so in order to keep things somewhat standard, let's change the underscore into a dash. Signed-off-by: Felipe Balbi commit 7c925546427a0428b84bc5ba1f28b3698e492072 Author: Felipe Balbi Date: Wed Dec 1 14:23:48 2010 +0200 usb: musb: add Kconfig options for each glue layer This will make things simpler when choosing which glue layer to compile. It avoids a lot of magic around the "default" Kconfig option and lets the user choose what exactly s/he wants to compile. Signed-off-by: Felipe Balbi commit 7421107b293cace2fc081731306d447ecd8517ab Author: Felipe Balbi Date: Wed Dec 1 13:53:27 2010 +0200 usb: musb: hold context on musb structure when we start splitting HW glue layer, it's gonna make it easier to re-use that structure. Signed-off-by: Felipe Balbi commit 1ea7f352d832d5abe43d5e9198098acb4d611ba3 Author: Felipe Balbi Date: Wed Dec 1 13:48:54 2010 +0200 arm: omap4: panda: initialize musb initialize the musb port on pandaboard. Signed-off-by: Ming Lei Signed-off-by: Felipe Balbi commit f404c2fea37e02bec7c8b6edddf5edd22ca60505 Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:37 2010 +0000 bnx2x: Update version number and a date. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 5cd737c2e84bebf532f536f7addfdd75162bba04 Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:29 2010 +0000 bnx2x: Fixed a compilation warning bnx2x_src_init_t2() is used only when BCM_CNIC is defined. So, to avoid a compilation warning, we won't define it unless BCM_CNIC is defined. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit d245a1111251d77c804e9fe362e9f70aba856e1e Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:17 2010 +0000 bnx2x: Use dma_alloc_coherent() semantics for ILT memory allocation Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2297a2da5a8507bf6596dc30ace3483c00bd85ed Author: Vladislav Zolotarov Date: Wed Dec 8 01:43:09 2010 +0000 bnx2x: LSO code was broken on BE platforms Make the LSO code work on BE platforms: parsing_data field of a parsing BD (PBD) for 57712 was improperly composed which made FW read wrong values for TCP header's length and offset and, as a result, the corresponding PCI device was performing bad DMA reads triggering EEH. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4bc65dd8d88671712d71592a83374cfb0b5fce7a Author: Eric Dumazet Date: Tue Dec 7 22:26:15 2010 +0000 filter: use size of fetched data in __load_pointer() __load_pointer() checks data we fetch from skb is included in head portion, but assumes we fetch one byte, instead of up to four. This wont crash because we have extra bytes (struct skb_shared_info) after head, but this can read uninitialized bytes. Fix this using size of the data (1, 2, 4 bytes) in the test. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 60d509c823cca21e77d537bd356785f7cfe8f0d1 Author: Jozsef Kadlecsik Date: Fri Dec 3 02:39:01 2010 +0000 The new jhash implementation The current jhash.h implements the lookup2() hash function by Bob Jenkins. However, lookup2() is outdated as Bob wrote a new hash function called lookup3(). The patch replaces the lookup2() implementation of the 'jhash*' functions with that of lookup3(). You can read a longer comparison of the two and other hash functions at http://burtleburtle.net/bob/hash/doobs.html. Signed-off-by: Jozsef Kadlecsik Acked-by: Rusty Russell Signed-off-by: David S. Miller commit 68835aba4d9b74e2f94106d13b6a4bddc447c4c8 Author: Eric Dumazet Date: Tue Nov 30 19:04:07 2010 +0000 net: optimize INET input path further Followup of commit b178bb3dfc30 (net: reorder struct sock fields) Optimize INET input path a bit further, by : 1) moving sk_refcnt close to sk_lock. This reduces number of dirtied cache lines by one on 64bit arches (and 64 bytes cache line size). 2) moving inet_daddr & inet_rcv_saddr at the beginning of sk (same cache line than hash / family / bound_dev_if / nulls_node) This reduces number of accessed cache lines in lookups by one, and dont increase size of inet and timewait socks. inet and tw sockets now share same place-holder for these fields. Before patch : offsetof(struct sock, sk_refcnt) = 0x10 offsetof(struct sock, sk_lock) = 0x40 offsetof(struct sock, sk_receive_queue) = 0x60 offsetof(struct inet_sock, inet_daddr) = 0x270 offsetof(struct inet_sock, inet_rcv_saddr) = 0x274 After patch : offsetof(struct sock, sk_refcnt) = 0x44 offsetof(struct sock, sk_lock) = 0x48 offsetof(struct sock, sk_receive_queue) = 0x68 offsetof(struct inet_sock, inet_daddr) = 0x0 offsetof(struct inet_sock, inet_rcv_saddr) = 0x4 compute_score() (udp or tcp) now use a single cache line per ignored item, instead of two. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 88ab8a8445838785e38af378740ab57f8cb6cb8a Author: Xenofon Foukas Date: Sat Dec 4 00:17:55 2010 +0200 Staging: comedi: Fix coding style issues in drivers.c This patch fixes line over 80 characters warning issues found in file drivers.c Signed-off-by: Xenofon Foukas Signed-off-by: Greg Kroah-Hartman commit fd599985e649c71162495d307a2fd1bbddc258e4 Author: Mark Allyn Date: Thu Dec 9 09:32:53 2010 -0800 Staging: sep: eliminate kernel crash due to null parameter in dma_alloc_coherent Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 653bf0cfa55896b74d8cbe7e561401813ca359ad Author: Mark Allyn Date: Thu Dec 9 09:32:38 2010 -0800 Staging: sep: ensure that caller id buffer is little endian Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit c100fa4d6142271cc6d228fd84a5da2390ec5ec1 Author: Mark Allyn Date: Thu Dec 9 09:32:26 2010 -0800 Staging: sep: reduce 64 and 32 bit compile warnings Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit be38efe11748684d54ff86810443979a59b96cfc Author: Mark Allyn Date: Thu Dec 9 09:32:13 2010 -0800 Staging: sep: limit time to wait for reconfig shared area complete Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 8f9346a091ac523afa73643aae69f74f0f8a6e80 Author: Mark Allyn Date: Thu Dec 9 09:31:57 2010 -0800 Staging: sep: remove completed items in TODO Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 0dd12c44510c342282145c8048b447a13ce78a32 Author: Mark Allyn Date: Thu Dec 9 09:31:43 2010 -0800 Staging: sep: remove code for Moorestown device The Moorestown (older device) will be added to driver later. Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 08740c97e191d4d5bb1f472a6ec0fa24ebdbc8bc Author: Mark Allyn Date: Thu Dec 9 09:31:31 2010 -0800 Staging: sep: initialize driver copy of send and receive count with device Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 843f65c669c1164897dc5ef79c0df00cb66490bf Author: Mark Allyn Date: Thu Dec 9 09:31:18 2010 -0800 Staging: sep: clean up error checking in probe function Add pci_disable Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit b0daf59c5fc9ac6c65645ffb40156f5d5a0052a4 Author: Mark Allyn Date: Thu Dec 9 09:30:31 2010 -0800 Staging: sep: sram_addr is 32 bit; this is not a kernel address, but device internal value This does not have to be 64 bits wide Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e957b063abdf0f005ba2c298345c75aa7ac4c22a Author: Mark Allyn Date: Thu Dec 9 09:30:17 2010 -0800 Staging: sep: remove spaces at end of lines Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit f15662755f7eb3db4a416d52af24771cc208e7b0 Author: Mark Allyn Date: Thu Dec 9 09:30:03 2010 -0800 Staging: sep: remove virtual address being passed to user space application Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit c5e61563e26b5a43646393c5f5020d172b2767c7 Author: Marek Belisko Date: Thu Dec 9 16:13:54 2010 +0100 staging: ft1000: Add file header to ft1000_proc.c Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e2398c61272f378b257b3107fdb960e0b642eeb6 Author: Marek Belisko Date: Thu Dec 9 16:13:53 2010 +0100 staging: ft1000: Remove dead code. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 96ff77f7350576d1b25908b59f15d2ab5222c432 Author: Marek Belisko Date: Thu Dec 9 16:13:52 2010 +0100 staging: ft1000: Fix coding style. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 85d47cff4ea2ab0d5380ba649ac4515d1a5bcf23 Author: Marek Belisko Date: Thu Dec 9 16:13:51 2010 +0100 staging: ft1000: Coding style fix in ft1000ReadProc. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 92914cc8bb6d2d710d102051c9bb7566b0ac75a0 Author: Marek Belisko Date: Thu Dec 9 16:13:50 2010 +0100 staging: ft1000: Fix coding style in ft1000NotifyProc. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 1c46282421c8b31b37323f7b007c4562ce17578c Author: Marek Belisko Date: Thu Dec 9 16:13:49 2010 +0100 staging: ft1000: Use return value for ft1000InitProc. Add checking for return value ft1000InitProc and cleanup if something fail. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 04c6620117488c0ccc612da5f2bcbcde025e9301 Author: Marek Belisko Date: Thu Dec 9 16:13:48 2010 +0100 staging: ft1000: Fix coding style. Fix coding style in ft1000CleanupProc and ft1000InitProc functions. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 5fd866fb6401cf6a912e75e1b9c4b906bf42434e Author: Marek Belisko Date: Thu Dec 9 16:13:47 2010 +0100 staging: ft1000: Fix proc initialization handling. Cleaning proc entries when error occures was not handled correctly. So fix and also add proper cleaning. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 115884118a65c18af290476e44ca6c76a2c0a694 Author: Marek Belisko Date: Thu Dec 9 11:26:53 2010 +0100 staging: ft1000: Fix debug messages. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 05371d1861df75c7d89985760c9ce75fc806f4b8 Author: Marek Belisko Date: Thu Dec 9 11:26:52 2010 +0100 staging: ft1000: Remove unused headers. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c82632d247ce839bfb001723ad1988d30d9febb9 Author: Marek Belisko Date: Thu Dec 9 11:26:51 2010 +0100 staging: ft1000: Remove dead code. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 4d791234f484002d57f634e3d90ca2cd51ed144e Author: Marek Belisko Date: Thu Dec 9 11:26:50 2010 +0100 staging: ft1000: Fix camelcase functions and variables. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 67e9f9e26b7d8862ec2e2a3ac0e56590088e9281 Author: Marek Belisko Date: Thu Dec 9 11:26:49 2010 +0100 staging: ft1000: Remove unused variable. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e34dc580dc4a76106755b88ada5903eaa427c9f4 Author: Marek Belisko Date: Thu Dec 9 11:26:48 2010 +0100 staging: ft1000: Remove unused pdevobj array. We don't need to store pointer to device in some local array because we always pass to debugfs correct device pointer. So remove it. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 6d96940b2de8f8ac2bc938ea9249ed380cf906e0 Author: Marek Belisko Date: Thu Dec 9 11:26:47 2010 +0100 staging: ft1000: Fix private data pointer usage. Assign private data pointer to device for usage in file operations. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 9119dee1ce32453dfe24656091d69f8d57397fe0 Author: Marek Belisko Date: Thu Dec 9 11:26:46 2010 +0100 staging: ft1000: Convert char device to debugfs. Character device was used only for debugging purposes. Convert it to debugfs functionality. For every plugged device create new directory with one file. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 372058f1b4b3603a7e0c26f38d6eb20a3dd8c453 Author: Randy Dunlap Date: Thu Dec 9 09:38:34 2010 -0800 staging: solo6010 depends on I2C This driver uses i2c interfaces, so it should depend on I2C (unless someone wants to break it into pieces or make it more config-dependent). drivers/staging/solo6x10/solo6010-i2c.c:47: error: implicit declaration of function 'i2c_transfer' drivers/staging/solo6x10/solo6010-i2c.c:299: error: implicit declaration of function 'i2c_add_adapter' drivers/staging/solo6x10/solo6010-i2c.c:310: error: implicit declaration of function 'i2c_del_adapter' Signed-off-by: Randy Dunlap Cc: Ben Collins Signed-off-by: Greg Kroah-Hartman commit 0e0792fef4ea8e9f8f90819ad97918f61e467855 Author: Roland Vossen Date: Thu Dec 9 19:36:08 2010 +0100 staging: brcm80211: removed ap related comments Code cleanup, reaction on the 2nd email from Dan Carpenter. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 6f475b71605c7ebf6f5b06b8e4dc58f672b4f9b5 Author: Namhyung Kim Date: Fri Dec 10 01:40:25 2010 +0900 Staging: sm7xx: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit 5eaa53de2d9acd9dbcf737b247a0bb0788e79fdf Author: Namhyung Kim Date: Fri Dec 10 01:40:27 2010 +0900 Staging: rtl8192e: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit 94ab896367d5d6e0bc3064852569c1ff9658ec9c Author: Namhyung Kim Date: Fri Dec 10 01:40:26 2010 +0900 Staging: cx25821: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit abb9eb75a34cbd34ee4e9160ac349eff91b926d8 Author: Namhyung Kim Date: Fri Dec 10 01:40:28 2010 +0900 Staging: phison: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit 270b64bb4cf27a2ad7819bad89d8c9d8a66ba1b8 Author: Namhyung Kim Date: Fri Dec 10 01:40:29 2010 +0900 Staging: vme_tsi148: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit 2cea0cf284048b03a06e4370709cd751ddb9354e Author: Namhyung Kim Date: Fri Dec 10 01:40:30 2010 +0900 Staging: vme_ca91cx42: use DEFINE_PCI_DEVICE_TABLE Convert 'const struct pci_device_id xxx[]' to 'DEFINE_PCI_DEVICE_TABLE(xxx)'. Signed-off-by: Namhyung Kim Signed-off-by: Greg Kroah-Hartman commit 310d605293f0ab6dc9c7fe7a3cb5c850c60527b4 Author: Tobias Klauser Date: Thu Dec 9 16:01:07 2010 +0100 staging: brcm80211: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 1f0613158ea14b399fd7a16470630a729ba9d0c3 Author: Chen, Chien-Chia Date: Thu Dec 9 10:52:08 2010 +0800 Staging: rt2860: fix previous patch error Somehow Greg messed up the last patch and missed a chunk. This patch contains the missing chunk. Acked-by: Lee, Chun-Yi Signed-off-by: Chen, Chien-Chia Cc: stable Signed-off-by: Greg Kroah-Hartman commit 03a9e5126147c9f92aeba4b34f62b15b625087fb Author: Tony Lindgren Date: Thu Dec 9 15:49:23 2010 -0800 omap1: Use asm_irq_flags for entry-macro.S Initialize asm_irq_flags in omap_init_irq and use it in get_irqnr_and_base to detect between omap7xx and omap15xx/16xx. Note that both INT_1510_IH2_IRQ and INT_1510_IH2_IRQ are defined as 0, so use INT_1510_IH2_IRQ for both of them. Tested-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit c451278c2864e253a4bb303b596a29edc3bb527c Merge: 7b045c9 5403187 Author: Tony Lindgren Date: Thu Dec 9 15:48:03 2010 -0800 Merge branch 'devel-cleanup' into omap-for-linus commit 67b96c182c36c83cd6881122b4a7922b2634047b Merge: efc70d2 ddbc24b Author: Ingo Molnar Date: Fri Dec 10 00:31:30 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit efc70d241f5c7fc0a9f1c2a01781ed946d9dbe21 Author: Ingo Molnar Date: Fri Dec 10 00:27:23 2010 +0100 perf, sparc: Fix CONFIG_PERF_EVENTS=y build error Fix a typo in: 004417a6d468: perf, arch: Cleanup perf-pmu init vs lockup-detector Which caused a build failure on Sparc, reported by Stephen Rothwell. Reported-by: Stephen Rothwell Cc: David S. Miller Signed-off-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 747fecab32e47180e2668c2b22b25752d371e636 Author: Jesper Juhl Date: Thu Dec 9 23:25:09 2010 +0100 coda: kill redundant cast in coda_alloc_inode() kmem_cache_alloc() returns a void pointer which there is no need to cast. Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 5dc3055879b8f659f62abb7c3d1eaa4d02e36d65 Author: Don Zickus Date: Mon Nov 29 17:07:17 2010 -0500 x86, NMI: Add back unknown_nmi_panic and nmi_watchdog sysctls Originally adapted from Huang Ying's patch which moved the unknown_nmi_panic to the traps.c file. Because the old nmi watchdog was deleted before this change happened, the unknown_nmi_panic sysctl was lost. This re-adds it. Also, the nmi_watchdog sysctl was re-implemented and its documentation updated accordingly. Patch-inspired-by: Huang Ying Signed-off-by: Don Zickus Reviewed-by: Cyrill Gorcunov Acked-by: Yinghai Lu Cc: fweisbec@gmail.com LKML-Reference: <1291068437-5331-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 96a84c20d635fb1e98ab92f9fc517c4441f5c424 Author: Don Zickus Date: Mon Nov 29 17:07:16 2010 -0500 lockup detector: Compile fixes from removing the old x86 nmi watchdog My patch that removed the old x86 nmi watchdog broke other arches. This change reverts a piece of that patch and puts the change in the correct spot. Signed-off-by: Don Zickus Reviewed-by: Cyrill Gorcunov Cc: fweisbec@gmail.com Cc: yinghai@kernel.org LKML-Reference: <1291068437-5331-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit dc6bbc991b0c408daad5df43e5851f1d369e50f7 Author: Tobias Klauser Date: Thu Dec 9 15:51:32 2010 +0100 msm_serial: Remove redundant unlikely() IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser Signed-off-by: David Brown commit d1b758ebc2a82d738092cb42e742470f9d0ea53e Author: Konrad Rzeszutek Wilk Date: Thu Dec 9 14:53:29 2010 -0500 xen/irq: Cleanup the find_unbound_irq The "find_unbound_irq" is a bit unusual - it allocates virtual IRQ (event channels) in reverse order. This means starting at the "top" of the available IRQs (nr_irqs) down to the GSI/MSI IRQs (nr_irqs_gsi). Lets document this and also make the variables easier to understand. Signed-off-by: Konrad Rzeszutek Wilk commit 0e3fa13f4ee110de007bca3bf395b77997319fc8 Author: Feng Tang Date: Wed Dec 8 15:18:57 2010 +0800 x86: Further simplify mp_irq info handling assign_to_mp_irq() is copying the struct mpc_intsrc members one by one. That's silly. Use memcpy() and let the compiler figure it out. Same for the identical function assign_to_mpc_intsrc() mp_irq_mpc_intsrc_cmp() is comparing the struct members one by one, but no caller ever checks the different return codes. Use memcmp() instead. Remove the extra printk in MP_ioapic_info() Signed-off-by: Feng Tang Cc: Yinghai Lu Cc: "Alan Cox Cc: Len Brown LKML-Reference: <20101208151857.212f0018@feng-i7> Signed-off-by: Thomas Gleixner commit 2d8009ba67f9503ceadf9d5a3b5637cee291ea8d Author: Feng Tang Date: Fri Nov 19 11:33:35 2010 +0800 x86: Unify 3 similar ways of saving mp_irqs info There are 3 places defining similar functions of saving IRQ vector info into mp_irqs[] array: mmparse/acpi/mrst. Replace the redundant code by a common function in io_apic.c as it's only called when CONFIG_X86_IO_APIC=y Signed-off-by: Feng Tang Cc: Alan Cox Cc: Len Brown Cc: Yinghai Lu LKML-Reference: <20101207133204.4d913c5a@feng-i7> Signed-off-by: Thomas Gleixner commit 60d79fd99ff3b9c692b260a4d53a203f537c052a Author: Yinghai Lu Date: Tue Dec 7 00:59:49 2010 -0800 x86, ioapic: Avoid writing io_apic id if already correct For 32bit mptable path, setup_ids_from_mpc() always writes the io_apic id register, even there is no change needed. Skip the write, when readout and mptable match. Signed-off-by: Yinghai Lu Cc: Sebastian Siewior LKML-Reference: <4CFDF785.7010401@kernel.org> Signed-off-by: Thomas Gleixner commit 0450193bffed6e4b6160c4a5ccb0df158eba7d2a Author: Yinghai Lu Date: Tue Dec 7 00:55:56 2010 -0800 x86, x2apic: Don't map lapic addr for preenabled x2apic systems If x2apic is preenabled and used by the kernel, we don't need to map the lapic address. That mapping will never be used. So just skip that in register_lapic_address() Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF69C.9070501@kernel.org> Signed-off-by: Thomas Gleixner commit 53301f36f316a6519c464b0ef2a155386c20be19 Author: Yinghai Lu Date: Tue Dec 7 00:55:47 2010 -0800 x86, sfi: Use register_lapic_address() register_lapic_address() and mp_sfi_register_lapic_address() are almost identical. Use the common function. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" Cc: Len Brown LKML-Reference: <4CFDF693.6000908@kernel.org> Signed-off-by: Thomas Gleixner commit 326a2e6bae250b1172c0ae80f3b259d79e9cb56c Author: Yinghai Lu Date: Tue Dec 7 00:55:38 2010 -0800 x86, apic: Use register_lapic_address() in init_apic_mapping() Remove the printk as well, we don't want to print when nothing changed. We print in register_lapic_address() already. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF68A.7020902@kernel.org> Signed-off-by: Thomas Gleixner commit f1157141636848f52c5f74040bed0ba355cf59b7 Author: Yinghai Lu Date: Tue Dec 7 00:55:29 2010 -0800 x86, apic: Remove early_init_lapic_mapping() It is almost the same as smp_register_lapic_addr(). We just need to let smp_read_mpc() call smp_register_lapic_addr() when early==1. Add the apic_printk to smp_register_lapic_address() Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" LKML-Reference: <4CFDF681.3030509@kernel.org> Signed-off-by: Thomas Gleixner commit c0104d38a740b25662c592c71f6907676510289c Author: Yinghai Lu Date: Tue Dec 7 00:55:17 2010 -0800 x86, apic: Unify identical register_lapic_address() functions They are the same, move the common function to apic.c to allow further cleanups. Signed-off-by: Yinghai Lu Cc: Suresh Siddha Cc: "Eric W. Biederman" Cc: Len Brown LKML-Reference: <4CFDF675.4060305@kernel.org> Signed-off-by: Thomas Gleixner commit 8d5203ca62539c6ab36a5bc2402c2de1de460e30 Merge: 8fd2685 63abf3e Author: Chris Wilson Date: Thu Dec 9 20:22:04 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit 8fd2685911cb6c140e6d0588ac04990ce65d4537 Author: Chris Wilson Date: Wed Dec 8 18:40:43 2010 +0000 drm/i915: Enable RC6 autodownclocking on Sandybridge Signed-off-by: Chris Wilson commit eb43f4af7ecb7d51ba44f5e96bf74eedf1c27d62 Author: Chris Wilson Date: Wed Dec 8 17:32:24 2010 +0000 drm/i915: Terminate the FORCE WAKE after we have finished reading Once we have read the value out of the GT power well, we need to remove the FORCE WAKE bit to allow the system to auto-power down. Signed-off-by: Chris Wilson commit a8e93126a6f10d0a14ba8407ec112b1b3a5e2e97 Author: Chris Wilson Date: Wed Dec 8 14:28:54 2010 +0000 drm/i915/gtt: Clear the cachelines upon resume Required for my pineview system to not barf after resuming. Signed-off-by: Chris Wilson commit d1c3b177b9940541e89015a726ac279caf1a21f3 Author: Chris Wilson Date: Wed Dec 8 14:26:19 2010 +0000 drm/i915: Restore GTT mapping first upon resume As suggested by Daniel Vetter, this is a safeguard should any of the registers cause reference to PTE entries. Signed-off-by: Chris Wilson commit 4a19d02e0a8cd8799e5d150d8eb74861e1a4cdec Author: Chris Wilson Date: Wed Dec 8 13:31:49 2010 +0000 drm/i915: driver.suspend and .resume are always set So we can remove the repeated initialisation. Signed-off-by: Chris Wilson commit b8f7ab1788f23d79084f051bb9ae3cb02b55bff3 Author: Chris Wilson Date: Wed Dec 8 10:43:06 2010 +0000 drm/i915: Mark the user reloc error paths as unlikely Signed-off-by: Chris Wilson commit 67731b87e9572801c41f8fe779750babdd362416 Author: Chris Wilson Date: Wed Dec 8 10:38:14 2010 +0000 drm/i915: Eliminate drm_gem_object_lookup during relocation As we provide a list of all objects that will be accessed from the batchbuffer, we can build a lut of the handles associated with those objects for this invocation and use that to avoid the overhead of looking up those objects again for every relocation. The cost of building and searching a small hash table is much less than that of acquiring a spinlock, searching a radix tree and manipulating an atomic refcnt per relocation. Signed-off-by: Chris Wilson commit ff7ea4c04012e01a9a50c5e42dabdaf0794734ce Author: Chris Wilson Date: Wed Dec 8 09:43:41 2010 +0000 drm/i915: Re-arm the idle timers if the device is still busy Don't post a downclocking task if the device is still active when the idle timer fires. A pathological process could queue up several seconds worth of processing and then go to sleep, during which time the idle timer would kick in and downclock the GPU. Signed-off-by: Chris Wilson commit defb3519a64141608725e2dac5a5aa9a3c644bae Author: David S. Miller Date: Wed Dec 8 21:16:57 2010 -0800 net: Abstract away all dst_entry metrics accesses. Use helper functions to hide all direct accesses, especially writes, to dst_entry metrics values. This will allow us to: 1) More easily change how the metrics are stored. 2) Implement COW for metrics. In particular this will help us put metrics into the inetpeer cache if that is what we end up doing. We can make the _metrics member a pointer instead of an array, initially have it point at the read-only metrics in the FIB, and then on the first set grab an inetpeer entry and point the _metrics member there. Signed-off-by: David S. Miller Acked-by: Eric Dumazet commit 51ddafcbc735155a7e946b8b6ff19fcd5351375b Merge: d834a9d 991cfff Author: Thomas Gleixner Date: Thu Dec 9 18:19:13 2010 +0100 Merge branch 'x86/platform' into x86/apic-cleanups Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform Signed-off-by: Thomas Gleixner commit d834a9dcecae834cd6b2bc5e50e1907738d9cf6a Merge: a38c538 f658bcf Author: Thomas Gleixner Date: Thu Dec 9 18:17:25 2010 +0100 Merge branch 'x86/amd-nb' into x86/apic-cleanups Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform Conflicts: arch/x86/include/asm/io_apic.h Signed-off-by: Thomas Gleixner commit 2c6cb1053ad8b61ab9fb50b578d0ffea959f7583 Author: Rakib Mullick Date: Thu Dec 9 14:47:34 2010 +0600 x86: Address 'unused' warning in hw_nmi.c again arch/x86/kernel/apic/hw_nmi.c:29: warning: backtrace_mask defined but not used commit 0e2af2a9(x86, hw_nmi: Move backtrace_mask declaration under ARCH_HAS_NMI_WATCHDOG) addressed this warning, but it was reintroduced by commit 5f2b0ba4(x86, nmi_watchdog: Remove the old nmi_watchdog). Move backtrace_mask into the #ifdef arch_trigger_all_cpu_backtrace section again. Signed-off-by: Rakib Mullick Cc: Don Zickus Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Thomas Gleixner commit b7613370db5ba66ad81e41cd3a5417fde4d5e03c Author: John W. Linville Date: Thu Dec 9 09:08:47 2010 -0500 ath: fix build break with ATH_DBG_WARN_ON_ONCE Description by Hauke: "If CONFIG_ATH_DEBUG=y is set ATH_DBG_WARN_ON_ONCE uses WARN_ON_ONCE and returns something, but if CONFIG_ATH_DEBUG is not set it does not return anything. Now ATH_DBG_WARN_ON_ONCE is used in the boolean expression in an if case and is not returning anything and causes a compile error. CC [M] /drivers/net/wireless/ath/ath9k/main.o /drivers/net/wireless/ath/ath9k/main.c: In function ‘ath_isr’: /drivers/net/wireless/ath/ath9k/main.c:769: error: expected expression before ‘do’ make[5]: *** [/drivers/net/wireless/ath/ath9k/main.o] Error 1 make[4]: *** [/drivers/net/wireless/ath/ath9k] Error 2" Reported-by: Hauke Mehrtens Signed-off-by: John W. Linville commit ddbc24b72c2c3f3f0182bbc2cb70b31c52a6f45b Author: Arnaldo Carvalho de Melo Date: Thu Dec 9 12:20:20 2010 -0200 perf session: Remove unneeded dump_printf calls Since we check at the beginning of the callers, no need to ask if dump_trace is set multiple times. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit ba74f0640d963ccc914ac533cb0ba133ee07bcf2 Author: Thomas Gleixner Date: Tue Dec 7 12:49:01 2010 +0000 perf session: Split out user event processing Simplify further. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124551.110956235@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 3dfc2c0aee789843d18f6e4675658e6879465a56 Author: Thomas Gleixner Date: Tue Dec 7 12:48:58 2010 +0000 perf session: Split out sample preprocessing Simplify the code a bit. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124551.014649793@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 532e7269c01098f0be6e08113c6947ec6ed11bfa Author: Thomas Gleixner Date: Tue Dec 7 12:48:55 2010 +0000 perf session: Move dump code to event delivery path Preparatory patch for ordered perf report -D Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.918655066@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit f74725dcf2f6931c26bc65e77e34e693eeb8441c Author: Thomas Gleixner Date: Tue Dec 7 12:48:53 2010 +0000 perf session: Add file_offset to event delivery function Preparatory patch for ordered output of perf report -D Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.818568607@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit e4c2df132fef60a28b851abc1859a531e64f350c Author: Thomas Gleixner Date: Tue Dec 7 12:48:50 2010 +0000 perf session: Store file offset in sample_queue Preparatory patch for ordered output of perf report -D. Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.725128545@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 4e53f78e5b06c073a5c10814c72e98c1ca8a9f10 Author: Michael S. Tsirkin Date: Mon Nov 29 19:16:37 2010 +0200 tools/virtio: virtio_test tool This is the userspace part of the tool: it includes a bunch of stubs for linux APIs, somewhat simular to linuxsched. This makes it possible to recompile the ring code in userspace. A small test example is implemented combining this with vhost_test module. Signed-off-by: Michael S. Tsirkin commit 71ccc212e5b28dfcc870b6db6589c2df264fdc6a Author: Michael S. Tsirkin Date: Mon Nov 29 19:09:01 2010 +0200 vhost test module This adds a test module for vhost infrastructure. Intentionally not tied to kbuild to prevent people from installing and loading it accidentally. Signed-off-by: Michael S. Tsirkin commit 28831ee60b79bed50958c9cb0d2e76cdc98406f9 Author: Michael S. Tsirkin Date: Mon Nov 29 10:22:10 2010 +0200 vhost: better variable name in logging We really store a page offset in write_address, so rename it write_page to avoid confusion. Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit b7ee1d01c5ff3bf2e51c8565ea00823cdbc2a9f3 Author: Sedat Dilek Date: Tue Dec 7 22:35:50 2010 +0100 ath5k: Fix modinfo does not list alias -> pci-id lines The AHB bus support patchset moved the table "Known PCI ids" from base.c to pci.c - unfortunately, MODULE_DEVICE_TABLE() was not transferred. With this fix 'modinfo ath5k' lists the alias -> pci-id lines, again. The issue was introduced by: commit e5b046d86fac609f636d127a38de94a175c7e83b "ath5k: Move PCI bus functions to separate file." Signed-off-by: Sedat Dilek Signed-off-by: John W. Linville commit 6a66bbd693c12f71697c61207aa18bc5a12da0ab Author: Chase Douglas Date: Wed Dec 8 15:08:04 2010 -0800 HID: magicmouse: Don't report REL_{X,Y} for Magic Trackpad With the recent switch to having the hid layer handle standard axis initialization, the Magic Trackpad now reports relative axes. This would be fine in the normal mode, but the driver puts the device in multitouch mode where no relative events are generated. Also, userspace software depends on accurate axis information for device type detection. Thus, ignoring the relative axes from the Magic Trackpad is best. Signed-off-by: Chase Douglas Signed-off-by: Jiri Kosina commit 3bf9be40ff76b6df136f14a497167c116b2b3c53 Author: Michael S. Tsirkin Date: Mon Nov 29 10:19:07 2010 +0200 vhost: correctly set bits of dirty pages Fix two bugs in dirty page logging: When counting pages we should increase address by 1 instead of VHOST_PAGE_SIZE. Make log_write() correctly process requests that cross pages with write_address not starting at page boundary. Reported-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit a290aec88a9c4747353ea7aa9b2569bd61297c3c Author: Jason Wang Date: Mon Nov 29 13:48:40 2010 +0800 vhost: fix typos in comment Signed-off-by: Jason Wang Signed-off-by: Michael S. Tsirkin commit bf5e0bd27f7cbaca4d52ae395bbf3715775efebd Author: Michael S. Tsirkin Date: Sun Nov 14 17:33:25 2010 +0200 vhost: remove unused include vhost.c does not need to know about sockets, don't include sock.h Signed-off-by: Michael S. Tsirkin commit 9aefcab0de472ee2b3ab195a6827ddd4b170e3a7 Author: Thomas Gleixner Date: Tue Dec 7 12:48:47 2010 +0000 perf session: Consolidate the dump code The dump code used by perf report -D is scattered all over the place. Move it to separate functions. Acked-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.625434869@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 79a14c1f458d598642bf11f09512c83d33a114e6 Author: Thomas Gleixner Date: Tue Dec 7 12:48:44 2010 +0000 perf session: Dont queue events w/o timestamps If the event has no timestamp assigned then the parse code sets it to ~0ULL which causes the ordering code to enqueue it at the end. Process it right away. Reported-by: Ian Munsie Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.528788441@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 3835bc00c5b2d8e337a6e9d7b44f47e02760dba3 Author: Thomas Gleixner Date: Tue Dec 7 12:48:42 2010 +0000 perf event: Prevent unbound event__name array access event__name[] is missing an entry for PERF_RECORD_FINISHED_ROUND, but we happily access the array from the dump code. Make event__name[] static and provide an accessor function, fix up all callers and add the missing string. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Peter Zijlstra LKML-Reference: <20101207124550.432593943@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit b226a5a72901bc9c73d639ea2e53e6c304bf3b74 Author: David Ahern Date: Tue Dec 7 19:39:46 2010 -0700 perf report: Allow user to specify path to kallsyms file This is useful for analyzing a perf data file on a different system than the one data was collected on and still include symbols from loaded kernel modules in the output. Commiter note: Updated the man page accordingly. LKML-Reference: <1291775986-16475-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern Signed-off-by: Arnaldo Carvalho de Melo commit 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 Merge: 05d209a a096862 Author: Mark Brown Date: Thu Dec 9 11:29:13 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 05d209ad3b66efbb0925f01f1b3369fcbf31c86f Author: Seungwhan Youn Date: Thu Dec 9 13:17:39 2010 +0900 ASoC: Remove unnecessary structure definitions This patch removes some legacy structure definitions which are not using in current ASoC drivers. Signed-off-by: Seungwhan Youn Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fb67afda49220426af3ca570187faa910403e49a Author: Alexander Sverdlin Date: Thu Dec 9 03:43:49 2010 +0300 ASoC: EP93xx: sampling rate range extended Changes to both I2S and PCM code: - Rates list extended up to 96kHz, it's tested on EDB9302 and works for both capture and playback. Signed-off-by: Alexander Sverdlin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 23ac3b61331137355064d8b22a3624fe1cd8527a Author: Jorge Eduardo Candelaria Date: Wed Dec 8 10:55:05 2010 -0600 ASoC: sdp4430: Enable FM stereo pins Add FM stereo pins to the machine driver and add them as a dapm widget. Signed-off-by: Jorge Eduardo Candelaria Signed-off-by: Margarita Olaya Cabrera Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 3ee4fe15aba7531f75be4dcc331caa8f0c6369ec Author: Peter Ujfalusi Date: Wed Dec 8 15:12:56 2010 +0200 ASoC: tlv320dac33: Fix compillation error Fix the compilation error introduced by patch: ASoC: tlv320dac33: Avoid multiple soft power up Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 76eac39ce5f64b95931a6026812e902cb8863a6c Author: Peter Ujfalusi Date: Wed Dec 8 16:04:33 2010 +0200 ASoC: tlv320dac33: Move DAC LR power on to a supply widget The power for the DACs need to be enabled, even when only the analog bypass is in use with the codec, otherwise the audio is going to be distorted. Make sure that the DACs are powered all the time, when there is audio activity. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 9e87186fff939924da58b8f562ec275757e29776 Author: Peter Ujfalusi Date: Wed Dec 8 16:04:32 2010 +0200 ASoC: tlv320dac33: Rename outpup amplifier widget Use better name for the widget, and remove the 'Power' from it's name. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7c1a70e99819d723cde610d83de48a8ab01ec609 Author: Martin Persson Date: Wed Dec 8 15:13:42 2010 +0100 ux500: Add cpufreq support for u8500 Signed-off-by: Martin Persson Signed-off-by: Linus Walleij commit e0befb23dfed4d4d0de9d97dac936ccc0bbec093 Author: Martin Persson Date: Wed Dec 8 15:13:28 2010 +0100 ux500: Add prcmu support for operating points Adds support in PRCMU driver to handle CPU and APE operating points. Signed-off-by: Martin Persson Signed-off-by: Linus Walleij commit 93430096f9d757104080f40f51afb2dada8877b5 Author: Brian Bloniarz Date: Wed Dec 8 12:45:20 2010 -0800 ALSA: ice1712 - working M-Audio Delta 66E support Rev. E of the M-Audio Delta 66 is partially supported (commit ef2cd2ccad66b4aba518eca7514eface267ee0f3), but the layout of the GPIO pins was still unclear. This patch adds the GPIO definitions so that communication to the CS8247 & 2x AK4524 works correctly. ALSA bug#3327 has more details; users cap & jhunt report there that the GPIO wiring is similar to the Digigram VX442 (chip select: pin 4 = CS8427, pin 5 = AK4524 #0, pin 6 = AK4524 #1). There has been a lot of conflicting information in the bug, but given these definitions, my Delta 66E works; I tested analog in&out at 44.1kHz & 96kHz, analog gain settings, S/PDIF clock sync, and S/PDIF in&out at 44.1kHz. Signed-off-by: Brian Bloniarz Signed-off-by: Takashi Iwai commit 6be7948ff4fa7662c1ee1994e1798074f8e832ed Author: Todd Broch Date: Tue Dec 7 16:51:05 2010 -0800 ALSA: hda: Add fixup for mario system create fixup function for the mario model and override amp capabilities for NID 0x2 Signed-off-by: Todd Broch Signed-off-by: Takashi Iwai commit e1eb5f10069b7c393174b3a272ad647537969862 Author: Todd Broch Date: Mon Dec 6 11:19:51 2010 -0800 ALSA: hda: Add modelname lookup and fixup for realtek codecs Facilitate fixup for realtek codecs via modelname lookup of fixup data. Fallback to quirk based lookup in absence of model definition. Signed-off-by: Todd Broch Signed-off-by: Takashi Iwai commit 98b14d6b290d96b24ae993ceaccc59b2aa4b130c Author: Marc Zyngier Date: Sun Dec 5 05:05:37 2010 +0000 powerpc/powermac: Make auto-loading of therm_pm72 possible The therm_pm72 driver, used on the PowerMac G5 range, cannot be auto-loaded, since the driver itself creates both the device node and the driver instance. Moving the device node creation to the platform setup code and adding the necessary MODULE_DEVICE_TABLE() information allows the driver to be automatically loaded by udev on any semi-modern distribution. It "fixes" a major source of problem on G5 machines where the driver wasn't explicitely loaded by default, and the system would automatically shutdown under load. Tested on an Xserve G5. Signed-off-by: Marc Zyngier Cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit 982cf00412a890ca738c2d78528b652ca431ad1a Author: Sebastian Siewior Date: Tue Nov 30 23:54:46 2010 +0000 of/address: Use propper endianess in get_flags This patch changes u32 to __be32 for all "ranges", "prop" and "addr" and such. Those variables are pointing to the device tree which containts intergers in big endian format. Most functions are doing it right because of_read_number() is doing the right thing for them. of_bus_isa_get_flags(), of_bus_pci_get_flags() and of_bus_isa_map() were accessing the data directly and were doing it wrong. Signed-off-by: Sebastian Andrzej Siewior Acked-by: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit 518fdae26a530d3f0f11e3650348ab75e5891cfd Author: Joe Perches Date: Fri Nov 12 14:49:19 2010 +0000 powerpc/pci: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Benjamin Herrenschmidt commit ae9fd31a3668ca97e8f37698b927ae7c0b70807a Author: Jesper Juhl Date: Mon Nov 8 13:07:57 2010 +0000 powerpc: Remove unnecessary casts of void ptr Hi, 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 arch/powerpc/ Signed-off-by: Jesper Juhl Signed-off-by: Benjamin Herrenschmidt commit 3b7a27db3b6b5501e3d1c1628e6d5a547ffe76c6 Author: Jesse Larrew Date: Wed Dec 1 12:31:26 2010 +0000 powerpc: Disable VPHN polling during a suspend operation Tie the polling mechanism into the ibm,suspend-me rtas call to stop/restart polling before/after a suspend, hibernate, migrate, or checkpoint restart operation. This ensures that the system has a chance to disable the polling if the partition is migrated to a system that does not support VPHN (and vice versa). Signed-off-by: Jesse Larrew Signed-off-by: Benjamin Herrenschmidt commit 9eff1a38407c051273fe1a20f03f8155bd32de35 Author: Jesse Larrew Date: Wed Dec 1 12:31:15 2010 +0000 powerpc/pseries: Poll VPA for topology changes and update NUMA maps This patch sets a timer during boot that will periodically poll the associativity change counters in the VPA. When a change in associativity is detected, it retrieves the new associativity domain information via the H_HOME_NODE_ASSOCIATIVITY hcall and updates the NUMA node maps and sysfs entries accordingly. Note that since the ibm,associativity device tree property does not exist on configurations with both NUMA and SPLPAR enabled, no device tree updates are necessary. Signed-off-by: Jesse Larrew Signed-off-by: Benjamin Herrenschmidt commit 4dfa9c474859629a2c4a3f8d29804d6a6c994908 Author: Anton Blanchard Date: Tue Dec 7 14:36:05 2010 +0000 powerpc: iommu: Add device name to iommu error printks Right now its difficult to see which device is running out of iommu space: iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1 Use dev_info() so we get the device name and location: ipr 0000:00:01.0: iommu_alloc failed, tbl c00000076e096660 vaddr c000000768806600 npages 1 Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 7a9d12568e34e37a72d9e00ce01b62dec527e663 Author: Michael Ellerman Date: Sun Nov 28 18:26:36 2010 +0000 powerpc: Record vma->phys_addr in ioremap() The vmalloc code can track the physical address of a vma, when the vma is used for ioremap, if set it is displayed in /proc/vmallocinfo. Because get_vm_area_caller() doesn't know it's being called for ioremap() it's up to the arch code to set the phys_addr. A bunch of other arch's do this, I'm not sure why powerpc doesn't? Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit bb2c458b8b8c8a53f65b78051d22a0f13d53abcb Author: Andreas Schwab Date: Sun Nov 28 06:33:14 2010 +0000 powerpc: Update compat_arch_ptrace Update compat_arch_ptrace to follow recent changes in PTRACE_GET_DEBUGREG and the addition of PPC_PTRACE_{GETHWDBGINFO|{SET|DEL}HWDEBUG}. The latter three can be forwarded to arch_ptrace unchanged. Signed-off-by: Andreas Schwab Signed-off-by: Benjamin Herrenschmidt commit 4dfbf290aeb9d63a058d9d8237203b0b72bfbbe3 Author: Andreas Schwab Date: Sat Nov 27 14:24:53 2010 +0000 powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S Properly set the DABR_TRANSLATION/DABR_DATA_READ/DABR_DATA_READ bits in the dabr when setting the debug register via PPC_PTRACE_SETHWDEBUG. Also don't reject trigger type of PPC_BREAKPOINT_TRIGGER_READ. Signed-off-by: Andreas Schwab Signed-off-by: Benjamin Herrenschmidt commit 364a1246522f99cbe58040e99af007ada31034ed Author: Heiko Schocher Date: Mon Nov 22 21:30:33 2010 +0000 powerpc/time: printk time stamp init not correct problem: I see sometimes on my mpc5200 based board such printk timing information: [ 0.000000] NR_IRQS:512 nr_irqs:512 16 [ 0.000000] MPC52xx PIC is up and running! [ 0.000000] clocksource: timebase mult[79364d9] shift[22] registered [ 0.000000] console [ttyPSC0] enabled [ 130.300633] pid_max: default: 32768 minimum: 301 [ 130.305647] Mount-cache hash table entries: 512 [ 130.315818] NET: Registered protocol family 16 reason: if the tbu not starts from 0 when linux boots, boot_tb maybe could not store the real 64 bit tbu value, because boot_tp is only a 32 bit unsigned long. solution: change boot_tb to u64 [BenH: Made it u64 instead of unsigned long long] Signed-off-by: Heiko Schocher cc: Wolfgang Denk Signed-off-by: Benjamin Herrenschmidt commit bee376ff4c1fc178031dad51ba38ff18a98a39c8 Author: Sonny Rao Date: Thu Nov 18 00:39:23 2010 +0000 powerpc: Minor cleanups for machdep.h Remove stale declaration of setup_pci_ptrs, aparently from ppc before 2.4.0 Remove #ifdef around struct existance delcaration Fix spelling of "linear" Signed-off-by: Milton Miller Signed-off-by: Sonny Rao Signed-off-by: Benjamin Herrenschmidt commit 928a31978115b48ad634a97755915e8ab23c4749 Author: Sonny Rao Date: Thu Nov 18 00:35:07 2010 +0000 Powerpc: separate CONFIG_RELOCATABLE from CONFIG_CRASHDUMP in boot code Fix head_64.S so that we can build a relocatable kernel that isn't necessarily a crash-dump kernel Signed-off-by: Milton Miller Signed-off-by: Sonny Rao Signed-off-by: Benjamin Herrenschmidt commit 8f4da26e9bf89f54b68d5cc3f3596f45e5f43911 Author: Anton Blanchard Date: Wed Dec 8 00:55:03 2010 +0000 powerpc: Fix incorrect comment about interrupt stack allocation We now allow interrupt stacks anywhere in the first segment which can be 256M or 1TB. Fix the comment. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit b5f9b6665b70b4c844bed5452f6a14743eefa57c Author: Anton Blanchard Date: Tue Dec 7 19:58:17 2010 +0000 powerpc: Hardcode popcnt instructions for old assemblers The popcnt instructions went into binutils relatively recently. As with a number of other instructions, create macros and hardcode them. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit b8c49def6d73321724bab66dd30526744b482f0a Author: Benjamin Herrenschmidt Date: Thu Dec 9 15:24:01 2010 +1100 powerpc/pseries: Pass phb only to iommu_table_setparms_lpar iommu_table_setparms_lpar needs either the phb or the subbusnumber (not both), pass the phb to make it similar to iommu_table_setparms. Note: In cases where a caller was passing bus->number previously to iommu_table_setparms_lpar() rather than phb->bus->number, this can lead to a different value in tbl->it_busno. The only example of this was the removed pci_dma_dev_setup_pSeriesLP(), removed in "ppc/iommu: remove unneeded pci_dma_dev_setup_pSeriesLP". [BenH: You updated only one of the two callers. Fixed that for you] Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 4af2da25ede8af6536254e92b6ed5c4026105870 Author: Nishanth Aravamudan Date: Tue Oct 26 17:35:15 2010 +0000 powerpc/pseries: Do not need to check for dma_window == NULL The block in pci_dma_dev_setup_pSeriesLP for dma_window == NULL can be removed because we will only teminate the loop if we had already allocated a iommu table for that node or we found a window. While there may be no window for the device, the intresting part is if we are reusing a table or creating it for the first device under it. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit f4133236d6473072b5982c1182991eade6ff5bae Author: Nishanth Aravamudan Date: Tue Oct 26 17:35:14 2010 +0000 powerpc/pseries: Checking for pdn->parent is redundant The device tree root is never a pci bus, and will not have a PCI_DN(pdn), so the check for PCI_DN added in 650f7b3b2f0ead0673e90452cf3dedde97c537ba makes the check for pdn->parent redundant and it can be removed. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 7372cfb88f71ed975c8588d1ca5ecc8bb9ec7c7b Author: Nishanth Aravamudan Date: Tue Oct 26 17:35:13 2010 +0000 powerpc/pseries: Do not search for dma-window property on dlpar remove The iommu_table pointer in the pci auxiliary struct of device_node has not been used by the iommu ops since the dma refactor of 12d04eef927bf61328af2c7cbe756c96f98ac3bf, however this code still uses it to find tables for dlpar. By only setting the PCI_DN iommu_table pointer on nodes with dma window properties, we will be able to quickly find the node for later checks, and can remove the table without looking for the the dma window property on dlpar remove. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit b3c73856ae47d43d0d181f9de1c1c6c0820c4515 Author: Nishanth Aravamudan Date: Mon Oct 18 07:27:04 2010 +0000 powerpc/iommu: Use coherent_dma_mask for alloc_coherent The IOMMU code has been passing the dma-mask instead of the coherent_dma_mask to the iommu allocator. Coherent allocations should be made using the coherent_dma_mask. Also update the vio code to ensure the coherent_dma_mask is set. Without this change drivers, such as ibmvscsi, fail to load with the corrected dma_iommu_alloc_coherent(). Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 56d8adc5695a8d3f070c8498d532389580af5611 Merge: f4b9841 ee2ffd8 Author: Benjamin Herrenschmidt Date: Thu Dec 9 14:36:59 2010 +1100 Merge remote branch 'jwb/next' into next commit f4b98415953dcf85bac4ea0a2264a3ead4a7bcc4 Merge: 46f5221 6024ede Author: Benjamin Herrenschmidt Date: Thu Dec 9 14:36:38 2010 +1100 Merge branch 'nvram' into next commit 84b3cdc38cd2882d7ac3c2ae4b6faf5c199874e3 Author: David S. Miller Date: Wed Dec 8 18:41:03 2010 -0800 can: slcan: Add missing linux/sched.h include. drivers/net/can/slcan.c: In function 'slcan_open': drivers/net/can/slcan.c:568: error: dereferencing pointer to incomplete type Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit 38ef4c2e437d11b5922723504b62824e96761459 Author: Serge E. Hallyn Date: Wed Dec 8 15:19:01 2010 +0000 syslog: check cap_syslog when dmesg_restrict Eric Paris pointed out that it doesn't make sense to require both CAP_SYS_ADMIN and CAP_SYSLOG for certain syslog actions. So require CAP_SYSLOG, not CAP_SYS_ADMIN, when dmesg_restrict is set. (I'm also consolidating the now common error path) Signed-off-by: Serge E. Hallyn Acked-by: Eric Paris Acked-by: Kees Cook Signed-off-by: James Morris commit be3e5b32462790b91c14d5869fbabaf5bfe7c901 Author: Peter Huewe Date: Tue Dec 7 23:44:33 2010 +0100 staging/zram: Fix sparse warning 'Using plain integer as NULL pointer' This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit 597a1e7cccc9a5a0c47629267ac4b23bf8654578 Author: Peter Huewe Date: Tue Dec 7 23:38:02 2010 +0100 staging/line6: Fix sparse warning 'Using plain integer as NULL pointer' This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit fb657461abf6842b8f7603370ff349f42814ac5b Author: Henry Ptasinski Date: Wed Dec 8 13:18:04 2010 -0800 staging: brcm80211: fix documentation on installing firmware Fix the documentation to have the current firmware filenames and use the correct path. Signed-off-by: Henry Ptasinski Signed-off-by: Greg Kroah-Hartman commit 818c07b894df8c3a6399800bcc632569cbc1e70a Author: Henry Ptasinski Date: Wed Dec 8 13:09:49 2010 -0800 MAINTAINERS: update the entry for the BRCM80211 driver This time with Signed-off-by ... Removed Nohee, added Roland, Arend and Dowan. Changes were previously made to drivers/staging/brcm80211{README,TODO}, but MAINTAINERS was missed. Signed-off-by: Henry Ptasinski Signed-off-by: Greg Kroah-Hartman commit baffa2f609863b879703c4b757d63558b2caebdb Author: Roland Vossen Date: Wed Dec 8 20:16:02 2010 +0100 staging: brcm80211: removed unused struct wlc_ap_info Code cleanup, reaction on the email from Dan Carpenter. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 08db27dc8d829e6df007cd079fdfa83584f66544 Author: Roland Vossen Date: Tue Dec 7 17:45:46 2010 +0100 staging: brcm80211: replaced typedef wlc_pub_t by struct wlc_pub Code cleanup Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit c41c858f695b6626e2fc0729edc0dd26b091f354 Author: Roland Vossen Date: Tue Dec 7 17:45:45 2010 +0100 staging: brcm80211: replaced typedef wlccore_t by struct wlccore Code cleanup Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit f077f7185ce19adc234b96c6f9fb815301770c26 Author: Roland Vossen Date: Tue Dec 7 17:45:44 2010 +0100 staging: brcm80211: replaced typedef wlcband_t by struct wlcband Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 17d766510b9630cfa723a6711e314565a048c234 Author: Roland Vossen Date: Tue Dec 7 17:45:43 2010 +0100 staging: brcm80211: replaced typedef hnddma_t by struct hnddma_pub Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 6cdeaef203155bd7f12d362e5345323cfecde58a Author: Roland Vossen Date: Tue Dec 7 17:45:42 2010 +0100 staging: brcm80211: replaced typedef wl_if_t by struct wl_if Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit d65ddb58325ba2c4fef70f6c9ff542df81e5cdb3 Author: Roland Vossen Date: Tue Dec 7 17:45:41 2010 +0100 staging: brcm80211: replaced typedef bmac_pmq_t by struct bmac_pmq Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 299f8a4658e055d9f9713f7bed45860474544e68 Author: Roland Vossen Date: Tue Dec 7 17:45:40 2010 +0100 staging: brcm80211: replaced typedef antsel_info_t by struct antsel_info Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 0e4934748948b5886c965fe56207b41d3abd58e7 Author: Roland Vossen Date: Tue Dec 7 17:45:39 2010 +0100 staging: brcm80211: replaced typedef wlc_ap_info_t by struct wlc_ap_info Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 1f2fd4531d37553e4613f8f5e79cf199f47a82d2 Author: Roland Vossen Date: Tue Dec 7 17:45:38 2010 +0100 staging: brcm80211: replaced typedef ampdu_info_t by struct ampdu_info Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 4dc79de1e39957575a784cf79bb214e54a42d44e Author: Roland Vossen Date: Tue Dec 7 17:45:37 2010 +0100 staging: brcm80211: replaced typedef wlc_if_t by struct wlc_if Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 41224eb2dfe76fffc95cf9613c5bb2f4a518ddbf Author: Roland Vossen Date: Tue Dec 7 17:45:36 2010 +0100 staging: brcm80211: removed unused macro's and typedefs from wpa.h Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 0dedc37070ba1eabb2d1c7aa7899c7a9100ecf30 Author: Roland Vossen Date: Tue Dec 7 17:45:35 2010 +0100 staging: brcm80211: removed unused typedefs Code cleanup. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 1226056d9608d241db4b558a0d88a347ad5c66ae Author: Chen, Chien-Chia Date: Wed Dec 8 14:20:33 2010 -0800 Staging: rt3090: Fix RT3090 scan AP function Fix RT3090 scan AP function. This patch fixes the rt3090 wireless module failed to scan AP around due to Windows driver causing rt3090 module unable to scan AP in Linux. Acked-by: Lee, Chun-Yi Signed-off-by: Chen, Chien-Chia Cc: stable Signed-off-by: Greg Kroah-Hartman commit fe6c791570efe717946ea7b7dd50aec96b70d551 Merge: f8bf568 f198725 Author: David S. Miller Date: Wed Dec 8 13:15:38 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c net/llc/af_llc.c commit 393934c6b5c8d00f9d1ae20670d4a770f07a418a Merge: 69f4aab 0a54917 Author: John W. Linville Date: Wed Dec 8 16:23:31 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ath9k.h drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/ath/ath9k/xmit.c commit 69f4aab1157d2a386e7ea4de77cc253629d1b4f2 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:23 2010 -0800 ath9k_hw: warn if we cannot change the power to the chip Suspend requires the device to be in fullsleep otherwise upon resume the device becomes unresponsive. We need to ensure that when we want the device to go to sleep it yields to the request, otherwise we'll have a useless devices upon resume. Warn when changing the power fails as we need to look into these issues. Cc: Paul Stewart Cc: Amod Bodas Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit ff9f0b639f33c92a89b0799263ab625444be6ee1 Author: Luis R. Rodriguez Date: Tue Dec 7 15:13:22 2010 -0800 ath9k: skip ATH9K_INT_TIM_TIMER when we are idle We should not be idle when we get the ATH9K_INT_TIM_TIMER, otherwise its a sign of something broken in our design with our idle state machine and mac80211. Skip these and WARN once just in case this is triggerable. Cc: Paul Stewart Cc: Amod Bodas signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b7e8941b2df518186d9f7679c007f6b619bb4e89 Author: Amitkumar Karwar Date: Tue Dec 7 13:43:03 2010 -0800 cfg80211: add some element IDs in enum ieee80211_eid 1)WLAN_EID_BSS_COEX_2040 2)WLAN_EID_OVERLAP_BSS_SCAN_PARAM 3)WLAN_EID_EXT_CAPABILITY Signed-off-by: Amitkumar Karwar Signed-off-by: John W. Linville commit 692d2c0fb36c02ad07d54641c26f48e644b27fbd Author: Rafał Miłecki Date: Tue Dec 7 21:56:00 2010 +0100 b43: rename config option for N-PHY, drop BROKEN Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 82a52043c7801f83c7387deb45bf9323af04644b Author: Rafał Miłecki Date: Tue Dec 7 21:55:59 2010 +0100 b43: fix split of N-PHY devices into supported and not (based on PHY rev) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit abc1f7cd531f80a8468ab654f1dfd35d58bd2490 Author: Rafał Miłecki Date: Tue Dec 7 21:55:58 2010 +0100 b43: set TMS to work with current band width for N-PHY Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c7455cf988f06ba578cc6a680392426fce382ca1 Author: Rafał Miłecki Date: Tue Dec 7 21:55:57 2010 +0100 b43: N-PHY: silence warnings Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 2f886750118c1781d3b53268bf25519aef1d4d71 Author: Ben Greear Date: Tue Dec 7 11:27:01 2010 -0800 mac80211: Show max number of probe tries in debug message. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 155180803c95c7b14b355f60431bef45116c151e Author: Rafał Miłecki Date: Tue Dec 7 09:42:07 2010 +0100 b43: flush PHY writes when needed Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 755fd183b89bc8a302669b6f35cd98faee473f7a Author: Rafał Miłecki Date: Tue Dec 7 09:42:06 2010 +0100 b43: N-PHY: implement own maskset This let us avoid double addressing while still having reg check. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit f00fe7f6d14ab7bbd4655f55eae71bbd73ef766d Author: Rafał Miłecki Date: Tue Dec 7 09:42:05 2010 +0100 b43: N-PHY: reorder and optimize tables initialization Order was changed in specs. For writing arrays we have designed bulk function which makes use of auto increment and do not write table address over and over. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 857581bdf1a3b36bfd42609d6f5433bd83397127 Author: Rafał Miłecki Date: Tue Dec 7 09:42:04 2010 +0100 b43: N-PHY: update init tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a9927ba3c5f3c5f6b0e8fa7557452335edeaf5fa Author: Ben Greear Date: Mon Dec 6 21:13:49 2010 -0800 ath9k: Check for NULL sta in ath_tx_start It can be NULL according to docs, and logging showed it to be NULL in practice. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 80d7e403c97b712e302ec37e9beceff1dbdc9402 Author: Helmut Schaa Date: Fri Nov 19 12:40:26 2010 +0100 mac80211: Apply ht_opmode changes in ieee80211_change_bss Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 50b12f597be354a5a224f05c65c54c0667e57aec Author: Helmut Schaa Date: Fri Nov 19 12:40:25 2010 +0100 cfg80211: Add new BSS attribute ht_opmode Add a new BSS attribute to allow hostapd to set the current HT opmode. Otherwise drivers won't be able to set up protection for HT rates in AP mode. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit c277443cfc29b1623b4923219ff0bdb48b91b589 Author: Peter Zijlstra Date: Wed Dec 8 15:29:02 2010 +0100 perf: Stop all counters on reboot Use the reboot notifier to detach all running counters on reboot, this solves a problem with kexec where the new kernel doesn't expect running counters (rightly so). It will however decrease the coverage of the NMI watchdog. Making a kexec specific reboot notifier callback would be best, however that would require touching all notifier callback handlers as they are not properly structured to deal with new state. As a compromise, place the perf reboot notifier at the very last position in the list. Reported-by: Yinghai Lu Signed-off-by: Peter Zijlstra Cc: Vivek Goyal Cc: Eric W. Biederman Cc: Jason Wessel Cc: Don Zickus LKML-Reference: Signed-off-by: Ingo Molnar commit c079c791c5a0627fc7b752d31d72e274e0596ba8 Author: Peter Zijlstra Date: Thu Nov 25 08:56:17 2010 +0100 perf, amd: Remove the nb lock Since all the hotplug stuff is serialized by the hotplug mutex, do away with the amd_nb_lock. Cc: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 40dc11ffb35e8c4e8fa71092048e0f8de9db758c Author: Eric Dumazet Date: Fri Nov 26 17:22:16 2010 +0100 printk: Use this_cpu_{read|write} api on printk_pending __get_cpu_var() is a bit inefficient, lets use __this_cpu_read() and __this_cpu_write() to manipulate printk_pending. printk_needs_cpu(cpu) is called only for the current cpu : Use faster __this_cpu_read(). Remove the redundant unlikely on (cpu_is_offline(cpu)) test: # size kernel/printk.o* text data bss dec hex filename 9942 756 263488 274186 42f0a kernel/printk.o.new 9990 756 263488 274234 42f3a kernel/printk.o.old Signed-off-by: Eric Dumazet Cc: Heiko Carstens Cc: H. Peter Anvin Cc: Christoph Lameter Signed-off-by: Peter Zijlstra LKML-Reference: <1290788536.2855.237.camel@edumazet-laptop> Signed-off-by: Ingo Molnar commit 806c09a7db457be3758e14b1f152761135d89af5 Author: Dario Faggioli Date: Tue Nov 30 19:51:33 2010 +0100 sched: Make pushable_tasks CONFIG_SMP dependant As noted by Peter Zijlstra at https://lkml.org/lkml/2010/11/10/391 (while reviewing other stuff, though), tracking pushable tasks only makes sense on SMP systems. Signed-off-by: Dario Faggioli Acked-by: Steven Rostedt Acked-by: Gregory Haskins Signed-off-by: Peter Zijlstra LKML-Reference: <1291143093.2697.298.camel@Palantir> Signed-off-by: Ingo Molnar commit 8e9255e6a2141e050d51bc4d96dbef494a87d653 Merge: 5091faa 6313e3c Author: Ingo Molnar Date: Wed Dec 8 20:15:26 2010 +0100 Merge branch 'linus' into sched/core Merge reason: we want to queue up dependent cleanup Signed-off-by: Ingo Molnar commit f8bf5681cf15f77692c8ad8cb95d059ff7c622c9 Author: Namhyung Kim Date: Tue Dec 7 04:49:06 2010 +0000 isdn/hisax: fix compiler warning on hisax_pci_tbl Annotate hisax_pci_tbl as '__used' to fix following warning: CC drivers/isdn/hisax/config.o drivers/isdn/hisax/config.c:1920: warning: ‘hisax_pci_tbl’ defined but not used Signed-off-by: Namhyung Kim Signed-off-by: David S. Miller commit 920b8d913bd3d963d5c88bca160a272b71e0c95a Author: Changli Gao Date: Tue Dec 7 05:05:18 2010 +0000 af_packet: fix freeing pg_vec twice on error path It is introduced in: commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit f6dafa95d1a48f73ab4a5b0f7dc0dcb72817e051 Author: Changli Gao Date: Tue Dec 7 04:26:16 2010 +0000 af_packet: eliminate pgv_to_page on some arches Some arches don't need flush_dcache_page(), and don't implement it, so we can eliminate pgv_to_page() calls on those arches. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 15c2d75f49189e1769c5e8f5f099d03d055c4910 Author: Eric Dumazet Date: Tue Dec 7 00:30:37 2010 +0000 net: call dev_queue_xmit_nit() after skb_dst_drop() Avoid some atomic ops on dst refcount, calling dev_queue_xmit_nit() after skb_dst_drop() in dev_hard_start_xmit(). When queueing a packet into af_packet socket, we drop dst anyway. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 62ab0812137ec4f9884dd7de346238841ac03283 Author: Eric Dumazet Date: Mon Dec 6 20:50:09 2010 +0000 filter: constify sk_run_filter() sk_run_filter() doesnt write on skb, change its prototype to reflect this. Fix two af_packet comments. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 38f49e8801565674c424896c3dcb4228410b43a8 Author: Roger Luethi Date: Mon Dec 6 00:59:40 2010 +0000 via-rhine: hardware VLAN support This patch adds VLAN hardware support for Rhine chips. The driver uses up to 3 additional bytes of buffer space when extracting 802.1Q headers; PKT_BUF_SZ should still be sufficient. The initial code was provided by David Lv. I reworked it to use standard kernel facilities. Coding style clean up mostly follows via-velocity. Adapted to new interface for VLAN acceleration (per request of Jesse Gross). Signed-off-by: David Lv Signed-off-by: Roger Luethi drivers/net/via-rhine.c | 326 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 312 insertions(+), 14 deletions(-) Signed-off-by: David S. Miller commit 941666c2e3e0f9f6a1cb5808d02352d445bd702c Author: Eric Dumazet Date: Sun Dec 5 01:23:53 2010 +0000 net: RCU conversion of dev_getbyhwaddr() and arp_ioctl() Le dimanche 05 décembre 2010 à 09:19 +0100, Eric Dumazet a écrit : > Hmm.. > > If somebody can explain why RTNL is held in arp_ioctl() (and therefore > in arp_req_delete()), we might first remove RTNL use in arp_ioctl() so > that your patch can be applied. > > Right now it is not good, because RTNL wont be necessarly held when you > are going to call arp_invalidate() ? While doing this analysis, I found a refcount bug in llc, I'll send a patch for net-2.6 Meanwhile, here is the patch for net-next-2.6 Your patch then can be applied after mine. Thanks [PATCH] net: RCU conversion of dev_getbyhwaddr() and arp_ioctl() dev_getbyhwaddr() was called under RTNL. Rename it to dev_getbyhwaddr_rcu() and change all its caller to now use RCU locking instead of RTNL. Change arp_ioctl() to use RCU instead of RTNL locking. Note: this fix a dev refcount bug in llc Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit a2d4b65d477aad1fe8c7218781a031fa9cf5abfc Merge: 01b0c5c 0491026 Author: David S. Miller Date: Wed Dec 8 10:01:00 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit 01b0c5cfb23f19837650aa53495ace6d0fd7d3f8 Author: Thiago Farina Date: Sat Dec 4 15:22:46 2010 +0000 net/9p/protocol.c: Remove duplicated macros. Use the macros already provided by kernel.h file. Signed-off-by: Thiago Farina Signed-off-by: David S. Miller commit aa9421041128abb4d269ee1dc502ff65fb3b7d69 Author: Changli Gao Date: Sat Dec 4 02:31:41 2010 +0000 net: init ingress queue The dev field of ingress queue is forgot to initialized, then NULL pointer dereference happens in qdisc_alloc(). Move inits of tx queues to netif_alloc_netdev_queues(). Signed-off-by: Changli Gao Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit a1044e36e457fb6dbdf90ce756d578b251d99b5e Author: Oliver Hartkopp Date: Thu Dec 2 10:57:59 2010 +0000 can: add slcan driver for serial/USB-serial CAN adapters This patch adds support for serial/USB-serial CAN adapters implementing the LAWICEL ASCII protocol for CAN frame transport over serial lines. The driver implements the SLCAN line discipline and is heavily based on the slip.c driver. Therefore the code style remains similar to slip.c to be able to apply changes of the SLIP driver to the SLCAN driver easily. For more details see the slcan Kconfig entry. Signed-off-by: Oliver Hartkopp Signed-off-by: David S. Miller commit 58e481f66e31e9976558f3e4f709baf9201052fe Author: Andy Shevchenko Date: Thu Dec 2 02:45:08 2010 +0000 atm: lanai: use kernel's '%pM' format option to print MAC Signed-off-by: Andy Shevchenko Cc: Chas Williams Cc: linux-atm-general@lists.sourceforge.net Signed-off-by: David S. Miller commit 146fd574ec06b1c593805738b1c2c8c5a4128681 Author: Uk Kim Date: Tue Dec 7 13:58:40 2010 +0000 ASoC: Add ADC high pass filter support to WM8994 Signed-off-by: Uk Kim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 28257f7fdee0facc3b7f934e82c2485f27120d41 Author: Russell King Date: Wed Dec 8 13:57:48 2010 +0000 ARM: io: simplify ioremap* and iounmap definitions We don't need to repeat the same definitions of the ioremap*(), once in terms of __arch_ioremap() and again in terms of __arm_ioremap(). Instead, if the platform hasn't provided an __arch_ioremap, define this to be __arm_ioremap, and only define the ioremap*() set using __arch_ioremap. Signed-off-by: Russell King commit a0b7bd0829194c03921915a68ee4a331ee394223 Author: Russell King Date: Wed Dec 8 13:49:04 2010 +0000 ARM: io: make iounmap() a simple macro Defining iounmap() with arguments prevents it from being used as a function pointer, causing platforms to work around this. Instead, define it to be a simple macro. Do the same for __arch_io(re|un)map too. Signed-off-by: Russell King commit b1e43d933a3f1183e15d91b1737ecafb7de153eb Author: Mark Brown Date: Tue Dec 7 17:14:56 2010 +0000 ASoC: Support WM8994 mono AIF configurations The WM8994 supports mono signals - enable this in the driver. With DSP mode an automatic data channel selector is available, activate this when in mono mode. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit e4f078d8c0790e94e09af975ca0b870e2f050e17 Author: Dimitris Papastamos Date: Tue Dec 7 16:30:38 2010 +0000 ASoC: soc-core: Fix null pointer dereference In case the codec driver did not provide a read/write function, codec->driver->read|write will be NULL. Ensure that we use the one specified in codec->read|write to avoid oopsing when we access the debugfs entries. This is achieved by using snd_soc_read() and snd_soc_write(). Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5a4cfce73b7b48bdbb4e816124e5fcf84bc58e59 Merge: 6b3ed78 2a7b1a0 Author: Mark Brown Date: Wed Dec 8 13:54:33 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 Conflicts: sound/soc/soc-core.c Axel's fix on two different branches. commit 5bea7660bba973dc5e8e9d92b11fb1dd5b524ebf Author: Dmitry Torokhov Date: Tue Dec 7 23:02:48 2010 -0800 HID: add hid_hw_open/close/power() handlers Instead of exposing the guts of hid->ll_driver relationship to HID sub-drivers provide these helpers to encapsulate the details. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 20e218a77fc0b0576817b6b204fe5b9391a5b209 Author: Rabin Vincent Date: Wed Dec 8 17:18:46 2010 +0530 ux500: fix 5500 PER6 clock rate The DB5500 PER6 clock rate is the same as the DB8500 one, i.e. 133.33 MHz. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 22039b7cc54a636f80434e9b149fcdec148c4cb9 Author: Rabin Vincent Date: Wed Dec 8 11:07:56 2010 +0530 ux500: remove ambiguous irq macros Remove the irq number macros which don't specify which SoC they're for. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 01afdd1353ca83904f430be4f6202d1a20912f4d Author: Rabin Vincent Date: Wed Dec 8 11:07:55 2010 +0530 ux500: rework gpio registration Rework gpio registration to remove build-time changing macros. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 8d568ae5362c00c5b0b8e61bceb1829c8051002e Author: Rabin Vincent Date: Wed Dec 8 11:07:54 2010 +0530 nomadik-gpio: use dev name if no name is specified Platforms may choose not to provide an additional name for the GPIO block. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit ec4a637d35d4e05d1f43a68d647fb2453891379a Author: Carl-Johan Irekvist Date: Wed Dec 8 11:07:53 2010 +0530 ux500: fix uncompressor UART address for U5500 The uncompress code for zImage uses the UART to print status messages, this was hard coded to use UART2 for the U8500 platform. This patch checks at run time which platform it is run on. U5500 uses UART0 as console UART. Signed-off-by: Carl-Johan Irekvist Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit e8b1cc3a341684dfc02fd02f52308752b031668c Author: Per Forlin Date: Sun Dec 5 13:35:12 2010 +0100 ux500: Add DMA support for U5500 Add basic DMA configuration for u5500 supporting memcpy. Make way for SDI0 dma support by setting SDI0 to -1, indicating it will be configured in runtime. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit bab263e0ce624b05bdcf568e83a9ca4ce71f5e3d Author: Per Forlin Date: Sun Dec 5 12:49:03 2010 +0100 ux500: Add eMMC support in U5500. U5500 now boots from sdi0 (onboard eMMC). Change machine type to U5500. Adjust uart and sdi0 clock rates for u5500. All necessary clocks must be enabled before Linux starts because there is no clock tree support in u5500 yet. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit 9b04f8b9070e60fe9d335613ec538223c159a5c9 Author: Per Forlin Date: Sun Dec 5 12:27:05 2010 +0100 ux500: Call prmcu_init only for u8500 PRCMU driver only supports u8500. Don't initialize prcmu if running on u5500. Signed-off-by: Per Forlin Signed-off-by: Linus Walleij commit 592b2f254d68b6eb8665658cc7d8fc3cd61ebc94 Author: Sundar Iyer Date: Fri Dec 3 20:35:52 2010 +0530 mach-ux500: clean up checkpatch spits Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit f306954c9b69aa21bd26724c59ac8c98b7d6e003 Author: Sundar Iyer Date: Fri Dec 3 20:35:51 2010 +0530 mach-ux500: explicit enable MTU TCR in the kernel PRCM_TCR enables the various timers in the system. This must be achieved before any of the MTUs are usable for kernel usage. Explicit enabling of this in the kernel makes it independent of bootloader actions. Signed-off-by: Sundar Iyer Signed-off-by: Linus Walleij commit dacdc96cd33dee876c704aaed78f41515abe8a81 Author: Rabin Vincent Date: Fri Dec 3 20:35:37 2010 +0530 nomadik-gpio: allow sleep mode dir/pull to differ from normal mode In the nomadik GPIO pin configuration, allow the sleep mode direction and pull configurations to differ from the ones for the normal state. PIN_SLPM_PULL_*, PIN_SLPM_INPUT, PIN_SLPM_OUTPUT* macros are provided for this. Since the hardware does not allow seperate configurations for sleep mode and normal mode, this is implemented by having software remux the configurations as necessary. Reviewed-by: Srinidhi KASAGAR Signed-off-by: Rabin Vincent Signed-off-by: Mian Yousaf Kaukab Signed-off-by: Linus Walleij commit edaa86a4142474c99e4741efb6a916067978a1ee Author: Linus Walleij Date: Thu Dec 2 12:05:18 2010 +0100 ux500: minor revision to the eMMC/SD config A small fixup for the v1(.0) ASIC. Signed-off-by: Linus Walleij commit a5de3dc240eb4e58f02b199ed529c17b65f9adfb Author: Mattias Wallin Date: Thu Dec 2 13:46:00 2010 +0100 mach-ux500: AB8500 irqs is taken from header file This patch removes the dublicated define for number of interrupts and instead include the needed header file. Signed-off-by: Mattias Wallin Signed-off-by: Linus Walleij commit fcbd458e95316fe5031f1b8eaf5e66ce8f3c3146 Author: Mattias Wallin Date: Thu Dec 2 16:20:42 2010 +0100 ARM: ux500: prcmu db8500 v2 support This patch adds support for db8500 chip version 2. The TCDM memory address of the PRCMU is changed and dynamic detection of that is added. Signed-off-by: Mattias Wallin Acked-by: Linus Walleij commit fbf1eadf950da1f5f5ed2e454d2f191f90fe1ebe Author: Rabin Vincent Date: Wed Sep 29 19:46:32 2010 +0530 ux500: rework device registration Change the Ux500 devices to be dynamically allocated and added by calling functions instead of referencing structures, thereby allowing 5500 and other derivatives' support to be added without having to duplicate structures, use fixup functions, or use compile-time macros. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 1bde668c8afa279d81b8f26b2120b906f38f7822 Author: Linus Walleij Date: Thu Sep 9 22:29:34 2010 +0200 ux500: use _cansleep GPIO functions Similar to the patch to MMCI this silences similar messages from the platform code. Signed-off-by: Linus Walleij commit b8410a150fbc4e61a28032637dc0ae7e8609131d Author: Rabin Vincent Date: Mon Aug 9 19:18:17 2010 +0530 ux500: mop500: add TC35892 and MicroSD slot support Acked-by: Linus Walleij Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij commit 85140ad591e696bc88b0ad7c978256f91099e6c9 Author: Changhwan Youn Date: Mon Nov 29 17:05:16 2010 +0900 ARM: S5PV310: Add irq_mask to handle combiner irqs properly The 4 combiner groups use same registers to handle the interrupt. In previous implementation, the whole registers are checked to find which interupt is occurred and thus interrupt in other groups can be detected. This patch adds irq_mask to solve this problem. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit 1f2d6c49f087c84ed54ad3e0801faeca3e2ccfdd Author: Changhwan Youn Date: Mon Nov 29 17:04:46 2010 +0900 ARM: S5PV310: Limit the irqs which support cascade interrupt The irqs from SPI(0) to SPI(39) and SPI(51), SPI(53) are connected to the interrupt combiner. This patch limits the irqs which should be initialized to support cascade interrupt. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit b45756f65d90dca10cbe3e9ef04ecf96c01124a2 Author: Changhwan Youn Date: Mon Nov 29 16:58:29 2010 +0900 ARM: S5PV310: Add Interrupt of MCT This patch adds IRQ_MCT0, IRQ_MCT1, IRQ_MCT_L0, and IRQ_MCT_L1. (MCT: Multi-Core Timer). And updated MAX_COMBINER_NR. Signed-off-by: Changhwan Youn Signed-off-by: Kukjin Kim commit 116dcde638065a6b94344ca570e1e79c8e857826 Author: David Henningsson Date: Tue Nov 23 10:23:40 2010 +0100 ALSA: HDA: Remove unconnected PCM devices for Intel HDMI Some newer chips have more than one HDMI output, but usually not all of them are exposed as physical jacks. Removing the unused PCM devices (as indicated by BIOS in the pin config default) will reduce user confusion as they currently have to choose between several HDMI devices, some of them not working anyway. Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit d0fa15e0987bb5444244db111d485fb8819ceba5 Merge: 36e9c13 0bbaee3 Author: Takashi Iwai Date: Wed Dec 8 09:07:38 2010 +0100 Merge branch 'fix/hda' into topic/hda commit 54b384634f7083bcacf9a9ed2e6f4c3d0a246e49 Author: Simon Horman Date: Mon Dec 6 00:12:45 2010 +0000 mmc, sh: Remove sh_mmcif_boot_slurp() As the only caller of sh_mmcif_boot_do_read() is sh_mmcif_boot_slurp() the configuration portion of sh_mmcif_boot_slurp() can be merged into sh_mmcif_boot_do_read(). Once this is done sh_mmcif_boot_slurp() is only a call to sh_mmcif_boot_do_read() with platform specific information - the offset that images are stored on MMC. So make the sh_mmcif_boot_do_read() call directly from platform code and remove sh_mmcif_boot_slurp() altogether. Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 9f843706bb87837b823228467f4f83973fd110e9 Author: Simon Horman Date: Mon Dec 6 00:12:44 2010 +0000 mmc, sh: Move MMCIF_PROGRESS_* into sh_mmcif.h Allow MMCIF_PROGRESS_* to be shared. Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 80f1dc7cc9341b160beb9c833edc1cd131f45a7f Author: Tony SIM Date: Tue Dec 7 09:12:14 2010 +0000 ARM: mach-shmobile: mackerel: Add Accelerometer sensor support Signed-off-by: Tony SIM Signed-off-by: Paul Mundt commit 507cad355fc9e426f2846c46a4edca2d22d25f44 Author: Miloslav Trmač Date: Wed Dec 8 14:36:19 2010 +0800 crypto: af_alg - Make sure sk_security is initialized on accept()ed sockets Signed-off-by: Miloslav Trmač Signed-off-by: Herbert Xu commit 6f107b5861ecb09abfa7e2f9927e3884d1d81f91 Author: Miloslav Trmač Date: Wed Dec 8 14:35:34 2010 +0800 net: Add missing lockdep class names for af_alg Signed-off-by: Miloslav Trmač Signed-off-by: Herbert Xu commit 356c6f654d1c03e2ae45ef58b267e83dfd1a17f2 Author: Dmitry Torokhov Date: Tue Dec 7 22:11:09 2010 -0800 Input: cma3000_d0x_i2c - add MODULE_DEVICE_TABLE This should allow loading this module automatically on systems that have such device. Signed-off-by: Dmitry Torokhov commit fd70b6cd780742b97f525415bf5e4fb24a4bb6d8 Author: Francisco Jerez Date: Wed Dec 8 02:37:12 2010 +0100 drm/nv04-nv40: Fix up PCI(E) GART DMA object bus address calculation. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit b8a3d6bcbc85d7636d9f2adede8479ce2999c232 Author: Tony SIM Date: Tue Dec 7 02:54:00 2010 -0800 Input: tca6416-keypad - add support for tca6408a Support 8-bit tca6408a I/O expander as a keypad. Signed-off-by: Tony SIM Signed-off-by: Dmitry Torokhov commit 60d2a88ae896ae51c76f8b15c2f4b762d5b00864 Author: Ben Skeggs Date: Mon Dec 6 15:28:54 2010 +1000 drm/nouveau: kick vram functions out into an "engine" NVC0 will be able to share some of nv50's paths this way. This also makes it the card-specific vram code responsible for deciding if a given set of tile_flags is valid, rather than duplicating the allowed types in nv50_vram.c and nouveau_gem.c Signed-off-by: Ben Skeggs commit 34cf01bc4b8021cef62cbd79224577c13d01b106 Author: Ben Skeggs Date: Mon Nov 22 10:48:51 2010 +1000 drm/nouveau: allow gpuobj vinst to be a virtual address when necessary Signed-off-by: Ben Skeggs commit b571fe21f5c24760368b3fb927af5a7384d7721b Author: Ben Skeggs Date: Tue Nov 16 10:13:05 2010 +1000 drm/nv50: tidy up PCIEGART implementation Signed-off-by: Ben Skeggs commit 5f6fdca570b13a8a2c9cab9ab6edfc17487049cf Author: Ben Skeggs Date: Fri Nov 12 15:13:59 2010 +1000 drm/nv50: enable non-contig vram allocations where requested Signed-off-by: Ben Skeggs commit bfd83aca5a1c4cc07fb18d96ed8660f2c338a8f3 Author: Ben Skeggs Date: Fri Nov 12 15:12:51 2010 +1000 drm/nv50: enable 4KiB pages for small vram allocations Signed-off-by: Ben Skeggs commit 4c1361429841344ce4d164492ee7620cf3286eb7 Author: Ben Skeggs Date: Mon Nov 15 11:54:21 2010 +1000 drm/nv50: implement global channel address space on new VM code As of this commit, it's guaranteed that if an object is in VRAM that its GPU virtual address will be constant. Signed-off-by: Ben Skeggs commit f869ef882382a4b6cb42d259e399aeec3781d4bb Author: Ben Skeggs Date: Mon Nov 15 11:53:16 2010 +1000 drm/nv50: implement BAR1/BAR3 management on top of new VM code Signed-off-by: Ben Skeggs commit a11c3198c9ba38d81e25b65e3908d531feba1372 Author: Ben Skeggs Date: Fri Aug 27 10:00:25 2010 +1000 drm/nv50: import new vm code Signed-off-by: Ben Skeggs commit 573a2a37e8648a3249426c816f51e7ef50f6f73e Author: Ben Skeggs Date: Wed Aug 25 15:26:04 2010 +1000 drm/nv50: implement custom vram mm This is required on nv50 as we need to be able to have more precise control over physical VRAM allocations to avoid buffer corruption when using buffers of mixed memory types. This removes some nasty overallocation/alignment that we were previously using to "control" this problem. Signed-off-by: Ben Skeggs commit 937c3471cc8b7ef8f9e382d9e4ec232db151ea7b Author: Francisco Jerez Date: Wed Dec 8 02:35:45 2010 +0100 drm/nouveau: Avoid potential race between nouveau_fence_update() and context takedown. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit a8b214f007e299225d3fcf10c46f7fc603c275fa Author: Ben Skeggs Date: Fri Dec 3 09:05:20 2010 +1000 drm/nouveau: fix use of drm_mm_node in semaphore object At some point in the future, this bo won't necessarily be backed by a drm_mm_node, so use the start/size fields of the ttm_mem_reg instead. Signed-off-by: Ben Skeggs commit 7a45d764a8e3177f0c9cd4a0be9f2ab7965e55cb Author: Ben Skeggs Date: Mon Nov 22 08:50:27 2010 +1000 drm/nouveau: wrap calls to ttm_bo_validate() This will be used later to fixup bo.offset with a buffer's fixed GPU virtual address. Signed-off-by: Ben Skeggs commit a0fd9b9f68cd7a5952eae3c5b3c5a3bc0eadfd44 Author: Ben Skeggs Date: Fri Nov 26 10:32:22 2010 +1000 drm/nouveau: no need to zero dma objects, we fill them completely anyway Signed-off-by: Ben Skeggs commit 12fb9525075982bc65cfd71427dd7afdf47bafed Author: Ben Skeggs Date: Fri Nov 19 14:32:56 2010 +1000 drm/nouveau: introduce a util function to wait on reg != val Signed-off-by: Ben Skeggs commit ceac30999dfb00ee7b56cfea8b28ef50999a3c95 Author: Ben Skeggs Date: Tue Nov 23 10:10:24 2010 +1000 drm/nouveau: implicitly insert non-DMA objects into RAMHT Signed-off-by: Ben Skeggs commit d908175cca901b95ba1628428b216e6e7188e8fb Author: Ben Skeggs Date: Mon Nov 22 16:05:54 2010 +1000 drm/nouveau: make fifo.create_context() responsible for mapping control regs The regs belong to PFIFO, they're different for pretty much the same generations we need different PFIFO control for, and NVC0 is going to be even more different than the rest. Signed-off-by: Ben Skeggs commit 395a31ec7ed9b02c5412f4405acbd6fceacca0fc Author: Francisco Jerez Date: Thu Nov 25 16:37:17 2010 +0100 drm/nouveau: Spin for a bit in nouveau_fence_wait() before yielding the CPU. Sleeping doesn't pay off for very short delays in comparison with the minimum granularity of schedule_timeout(). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit a3d487ea5463a9c091b7f9b836b860cf3d82e641 Author: Francisco Jerez Date: Sat Nov 20 22:11:22 2010 +0100 drm/nouveau: Use WC memory on the AGP GART. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 6dccd311dd4b104b3bc53cb67aef414141d11c9f Author: Francisco Jerez Date: Thu Nov 18 23:57:46 2010 +0100 drm/nouveau: Synchronize with the user channel before GPU object destruction. There have been reports of PFIFO cache errors during context take down (fdo bug 31637). They are caused by some GPU objects being taken out while the channel is still potentially processing commands. Make sure that all the previous rendering has landed before releasing a GPU object. Reported-by: Grzesiek Sójka Reported-by: Patrice Mandin Signed-off-by: Francisco Jerez Acked-by: Ben Skeggs Signed-off-by: Ben Skeggs commit 38cf189fa13e988f85efb6de26315e762cecc260 Author: Francisco Jerez Date: Sat Nov 20 14:43:51 2010 +0100 drm/nv04-nv10: Don't re-enable FIFO access multiple times after IRQ dispatch. nvxx_graph_isr is already taking care of it. In some cases this could've made you miss PGRAPH interrupts (e.g. when you were supposed to get several IRQs of the same kind in a row). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit ca130c2267d0719c92ed188e15082d6baad6c046 Author: Francisco Jerez Date: Sat Nov 20 14:42:57 2010 +0100 drm/nv04-nv40: Give "gpuobj->cinst" the same meaning as on nv50. No functional changes, just simplify some code paths a bit. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 0a4bbddde29c038f2c51a7abb03d6d07e679d8af Merge: c989a7f e2c8e42 0be035f Author: Dan Williams Date: Tue Dec 7 17:10:52 2010 -0800 Merge branches 'fsldma' and 'intel-mid' into dmaengine commit a40c406cbdd28dcca3483065bc2ba794cf5aaab7 Author: Johan Hedberg Date: Wed Dec 8 00:21:07 2010 +0200 Bluetooth: Make hci_send_to_sock usable for management control sockets In order to send data to management control sockets the function should: - skip checks intended for raw HCI data and stack internal events - make sure RAW HCI data or stack internal events don't go to management control sockets In order to accomplish this the patch adds a new member to the bluetooth skb private data to flag skb's that are destined for management control sockets. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 0381101fd6a73c7d6b545044dc1472d019fc64e3 Author: Johan Hedberg Date: Wed Dec 8 00:21:06 2010 +0200 Bluetooth: Add initial Bluetooth Management interface callbacks Add initial code for handling Bluetooth Management interface messages. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Acked-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit c02178d22b3ef2d18c38c96151600ee1c7ed94f0 Author: Johan Hedberg Date: Wed Dec 8 00:21:05 2010 +0200 Bluetooth: Add Bluetooth Management interface definitions Add initial definitions for the new Bluetooth Management interface to the bluetooth headers. Signed-off-by: Johan Hedberg Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 5de62b86d2f5cf3459cb02ecb7a4530787bbd898 Author: Tony Lindgren Date: Tue Dec 7 16:26:58 2010 -0800 omap1: Fix gpio mpuio bank to work for multi-omap for 7xx/15xx/16xx We need to divide the 15xx/16xx offset by 2 for 7xx. Use bank->stride for that. This allows us to get rid of the duplicate defines for the MPUIO registers. Note that this will cause omap-keypad.c driver to not work on 7xx. However, the right fix there is to move over to matrix_keypad instead as suggested by Cory Maccarrone and Janusz Krzysztofik . Cc: Cory Maccarrone Acked-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit 77640aabd7558e43b65bc1a0311be2dbb42c3ff8 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP: GPIO: Implement GPIO as a platform device Implement GPIO as a platform device. GPIO APIs are used in machine_init functions. Hence it is required to complete GPIO probe before board_init. Therefore GPIO device register and driver register are implemented as postcore_initcalls. omap_gpio_init() does nothing now and this function would be removed in the next patch as it's usage is spread across most of the board files. Inorder to convert GPIO as platform device, modifications are required in clockxxxx_data.c file for OMAP1 so that device names can be used to obtain clock instead of getting clocks by name/NULL ptr. Use runtime pm APIs (pm_runtime_put*/pm_runtime_get*) for enabling or disabling the clocks, modify sysconfig settings and remove usage of clock FW APIs. Note 1: Converting GPIO driver to use runtime PM APIs is not done as a separate patch because GPIO clock names are different for various OMAPs and are different for some of the banks in the same CPU. This would need usage of cpu_is checks and bank id checks while using clock FW APIs in the gpio driver. Hence while making GPIO a platform driver framework, PM runtime APIs are used directly. Note 2: While implementing GPIO as a platform device, pm runtime APIs are used as mentioned above and modification is not done in gpio's prepare for idle/ resume after idle functions. This would be done in the next patch series and GPIO driver would be made to use dev_pm_ops instead of sysdev_class in that series only. Due to the above, the GPIO driver implicitly relies on CM_AUTOIDLE = 1 on its iclk for power management to work, since the driver never disables its iclk. This would be taken care in the next patch series (see Note 3 below). Refer to http://www.mail-archive.com/linux-omap@vger.kernel.org/msg39112.html for more details. Note 3: only pm_runtime_get_sync is called in gpio's probe() and pm_runtime_put* is never called. This is to make the implementation similar to the existing GPIO code. Another patch series would be sent to correct this. In OMAP3 and OMAP4 gpio's debounce clocks are optional clocks. They are enabled/ disabled whenever required using clock framework APIs TODO: 1. Cleanup the GPIO driver. Use function pointers and register offest pointers instead of using hardcoded values 2. Remove all cpu_is_ checks and OMAP specific macros 3. Remove usage of gpio_bank array so that only instance specific information is used in driver code 4. Rename 'method'/ avoid it's usage 5. Fix the non-wakeup gpios handling for OMAP2430, OMAP3 & OMAP4 6. Modify gpio's prepare for idle/ resume after idle functions to use runtime pm implentation. Signed-off-by: Charulatha V Signed-off-by: Rajendra Nayak Reviewed-by: Basak, Partha Acked-by: Kevin Hilman [tony@atomide.com: updated for bank specific revision and updated boards] Signed-off-by: Tony Lindgren commit f547170fe721f145b7b7d6eb8b252e45f489dc4b Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP2+: GPIO: device registration Use omap_device_build() API to do platform_device_register of GPIO devices. For OMAP2+ chips, the device specific data defined in the centralized hwmod database will be used. gpio_init needs to be done before machine_init functions access gpio APIs. Hence gpio_init is made as a postcore_initcall. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Reviewed-by: Basak, Partha Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9780a9cfa7b1f913d5f7099290e77b381a8b01d5 Author: Benoit Cousson Date: Tue Dec 7 16:26:57 2010 -0800 OMAP4: hwmod data: Add GPIO Add GPIO hwmod data for OMAP4 Signed-off-by: Benoit Cousson Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 70034d38fbfd0f98a49367d36aa72f776a9e663a Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:57 2010 -0800 OMAP3: hwmod data: Add GPIO Add GPIO hwmod data for OMAP3 Also remove "omap34xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Signed-off-by: Rajendra Nayak Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit aeac0e441045974757e901b46719980a98c270a5 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP2430: hwmod data: Add GPIO Add GPIO hwmod data for OMAP2430 Also remove "omap24xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 59c348c38fbe85e6e86c711b9a38c37315008d9e Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP2420: hwmod data: Add GPIO Add GPIO hwmod data for OMAP2420 and add the required GPIO device attributes in the gpio header file Also remove "omap24xx.h" header file as it is not required anymore. Signed-off-by: Charulatha V Acked-by: Benoit Cousson Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9d52342c27b7b43c4a7b24bac24ff7bee0b80e07 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP7xx: GPIO: Introduce support for GPIO init Add support for handling OMAP7xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 87fe6229c75a2ca1ebfa1e9e937cba2535e961a8 Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP16xx: GPIO: Introduce support for GPIO init Add support for handling OMAP16xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit c95d10bc49d50a9bc0f63a6eae79bb2707dabfdc Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:56 2010 -0800 OMAP15xx: GPIO: Introduce support for GPIO init Add support for handling OMAP15xx specific gpio_init by providing platform device data and doing device registration. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 9a748053f5f58a77cd71864f1d7b804175b0e47d Author: Tony Lindgren Date: Tue Dec 7 16:26:56 2010 -0800 OMAP: GPIO: Make omap_gpio_show_rev bank specific Otherwise GPIO init on 16xx may try to access uninitialized GPIO bank as the MPUIO bank does not have a revision register. Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 2fae7fbed072705d91e09ed393b2e580b2d895fc Author: Varadarajan, Charulatha Date: Tue Dec 7 16:26:55 2010 -0800 OMAP: GPIO: prepare for platform driver Prepare for implementing GPIO as a platform driver. Modifies omap_gpio_init() to make use of omap_gpio_chip_init() and omap_gpio_mod_init(). omap_gpio_mod_init() does the module init by clearing the status register and initializing the GPIO control register. omap_gpio_chip_init() initializes the chip request, free, get, set and other function pointers and sets the gpio irq handler. This is only to reorganize the code so that the "omap gpio platform driver implementation patch" looks cleaner and better to review. Signed-off-by: Charulatha V Acked-by: Kevin Hilman Signed-off-by: Tony Lindgren commit c2cdaffe0bb32015e84af8e31f73e620ba271165 Author: Tony Lindgren Date: Tue Dec 7 16:26:55 2010 -0800 omap: Fix gpio_request calls to happen as arch_initcall Looks like some boards are calling gpio_request from init_irq. This will make the request_irq fail, as GPIO will be initialized as postcore_initcall. Reported-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 7b045c96cd1405597a6a2e98bc53a4ac01d835b1 Author: Tony Lindgren Date: Tue Dec 7 16:25:41 2010 -0800 omap: Don't select mux by default for each board This should be only selected in CONFIG_ARCH_OMAP2PLUS_TYPICAL to make it easy to disable. Signed-off-by: Tony Lindgren commit 6722a7238d062b747fc03b35d3371b935bcc965d Author: Shubhrajyoti D Date: Tue Dec 7 16:25:41 2010 -0800 omap: McBSP: Make the free variable update more readable Using true/false instead of 1/0 to update the free variable. Signed-off-by: Shubhrajyoti D Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 5f3b7284cb35c9e3eead279cb35f017b9735bb43 Author: Jarkko Nikula Date: Tue Dec 7 16:25:40 2010 -0800 omap: McBSP: Fix potential memory leak in omap_mcbsp_remove Function omap_mcbsp_probe allocates struct omap_mcbsp *mcbsp but it is not freed in omap_mcbsp_remove. Fix this, remove unneeded structure cleanups and clk_disable calls since they are not needed here. This is not problem currently but becomes if the mcbsp driver is ever modularized. Signed-off-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit b1cc4c55c69efed3ebbb2a13e4c77a2a1a4a6bc9 Author: Evgeny Kuznetsov Date: Tue Dec 7 16:25:40 2010 -0800 omap: Ptr "isr_reg" tracked as NULL was dereferenced Value of "isr_reg" pointer is depend on configuration and GPIO method. Potentially it may have NULL value and it is dereferenced later in code. Warning and exit from function are added in this case. Signed-off-by: Evgeny Kuznetsov Signed-off-by: Tony Lindgren commit be40f7a3d7b53c1a44e11b376b4a395d6b91f58d Author: Tony Lindgren Date: Tue Dec 7 16:25:40 2010 -0800 omap: Fix undefined reference to omap2_i2c_mux_pins In some cases we can get error function `omap2_i2c_add_bus': arch/arm/plat-omap/i2c.c:136: undefined reference to `omap2_i2c_mux_pins' arch/arm/plat-omap/i2c.c:141: undefined reference to `omap_hwmod_lookup' arch/arm/plat-omap/i2c.c:157: undefined reference to `omap_device_build' Signed-off-by: Tony Lindgren commit c57802706aad9f179f2219415717896b3c177845 Author: Chris Wilson Date: Tue Dec 7 23:04:14 2010 +0000 drm/i915: Disable renderctx powersaving support for Ironlake ... still causes a failure during suspend. Reported-by: Daniel Vetter Signed-off-by: Chris Wilson commit 1a1c69762a14f50dd574a9cbabbfa1b1542f580e Merge: 0be7328 1b39d6f Author: Chris Wilson Date: Tue Dec 7 23:00:20 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_dp.c commit 00b4ade1f1968b55bb57a91c1f09a40fc33f72a0 Author: Paul Walmsley Date: Tue Dec 7 04:30:57 2010 +0000 OMAP1: I2C: fix device initialization Commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 ("OMAP: I2C: split device registration and convert OMAP2+ to omap_device") broke I2C on OMAP1. The following messages appear at boot: i2c_omap i2c_omap.1: failure requesting irq 0 i2c_omap: probe of i2c_omap.1 failed with error -22 Investigation revealed that a chunk of code is missing from the original plat-omap/i2c.c file which configured the IRQ and base address for the I2C block on OMAP1. Upon adding this back, the OMAP1 I2C block seems to initialize correctly. Thanks to Cory Maccarrone for reporting the bug, and apologies for the breakage. Signed-off-by: Paul Walmsley Cc: Janusz Krzysztofik Tested-by: Cory Maccarrone Signed-off-by: Tony Lindgren commit 7659a193f94c0003dd06e9e874d19bade1a8c952 Author: Javier Cardona Date: Tue Dec 7 10:41:47 2010 -0800 mac80211: Fix compilation error when mesh is disabled Wrap mesh sections inside CONFIG_MAC80211_MESH to fix compilation problems reported by Stephen Rothwell, Larry Finger and Bruno Randolf. Signed-off-by: John W. Linville commit cae6b74d907e2abd22d496fe30417b088d3302cf Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 21:23:16 2010 +0530 ath9k: Remove dead code in recv.c The structure struct ieee80211_rx_status *rxs is no longer needed to be passed to ath_rx_send_to_mac80211 function Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 0ce3bcfc84900a64347b0fe1140229bd81314008 Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 21:14:15 2010 +0530 ath9k: Parse DTIM period from mac80211 With the current save power save implementation we assume a dtim period of 1.This value is assigned based on a sanity check in the driver eventhough we had not parsed it from mac80211.This patch obtains the actual DTIM period from AP by parsing it from mac80211.Yet for handling multicast traffic we may still have it as fixed rather than parsing it from mac80211 .This does not breaks power save or anything as the sleep duration is currently fixed in the driver.This patch may serve to improve power save in the future by using dtim period for sleep duration and using correct dtim period adhoc mode. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit aaef24b4c9f5db726e618977b74ffef924360de5 Author: Mohammed Shafi Shajakhan Date: Tue Dec 7 20:40:58 2010 +0530 ath9k: Properly use unlikely check macro AUTOSLEEP feature is enabled only for AR9271 and AR9003 version chipsets.So unlikely macro should be used only to check whether auto-sleep feature is enabled Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit caa0a99acd2c4eb0a8d4e9caae397291e4cf743a Author: Sujith Manoharan Date: Tue Dec 7 16:32:02 2010 +0530 ath9k_htc: Fix panic on FW download failure Use the correct error condition exit in case firmware download fails for some reason. Not doing so results in a panic: usb 1-3: ath9k_htc: Transferred FW: ar9271.fw, size: 51280 usb 1-3: ath9k_htc: Firmware - ar9271.fw download failed usb 1-3: ath9k_htc: Target is unresponsive Failed to initialize the device INFO: trying to register non-static key. the code is fine but needs lockdep annotation. turning off the locking correctness validator. Pid: 2823, comm: insmod Tainted: G W 2.6.37-rc4-wl #11 Call Trace: [] __lock_acquire+0xe3e/0x1d00 [] ? restore_args+0x0/0x30 [] ? vprintk+0x321/0x500 [] lock_acquire+0xa0/0x190 [] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] _raw_spin_lock_irq+0x48/0x60 [] ? usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] ? printk+0x3c/0x3f [] usb_kill_anchored_urbs+0x1c/0x80 [usbcore] [] ath9k_hif_usb_dealloc_urbs+0x18/0x40 [ath9k_htc] [] ath9k_hif_usb_probe+0x227/0x3d0 [ath9k_htc] [] usb_probe_interface+0x10c/0x210 [usbcore] [] driver_probe_device+0x96/0x1c0 [] __driver_attach+0xa3/0xb0 [] ? __driver_attach+0x0/0xb0 [] bus_for_each_dev+0x5e/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0x168/0x320 [] driver_register+0x71/0x140 [] ? __raw_spin_lock_init+0x38/0x70 [] usb_register_driver+0xdc/0x190 [usbcore] [] ? ath9k_htc_init+0x0/0x4f [ath9k_htc] [] ath9k_hif_usb_init+0x1e/0x20 [ath9k_htc] [] ath9k_htc_init+0x2b/0x4f [ath9k_htc] [] do_one_initcall+0x3f/0x180 [] sys_init_module+0xbb/0x200 [] system_call_fastpath+0x16/0x1b Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 692d6b175b392512881ab374567e900fc825d487 Author: Sujith Manoharan Date: Tue Dec 7 16:31:54 2010 +0530 ath9k_htc: Add support for handling TX power configuration Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit 0b5ead91cda63e0db964dadc77601233434f60cb Author: Sujith Manoharan Date: Tue Dec 7 16:31:38 2010 +0530 ath9k_htc: Cleanup device identification ath.ko is a common module shared between ath5k, ar9170usb, ath9k and ath9k_htc. Adding driver specific data to the shared structure would impact all the drivers. Handling USB device recognition for devices specific to ath9k_htc can be handled within the driver itself. Also, AR7010 refers to the processor used in both AR9280/AR9287 based devices. Rename the device enumerations accordingly. While at it, check properly for the bus type when choosing the EEPROM base address for UB95. Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit c658e5db01117bf2a321a9a782754dd5b10e2f15 Author: Felix Fietkau Date: Tue Dec 7 04:40:18 2010 +0100 mac80211: fix a compiler warning net/mac80211/mlme.c: In function 'ieee80211_sta_work': net/mac80211/mlme.c:1981: warning: too many arguments for format Introduced by commit 04ac3c0ee2c773c321ec472d892635a20556f34d ("mac80211: speed up AP probing using nullfunc frames"). Reported-by: Stephen Rothwell Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 22d8d9f81b8b054df2f7f82daffcb71608f411e4 Author: Bruno Randolf Date: Tue Dec 7 11:08:12 2010 +0900 ath5k: Use capabilities information for the number of TX queues One thing I missed in my WME series: Older hardware does not have enough hardware queues to support WME. In this case we just set up one data queue. Use the capability information to decide how many queues to set up. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 5c6d1125f8dbd1bfef39e38fbc2837003be78a59 Author: Jarkko Sakkinen Date: Tue Dec 7 13:34:01 2010 +0200 Smack: Transmute labels on specified directories In a situation where Smack access rules allow processes with multiple labels to write to a directory it is easy to get into a situation where the directory gets cluttered with files that the owner can't deal with because while they could be written to the directory a process at the label of the directory can't write them. This is generally the desired behavior, but when it isn't it is a real issue. This patch introduces a new attribute SMACK64TRANSMUTE that instructs Smack to create the file with the label of the directory under certain circumstances. A new access mode, "t" for transmute, is made available to Smack access rules, which are expanded from "rwxa" to "rwxat". If a file is created in a directory marked as transmutable and if access was granted to perform the operation by a rule that included the transmute mode, then the file gets the Smack label of the directory instead of the Smack label of the creating process. Note that this is equivalent to creating an empty file at the label of the directory and then having the other process write to it. The transmute scheme requires that both the access rule allows transmutation and that the directory be explicitly marked. Signed-off-by: Jarkko Sakkinen Signed-off-by: Casey Schaufler commit d7fd1b50a51be3fe6554fbab8953fa8a3ff4009b Author: Ben Greear Date: Mon Dec 6 13:13:07 2010 -0800 ath9k: Make DMA warning in ath_stoprecv WARN_ON_ONCE. This decreases spammage in the log. A single line message will still be printed, so users can be aware that problem exists. Signed-off-by: Ben Greear Acked-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 1435894dcd263fdbdd5e1ea2a684289dff187c34 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:28:00 2010 -0800 ath9k: Add device id of AR9485 to pci table Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit a95f1600081211433c5ff6f3668061c821552e9f Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:59 2010 -0800 ath9k_hw: Disable MRC CCK for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 11441fb8b700bd782ae72d3dd87453fc5bc2ff12 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:58 2010 -0800 ath9k_hw: Setup paprd only for supported chains Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7090ad1416d0311677c43728494c6028aa2436b6 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:57 2010 -0800 ath9k_hw: Program appropriate register for temperature compensation cal for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 858b7e36e82cc03cb77b64f096b64446a24a346a Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:56 2010 -0800 ath9k_hw: Add IQ cal changes for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 73ff5fc0a86b28b77e02a6963b388d1dbfa0a263 Author: Eric Paris Date: Tue Dec 7 16:17:28 2010 -0500 selinux: cache sidtab_context_to_sid results sidtab_context_to_sid takes up a large share of time when creating large numbers of new inodes (~30-40% in oprofile runs). This patch implements a cache of 3 entries which is checked before we do a full context_to_sid lookup. On one system this showed over a x3 improvement in the number of inodes that could be created per second and around a 20% improvement on another system. Any time we look up the same context string sucessivly (imagine ls -lZ) we should hit this cache hot. A cache miss should have a relatively minor affect on performance next to doing the full table search. All operations on the cache are done COMPLETELY lockless. We know that all struct sidtab_node objects created will never be deleted until a new policy is loaded thus we never have to worry about a pointer being dereferenced. Since we also know that pointer assignment is atomic we know that the cache will always have valid pointers. Given this information we implement a FIFO cache in an array of 3 pointers. Every result (whether a cache hit or table lookup) will be places in the 0 spot of the cache and the rest of the entries moved down one spot. The 3rd entry will be lost. Races are possible and are even likely to happen. Lets assume that 4 tasks are hitting sidtab_context_to_sid. The first task checks against the first entry in the cache and it is a miss. Now lets assume a second task updates the cache with a new entry. This will push the first entry back to the second spot. Now the first task might check against the second entry (which it already checked) and will miss again. Now say some third task updates the cache and push the second entry to the third spot. The first task my check the third entry (for the third time!) and again have a miss. At which point it will just do a full table lookup. No big deal! Signed-off-by: Eric Paris commit 31faff815bd9d87c370f799dff03948ed362d260 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:55 2010 -0800 ath9k_hw: Define IQcal correction coefficient registers using index Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 6559e83ebd2cac06c54ebb2b7f635cf2e434f25c Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:54 2010 -0800 ath9k_hw: Program appropriate chianmask for AR9485 before starting AGC/IQ cal Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 5f139eba4174d9a3343efc7cfb8a0a9cb184c647 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:53 2010 -0800 ath9k_hw: Configure power control only for the supported chains Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit dd040f76cef0cc977b83e905a16b68d41322b735 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:52 2010 -0800 ath9k_hw: Read and configure turnning caps to regulate freq accuracy Right now it is done for only AR9485, will be done for ar9003 also after proper testing. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ab09b5b4beda8b33a117bf6fbbb2b5aa8f566129 Author: Vasanthakumar Thiagarajan Date: Tue Dec 7 02:20:39 2010 -0800 ath9k_hw: Configure internal regulator for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 47e84dfb411fcaa51e12d94ab82570ec3aa86e32 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:49 2010 -0800 ath9k_hw: Read and configure antenna diversity control for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 9936e65fae6d95c2acc2438c60a8f4908130530e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:48 2010 -0800 ath9k_hw: Configure xpa bias level for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d9a2545ac713e26ab8c8eee741d2da1626cebd6e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:47 2010 -0800 ath9k: Read spur channel information from eeprom for AR9485 Also spur channel count and range is different for AR9485. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 272ceba892208013a45847276a00ccae54e2b94a Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:46 2010 -0800 ath9k_hw: Add a helper function to get spur channel pointer from cal data for AR9003 family This helper function would be used for AR9485. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 85dd0921e686ed2f0283cef358a91ecaa36ccc8f Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:45 2010 -0800 ath9k_hw: Find chansel of AR_PHY_65NM_CH0_SYNTH7 for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d09b17f73fd8f475f33d0b8311d7b5a0bed67c67 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:44 2010 -0800 ath9k: Configure pll control for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 47c80de62e9d6d262a829502d689a8b56add8d3d Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:43 2010 -0800 ath9k_hw: Find the maximum number of chains that hw supports Have it in ah->caps. This will be used during various calibrations. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8060e169e02fe855f5533b5ef6af1f23ae2db0c4 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:42 2010 -0800 ath9k: Enable extended synch for AR9485 to fix L0s recovery issue Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 7f1c7a6ac57ff0482219aa3f62eb9d0f8fe65867 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:41 2010 -0800 ath9k: Disable TX STBC for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 784ad50324ec531fa4ab22586fe305657cc6e307 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:40 2010 -0800 ath9k_hw: Disable LDPC for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 60e0c3a782f9060327751492dac949210154759b Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:39 2010 -0800 ath9k_hw: Eeeprom changes for AR9485 Calibration data are stored at 4k address (0xfff). The cal data for AR9485 is not compressed so its lengh can exceed 1024 limit, take care of that. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit ff48ba464e3503149657c60d46e8f4e9b4ed27fa Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:38 2010 -0800 ath9k_hw: Initialize tx/rx gain table from initvals.h for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit c88457eb83fb6db7a3286a685ecc6e33a7aac49d Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:37 2010 -0800 ath9k_hw: Initialize mode registers for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3050c9146b2a4c98a916192fac2867c0023ec2b1 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:36 2010 -0800 ath9k_hw: Enable hw initialization for AR9485 Also make it a supported mac Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit d9c803e1864d563b07382eb1bb8979cd70b1001e Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:35 2010 -0800 ath9k_hw: Add initvals.h for AR9485 Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3bbb780cca79dfe0200d33afb95a8990acde65b9 Author: Vasanthakumar Thiagarajan Date: Mon Dec 6 04:27:34 2010 -0800 ath9k_hw: Define hw version macros for AR9485 AR9485 is a single chain and single band (2.4 Ghz) chip. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit b7555ec7c604f2f00e432579dac29df5ce525433 Author: John W. Linville Date: Tue Dec 7 14:13:49 2010 -0500 ath5k: remove MODULE_VERSION Since this is updated manually and sporadically, it is fairly useless anyway. Signed-off-by: John W. Linville commit a1cbc7a88985976267a851a2e1080578711b3b0d Author: Joe Perches Date: Thu Dec 2 19:12:38 2010 -0800 ath: Fix ath_dbg access beyond array bound ar9300RateSize is not necessarily a power of 4. Change ar9003_hw_set_target_power_eeprom to print the targetPowerValT2 array one per line. ath9k_hw_ar9300_set_txpower repeated the output 4 times per line, change it to print the targetPowerValT2 value one per line. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 226afe68fdbd1aa3680158aca0a3631cbd019626 Author: Joe Perches Date: Thu Dec 2 19:12:37 2010 -0800 ath: Convert ath_print to ath_dbg Remove ath/debug.h and the includes of these files. Coalesce long formats. Correct a few misspellings and missing "\n"s from these logging messages. Remove unnecessary trailing space before a newline. Remove ARRAY_SIZE casts, use printf type %zu Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 3800276a40751539a920ef8e0537ef2e19126799 Author: Joe Perches Date: Thu Dec 2 19:12:36 2010 -0800 ath: Convert ath_print(.., ATH_DBG_FATAL to ath_err So these errors are always emitted at KERN_ERR level. Remove ARRAY_SIZE casts, use printf type %zu Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 21a99f934949807dc0c9dc7642bbf0081b7582f9 Author: Joe Perches Date: Thu Dec 2 19:12:35 2010 -0800 ath: Add and use ath_printk and ath_ Add ath_printk and ath_ similar to dev_printk and dev_ from device.h This allows a more gradual rename of ath_print to to ath_dbg or perhaps ath_debug. This basically removes debug.h leaving only an #define ath_printk ath_dbg there and moving all the ATH_DBG_ enums to ath.h I do not think there's much purpose for struct ath_common * being passed to the ath_printk functions, but perhaps there might be. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 0ab82b04ac83a05bda3ef8499f415fc6fd6ee206 Author: Eliad Peller Date: Fri Dec 3 02:16:23 2010 +0200 mac80211: fix dynamic-ps/pm_qos magic numbers mac80211 uses pm_qos (/dev/network_latency) in order to determine the dynamic ps timeout (or disable the dynamic-ps at all in some cases). commit ff616381 added a comparison for the current network_latency against one high value (1900ms), and against the default value (2000sec, rather than the commented 2sec). however, the representation of 1900ms was incorrect: 1900ms = 1900000us ( != 1900000000 ) fix it by using USEC_TO_MSEC/SEC consts. Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit 329b32fedc94fd9158f1635ac64f4ae6a00d374c Author: David Kilroy Date: Thu Dec 2 18:19:21 2010 +0000 orinoco: allow IW_AUTH_MFP to pass through The card doesn't support MFP, so silently accept DISABLED and OPTIONAL settings. This avoids the following failure in wpa_supplicant logs: State: SCANNING -> ASSOCIATING wpa_driver_wext_set_operstate: operstate 0->0 (DORMANT) netlink: Operstate: linkmode=-1, operstate=5 wpa_driver_wext_associate wpa_driver_wext_set_drop_unencrypted wpa_driver_wext_set_psk wpa_driver_wext_associate: assoc failed because set_auth_param(IW_AUTH_MFP) failed Association request to the driver failed Signed-off by: David Kilroy Reported by: Giacomo Comes Signed-off-by: John W. Linville commit 541a45a142df281c974d74eac2066138fc107b23 Author: Bruno Randolf Date: Thu Dec 2 19:12:43 2010 +0900 nl80211/mac80211: Report signal average Extend nl80211 to report an exponential weighted moving average (EWMA) of the signal value. Since the signal value usually fluctuates between different packets, an average can be more useful than the value of the last packet. This uses the recently added generic EWMA library function. -- v2: fix ABI breakage and change factor to be a power of 2. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: fix ioctl ABI In kernel ABI version 7.16 and later FUSE_IOCTL_RETRY reply from a unrestricted IOCTL request shall return with an array of 'struct fuse_ioctl_iovec' instead of 'struct iovec'. This fixes the ABI ambiguity of 32bit vs. 64bit. Reported-by: "ccmail111" Signed-off-by: Miklos Szeredi CC: Tejun Heo commit 02c048b919455aaa38628563cdcc2e691c8a9f53 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: allow batching of FORGET requests Terje Malmedal reports that a fuse filesystem with 32 million inodes on a machine with lots of memory can take up to 30 minutes to process FORGET requests when all those inodes are evicted from the icache. To solve this, create a BATCH_FORGET request that allows up to about 8000 FORGET requests to be sent in a single message. This request is only sent if userspace supports interface version 7.16 or later, otherwise fall back to sending individual FORGET messages. Reported-by: Terje Malmedal Signed-off-by: Miklos Szeredi commit 07e77dca8a1f17a724a9b7449f0ca02e70e9d057 Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: separate queue for FORGET requests Terje Malmedal reports that a fuse filesystem with 32 million inodes on a machine with lots of memory can go unresponsive for up to 30 minutes when all those inodes are evicted from the icache. The reason is that FORGET messages, sent when the inode is evicted, are queued up together with regular filesystem requests, and while the huge queue of FORGET messages are processed no other filesystem operation can proceed. Since a full fuse request structure is allocated for each inode, these take up quite a bit of memory as well. To solve these issues, create a slim 'fuse_forget_link' structure containing just the minimum of information required to send the FORGET request and chain these on a separate queue. When userspace is asking for a request make sure that FORGET and non-FORGET requests are selected fairly: for each 8 non-FORGET allow 16 FORGET requests. This will make sure FORGETs do not pile up, yet other requests are also allowed to proceed while the queued FORGETs are processed. Reported-by: Terje Malmedal Signed-off-by: Miklos Szeredi commit 8ac835056ca39b242d98332f46e4d65428a8b7db Author: Miklos Szeredi Date: Tue Dec 7 20:16:56 2010 +0100 fuse: ioctl cleanup Get rid of unnecessary page_address()-es. Signed-off-by: Miklos Szeredi CC: Tejun Heo commit c39d35ebffeea5996a6f8fd8430fae9acfb8aeaf Author: Ben Hutchings Date: Tue Dec 7 19:11:26 2010 +0000 sfc: Generalise filter spec initialisation Move search_depth arrays into per-table state. Define initialisation function efx_filter_init_rx() which sets everything apart from the match fields. Define efx_filter_set_{ipv4_local,ipv4_full,eth_local}() to set the match fields. This allows some simplification of callers and later support for additional protocols and more flexible matching using multiple calls to these functions. Signed-off-by: Ben Hutchings commit a96efbc1fc8e4540dc1d561bb5e42a16a7b472d5 Author: Fabio Estevam Date: Mon Dec 6 16:38:34 2010 -0200 ARM: mx5/mx51_babbage: Add watchdog support Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 7f77f91dc0171ac11a8b95ba761144d732d4e907 Author: Fabio Estevam Date: Mon Dec 6 16:38:33 2010 -0200 ARM: mx5: add watchdog clocks Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8c2efec3cd5fcc6240da8931222ccab556a40ff3 Author: Fabio Estevam Date: Mon Dec 6 16:38:32 2010 -0200 ARM: mx5: add support for the two watchdog modules MX51 has two watchdog modules. Add support for both of them. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8891681af928f1da795cd4bd59043e5e0fadd6c8 Author: Ben Hutchings Date: Tue Dec 7 19:02:27 2010 +0000 sfc: Remove filter table IDs from filter functions The separation between filter tables is largely an internal detail and it may be removed in future hardware. To prepare for that: - Merge table ID with filter index to make an opaque filter ID - Wrap efx_filter_table_clear() with a function that clears filters from both RX tables, which is all that the current caller requires Signed-off-by: Ben Hutchings commit bcd7278d8a423a255e45f4d10afe564328f1885f Author: Bob Peterson Date: Tue Dec 7 13:58:56 2010 -0500 GFS2: fsck.gfs2 reported statfs error after gfs2_grow When you do gfs2_grow it failed to take the very last rgrp into account when adding up the new free space due to an off-by-one error. It was not reading the last rgrp from the rindex because of a check for "<=" that should have been "<". Therefore, fsck.gfs2 was finding (and fixing) an error with the system statfs file. Signed-off-by: Bob Peterson commit ce56d169976488e888878eed5f1bc304cf116c43 Author: Martin Michlmayr Date: Mon Dec 6 21:53:16 2010 +0000 Kirkwood: Add support for 6282 based QNAP devices Add support for the QNAP NAS devices based on Marvell's 6282 Kirkwood chip (TS-119P+, TS-219P+ and TS-419P+). The differences to the 6281 based devices are: - Ethernet PHY address - GPIOs used for buttons (TS-119P+/TS-219P+) Signed-off-by: Martin Michlmayr Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 4bba1c34e0a70d0db2506e1b68f69d7edc8afd78 Author: Ash Hughes Date: Tue Nov 30 21:53:09 2010 +0000 [ARM] Orion: added Buffalo LS-CHL support Adds support for Buffalo Linkstation Live v3 (LS-CHL) NAS drives. Signed-off-by: Ash Hughes Acked-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit ea3398a1ae54cd3403f3cc0f6aa498c7452c681a Merge: 03fa6fc cf7d7e5 Author: Greg Kroah-Hartman Date: Tue Dec 7 10:47:56 2010 -0800 Staging: Merge 2.6.37-rc5 into staging-next This was done to handle a number of conflicts in the batman-adv and winbond drivers properly. It also now allows us to fix up the sysfs attributes properly that were not in the .37 release due to them being only in this tree at the time. Signed-off-by: Greg Kroah-Hartman commit ac33ac610dc613b2b1c938f8b61eef651ab72563 Author: Ben Hutchings Date: Tue Dec 7 18:29:52 2010 +0000 sfc: Log start and end of ethtool self-test at INFO level Add message at start of self-test and increase log level of message at end of self-test, so that any other messages produced during the test are clearly associated with it. Signed-off-by: Ben Hutchings commit ff2109f5f94ff75f45e0c8d2d1d56fefdf20733f Author: Tracey Dent Date: Sun Nov 21 15:03:12 2010 +0000 Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 6b3ed78535c5af8c1d25ed7eaaea7557698843a1 Author: Axel Lin Date: Tue Dec 7 16:12:29 2010 +0800 ASoC: Fix snd_soc_instantiate_card error path Properly free the resources in the case of snd_card_register failure and soc_register_ac97_dai_link failure. Signed-off-by: Axel Lin Signed-off-by: Mark Brown commit 33d6eb570b1f3fe5ba93cef465c5be66535c2c9a Author: Valentine Barshak Date: Mon Dec 6 18:16:11 2010 +0300 HID: Consolidate device existence checks in hiddev_ioctl Currently, if the device has been removed before hiddev_ioctl(), the -EIO is returned. If it's removed while hiddev_ioctl() is in progress, some commands are still processed fine, others return -ENODEV. This change takes the "existancelock" before processing ioctl commands and releases it at the end. If the device has been removed, always returns -ENODEV. Signed-off-by: Valentine Barshak Signed-off-by: Jiri Kosina commit 1a8e8fab790ea7af81b8f964fdec706ad1ec2271 Author: Valentine Barshak Date: Mon Dec 6 17:51:41 2010 +0300 HID: Fix race between disconnect and hiddev_ioctl A USB HID device can be disconnected at any time. If this happens right before or while hiddev_ioctl is in progress, the hiddev_ioctl tries to access invalid hiddev->hid pointer. When the hid device is disconnected, the hiddev_disconnect() ends up with a call to hid_device_release() which frees hid_device, but doesn't set the hiddev->hid pointer to NULL. If the deallocated memory region has been re-used by the kernel, this can cause a crash or memory corruption. Since disconnect can happen at any time, we can't initialize struct hid_device *hid = hiddev->hid at the beginning of ioctl and then use it. This change checks hiddev->exist flag while holding the existancelock and uses hid_device only if it exists. Signed-off-by: Valentine Barshak Signed-off-by: Jiri Kosina commit b38aa89600be39b3e10c5b6529aed2e66518598e Author: Ian Munsie Date: Mon Nov 29 11:53:07 2010 +1100 perf makefile: Allow strong and weak functions in LIB_OBJS When we build perf we place all of the .o files from the library files (util, arch/x/util, etc) into libperf.a which is then linked into perf. The problem is that the linker will by default only consider .o files within the .a archive if they are necessary to satisfy an unresolved symbol. As weak functions are not unresolved, it will not consider a .o file from the archive containing the strong versions of weak functions unless it requires it for another reason. This patch adds the --whole-archive flags to the linker when passing in the libperf.a file to ensure that it will consider every .o file in the archive, not just what it believes that it needs. The end result is that weak functions can now be overridden by strong variants of them in the libperf.a file. Cc: "tom.leiming" Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290991642-sup-5890@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 7af4c0932437f97938eef67e553c8d211f9edf33 Author: Jesper Juhl Date: Sat Oct 30 15:56:54 2010 +0200 percpu: zero memory more efficiently in mm/percpu.c::pcpu_mem_alloc() Don't do vmalloc() + memset() when vzalloc() will do. tj: dropped unnecessary temp variable ptr. Signed-off-by: Jesper Juhl Signed-off-by: Tejun Heo commit 04910265078f08a73208beab70ed2a3cce4a919f Author: Tomasz Grobelny Date: Sat Dec 4 13:39:13 2010 +0100 dccp qpolicy: Parameter checking of cmsg qpolicy parameters Ensure that cmsg->cmsg_type value is valid for qpolicy that is currently in use. Signed-off-by: Tomasz Grobelny Signed-off-by: Gerrit Renker commit 871a2c16c21b988688b4ab1a78eadd969765c0a3 Author: Tomasz Grobelny Date: Sat Dec 4 13:38:01 2010 +0100 dccp: Policy-based packet dequeueing infrastructure This patch adds a generic infrastructure for policy-based dequeueing of TX packets and provides two policies: * a simple FIFO policy (which is the default) and * a priority based policy (set via socket options). Both policies honour the tx_qlen sysctl for the maximum size of the write queue (can be overridden via socket options). The priority policy uses skb->priority internally to assign an u32 priority identifier, using the same ranking as SO_PRIORITY. The skb->priority field is set to 0 when the packet leaves DCCP. The priority is supplied as ancillary data using cmsg(3), the patch also provides the requisite parsing routines. Signed-off-by: Tomasz Grobelny Signed-off-by: Gerrit Renker commit e745a6676c76280f9721adeec79b08a0f2dfcc21 Author: Magnus Damm Date: Tue Nov 16 01:07:19 2010 +0100 ARM: 6481/1: Use shared GIC entry macros on OMAP Common GIC entry macro for omap Signed-off-by: Tony Lindgren Signed-off-by: Magnus Damm Acked-by: Santosh Shilimkar Signed-off-by: Russell King commit c91a2bd70a617a638e157a7e99d4b21ee0e7b1cf Author: Magnus Damm Date: Tue Nov 16 01:03:34 2010 +0100 ARM: 6480/1: Use shared GIC entry macros on Vexpress Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Versatile Express subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 5488324a6cbae617d103c42944827d82d8f5efd4 Author: Magnus Damm Date: Tue Nov 16 01:02:06 2010 +0100 ARM: 6479/1: Use shared GIC entry macros on UX500 Use the GIC demux code in asm/hardware/entry-macro-gic.S on the UX500 subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 0005b349d5dc71471e1d47bd3efbf93f685620e1 Author: Magnus Damm Date: Tue Nov 16 01:00:40 2010 +0100 ARM: 6478/1: Use shared GIC entry macros on Tegra Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Tegra subarchitecture. Signed-off-by: Magnus Damm Acked-by: Olof Johansson Signed-off-by: Russell King commit c4d8c80f59f0611d747399a774ebef71f517a30c Author: Magnus Damm Date: Tue Nov 16 00:58:43 2010 +0100 ARM: 6477/1: Use shared GIC entry macros on Realview Use the GIC demux code in asm/hardware/entry-macro-gic.S on the Realview subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 960351fb8e980f0aa6682f11630ff98d3a18e2c0 Author: Magnus Damm Date: Tue Nov 16 00:54:55 2010 +0100 ARM: 6476/1: Use shared GIC entry macros on CNS3XXX Use the GIC demux code in asm/hardware/entry-macro-gic.S on the CNS3XXX subarchitecture. Signed-off-by: Magnus Damm Signed-off-by: Russell King commit 161d1907607a5a562a152058c8daf1780ce7a00b Author: Magnus Damm Date: Tue Nov 16 00:48:07 2010 +0100 ARM: 6475/1: Introduce asm/hardware/entry-macro-gic.S This patch is the identical GIC demux implementation merge V3. Instead of implementing same code over and over simply share it in entry-macro-gic.S. The shared code is based on the realview implementation. Each GIC demux instance still has to setup the base address of the controller using the get_irqnr_preamble macro. The rest of the GIC specific code can be shared. Signed-off-by: Magnus Damm Acked-by: Srinidhi Kasagar Signed-off-by: Russell King commit 743411b3f3e96e8ac4cae73551a0a95392fed1ea Author: Felipe Balbi Date: Wed Dec 1 13:22:05 2010 +0200 usb: musb: make all glue layer export struct musb_platform_ops preparing to a big refactor on musb code. We need to be able to compile in all glue layers (or at least all ARM-based ones) together and have a working binary. While preparing for that, we move every glue layer to export only one symbol, which is a struct musb_platform_ops, and make all other functions static. Later patches will come to allow for compiling all glue layers together and have a working binary. Signed-off-by: Felipe Balbi commit 75b5293a5d176cd9caf6dc590da4f3458c048c3c Merge: 10a18d7 ce47dc5 Author: Ingo Molnar Date: Tue Dec 7 07:51:14 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit 10a18d7dc0d9f12483c95ffc234118e9b80edfeb Merge: f984ba4 cf7d7e5 Author: Ingo Molnar Date: Tue Dec 7 07:49:48 2010 +0100 Merge commit 'v2.6.37-rc5' into perf/core Merge reason: Pick up the latest -rc. Signed-off-by: Ingo Molnar commit 3ca8abb84522f4b773678726db6ebd6fc277bc96 Author: Felipe Balbi Date: Thu Oct 21 13:56:40 2010 +0300 usb: musb: introduce struct musb_platform_ops This will be passed to musb_core by platform glue layer in order to make it easier to compile support for several HW glue layers. Later patches will come using this structure and also moving HW glue layers to its own platform driver; the idea is to be able to handle platform peculiarities in a manner which doesn't affect one another. Signed-off-by: Felipe Balbi commit cfa969e385a23e4c85f50e0ed5de25a2e18bf9d4 Author: David S. Miller Date: Mon Dec 6 20:45:28 2010 -0800 Revert "ehea: Use the standard logging functions" This reverts commit 539995d18649023199986424d140f1d620372ce5. As reported by Stephen Rothwell, this breaks the build. Signed-off-by: David S. Miller commit 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 Author: Hank Janssen Date: Mon Dec 6 12:26:51 2010 -0800 staging: hv: Convert camel case local variables in blkvsc.c to lowercase Convert camel case local variables in blkvsc.c to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 2e6484acd28bb5223942d2608387af3ec9bf56f1 Author: Hank Janssen Date: Mon Dec 6 12:26:50 2010 -0800 staging: hv: Convert camel case function names in blkvsc.c to lowercase Convert camel case function names in blkvsc.c to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit f638859e3203d1ae933e7f2114cca68f1ac407db Author: Hank Janssen Date: Mon Dec 6 12:26:49 2010 -0800 staging: hv: Convert camel case local variables in storvsc.c to lowercase Convert camel case local variables in storvsc.c to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 02e37db7148a5ee98a742a0ff2f7e3acc406049b Author: Hank Janssen Date: Mon Dec 6 12:26:48 2010 -0800 staging: hv: Convert camel case function names in storvsc.c to lowercase Convert camel case function names in storvsc.c to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 3d8cdf22b314f84cc4ae85ed650ccd37150a7562 Author: Hank Janssen Date: Mon Dec 6 12:26:47 2010 -0800 staging: hv: Convert camel case struct fields in storvsc.c to lowercase Convert camel cased struct fields in storvsc.c to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit eb4f3e0aa6bef825b964159923e38a0e4c027084 Author: Hank Janssen Date: Mon Dec 6 12:26:46 2010 -0800 staging: hv: Convert camel case functions in storvsc_api.h to lowercase Convert camel case functions in storvsc_api.h to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 8a046024a7cbbe9e4c16f4e34dda0f0dbcbc6723 Author: Hank Janssen Date: Mon Dec 6 12:26:45 2010 -0800 staging: hv: Convert camel case struct fields in storvsc_api.h to lowercase Convert camel case struct fields in vstorage.h to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d2aaba455fed75f231fe30fccfd25bcb8d8ff305 Author: Hank Janssen Date: Mon Dec 6 12:26:44 2010 -0800 staging: hv: Convert camel case struct fields in vstorage.h to lowercase Convert camel case struct fields in vstorage.h to lowercase Signed-off-by: Abhishek Kane Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 37db526463a5ad1c96cd803d49fddbf069bbf9b9 Author: Dan Carpenter Date: Mon Dec 6 10:03:38 2010 +0300 Staging: Beceem: more checkpatch.pl changes to InterfaceInit.c The only checkpatch.pl issues remaining still remaining are line length complaints. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 07a7f68800a490bc1140de778e196f66ef4596d9 Author: Dan Carpenter Date: Mon Dec 6 10:03:13 2010 +0300 Staging: Beceem: improve debug printk statements These are just small changes. Some grammar and wording changes. I added new lines to the end of all the print statements. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 6b74705e15d5c87181008f1ac984df7faaad55c9 Author: Dan Carpenter Date: Mon Dec 6 10:02:55 2010 +0300 Staging: Beceem: use after free in bcm_exit() We can't call class_destroy() until after the driver has been deregistered. It leads to a NULL deref on module unload. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit cd0b0ebfbe134b9c98fa8e628732b0e41b2cb48c Author: Dan Carpenter Date: Mon Dec 6 10:02:36 2010 +0300 Staging: Beceem: remove old kernel compatibility code This drops compatability for everything from 2.4 to 2.6.35. Now it only works on the latest kernel. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c2a0b162dbce1534cf4e71914597419ae83a70d9 Author: Dan Carpenter Date: Mon Dec 6 10:02:11 2010 +0300 Staging: Beceem: white space changes to InterfaceInit.c This patch only changes: 1) spaces, tabs, and newline characters. 2) comment styles. The compiled object file is the same before and after except for line number changes. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 2a314742d300edc2010d50a006c77ceb04c75119 Author: Dan Carpenter Date: Mon Dec 6 10:01:41 2010 +0300 Staging: Beceem: use lower case "int" instead of "INT" This patch changes: INT => int ULONG => unsigned long VOID => void Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 85c0b1760a7c259679d188bef58866fc641deca5 Author: Dan Carpenter Date: Mon Dec 6 10:01:16 2010 +0300 Staging: Beceem: add USB id for BCSM250 Mobile WiMAX Signed-off-by: Dan Carpenter Cc: stable Signed-off-by: Greg Kroah-Hartman commit e304151f150104412c9a304dffd6dc5c160ea336 Author: Roland Vossen Date: Mon Dec 6 22:42:48 2010 +0100 staging: brcm80211: replaced wlc_hw_info_t by struct wlc_hw_info Part of code cleanup effort. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 8538576474e162e4967532a80305d17e871f2fa5 Author: Arend van Spriel Date: Sat Dec 4 16:35:43 2010 +0100 staging: brcm80211: remove macro usage for sk_buff release PKTFREE macro calls osl_pktfree. This function has been renamed to pkt_buf_free_skb as it comprises of functionality additional to dev_kfree_skb(_any) function and to get rid of the OSL concept in this driver. Reviewed-by: Brett Rudley Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit f09e02322ed36feafba6e3a6373e0bcd93730ce6 Author: Arend van Spriel Date: Sat Dec 4 16:35:42 2010 +0100 staging: brcm80211: remove macro usage for sk_buff allocation PKTGET macro calls osl_pktget. This function has been renamed to pkt_buf_get_skb as it comprises of functionality additional to dev_alloc_skb function and to get rid of the OSL concept in this driver. Reviewed-by: Brett Rudley Reviewed-by: Dowan Kim Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c6a9e1fc715763175842014a83a9ea70f7e19ace Author: Roland Vossen Date: Sat Dec 4 08:38:02 2010 +0100 staging: brcm80211: replaced wlc_info_t by struct wlc_info. Part of code cleanup effort. Global replace of wlc_info_t with struct wlc_info. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit e63449b7171fa19d1d2404179665d5ed146e8990 Author: Brett Rudley Date: Fri Dec 3 18:00:26 2010 -0800 staging: brcm80211: Removing cruft from osl.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 326a67977c15715d627525deade9e859f5cd5646 Author: Brett Rudley Date: Fri Dec 3 18:00:25 2010 -0800 staging: brcm80211: migrate register ops macros to bcmutils.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 8968af14f8e2d636fa5b4c055e240c1f359b8716 Author: Brett Rudley Date: Fri Dec 3 18:00:24 2010 -0800 staging: brcm80211: move dma specific macros from osl to dma code Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 411ee44ad30b2a8c99c3b225a3cf381ec37b000e Author: Brett Rudley Date: Fri Dec 3 16:30:39 2010 -0800 staging: brcm80211: move fullmac-only code from osl to fullmac files Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit ec7957049668b4fcf755cd8a085cfe258d77fc9b Author: Brett Rudley Date: Fri Dec 3 16:30:38 2010 -0800 staging: brcm80211: Remove unused softmac macros Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 7a9b48b3d3e0f373dc996efde56a5bff0944d8de Author: Brett Rudley Date: Fri Dec 3 16:30:37 2010 -0800 staging: brcm80211: Move osl_pub into osl Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 98ede2ed46cef38e98c8341d410323895f60570e Author: Brett Rudley Date: Fri Dec 3 16:30:36 2010 -0800 staging: brcm80211: OSLREGOPS is unused, remove checks for it. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit cd38557d78554fd4318fe448f728a8d7ff1cbabb Author: Ben Hutchings Date: Mon Nov 15 23:53:11 2010 +0000 sfc: Use TX push whenever adding descriptors to an empty queue Whenever we add DMA descriptors to a TX ring and update the ring pointer, the TX DMA engine must first read the new DMA descriptors and then start reading packet data. However, all released Solarflare 10G controllers have a 'TX push' feature that allows us to reduce latency by writing the first new DMA descriptor along with the pointer update. This is only useful when the queue is empty. The hardware should ignore the pushed descriptor if the queue is not empty, but this check is buggy, so we must do it in software. In order to tell whether a TX queue is empty, we need to compare the previous transmission count (write_count) and completion count (read_count). However, if we do that every time we update the ring pointer then read_count may ping-pong between the caches of two CPUs running the transmission and completion paths for the queue. Therefore, we split the check for an empty queue between the completion path and the transmission path: - Add an empty_read_count field representing a point at which the completion path saw the TX queue as empty. - Add an old_write_count field for use on the completion path. - On the completion path, whenever read_count reaches or passes old_write_count the TX queue may be empty. We then read write_count, set empty_read_count if read_count == write_count, and update old_write_count. - On the transmission path, we read empty_read_count. If it's set, we compare it with the value of write_count before the current set of descriptors was added. If they match, the queue really is empty and we can use TX push. Signed-off-by: Ben Hutchings commit e506147271229d6c53b42c6a9897db67b5cfdb6d Author: Ben Hutchings Date: Mon Dec 6 22:58:41 2010 +0000 sfc: Remove locking from implementation of efx_writeo_paged() It is not necessary to serialise writes to the paged 128-bit registers. However, if we don't then we must always write the last dword separately, not as part of a qword write. Signed-off-by: Ben Hutchings commit 1a29cc40115c011895143c5f8278dee49423d5df Author: Ben Hutchings Date: Mon Dec 6 22:55:33 2010 +0000 sfc: Add compile-time checks for correctness of paged register writes Signed-off-by: Ben Hutchings commit 494bdf1b0fd58688d055f1b66c34b0844dcfc1fa Author: Ben Hutchings Date: Mon Dec 6 22:55:18 2010 +0000 sfc: Remove redundant memory barriers between MMIOs Signed-off-by: Ben Hutchings commit 9f2f6cd07a09bc0af1f2950189e426569561d1e6 Author: Ben Hutchings Date: Mon Dec 6 22:55:00 2010 +0000 sfc: Expand/correct comments on collector behaviour and function usage Document exactly which registers and functions have special behaviour, and why races on writes to descriptor pointers are safe. Signed-off-by: Ben Hutchings commit 51c56f40ef41ca780ff001d59727eda03fa39374 Author: Ben Hutchings Date: Wed Nov 10 18:46:40 2010 +0000 sfc: Use ACCESS_ONCE when copying efx_tx_queue::read_count Signed-off-by: Ben Hutchings commit ab28c12a8e6fea875b6757052e211772f62fa771 Author: Ben Hutchings Date: Mon Dec 6 22:53:15 2010 +0000 sfc: Reorder struct efx_nic to separate fields by volatility Place the regularly updated fields (locks, MAC stats, etc.) on a separate cache-line from fields which are mostly constant. This should reduce cache misses for access to the latter on the data path. Signed-off-by: Ben Hutchings commit 40fe7d88ab3eb711b307fab1b92aa6870914c975 Author: Tobias Klauser Date: Thu Dec 2 07:22:05 2010 +0000 net: cris/eth_v10: Use net_device_stats from struct net_device_stats struct net_device has its own struct net_device_stats member, so use this one instead of a private copy in struct net_local. Note: This patch was not even compile tested. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit b27d50a9ff5cf2775b7a4daf571a0cc72d013b9c Author: Tobias Klauser Date: Thu Dec 2 07:20:39 2010 +0000 net: emaclite: Omit private ndo_get_stats function xemaclite_get_stats() just returns dev->stats so we can leave it out alltogether and let dev_get_stats() do the job. Signed-off-by: Tobias Klauser Signed-off-by: David S. Miller commit e176bbc5893bef36a0909de31dea97865660a7c9 Author: Tobias Klauser Date: Thu Dec 2 07:20:05 2010 +0000 net: am79c961a: Omit private ndo_get_stats function am79c961_getstats() just returns dev->stats so we can leave it out alltogether and let dev_get_stats() do the job. Signed-off-by: Tobias Klauser Acked-by: Russell King Signed-off-by: David S. Miller commit 9f91170773d852e65e4fc36e1f8173ce614f62e1 Author: Don Skidmore Date: Fri Dec 3 13:24:05 2010 +0000 ixgbe: fix enum type mismatch on disable laser Fixes a recent bug on the patch (c6ecf39a10ceec3e97096e2a8d3eadcecd593422) that disabled the laser on ifconfig down. Compilers were seeing a enum mismatch. Signed-off-by Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit a7f5a5fcd9f13afd3471a0de8c1fdaa8f989497c Author: Don Skidmore Date: Fri Dec 3 13:23:30 2010 +0000 ixgbe: fix for link failure on SFP+ DA cables This patch helps prevent FW/SW semaphore collision from leading to link establishment failure. The collision might mess up the PHY registers so we reset the PHY. However there are SFI/KR areas in the PHY that are not reset with a Reset_AN so we need to change LMS to reset it. Also wait until AN state machine is AN_GOOD Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 8917a3c0b7d1557548f50bfe3f0e18e0354e38f6 Author: David Shwatrz Date: Thu Dec 2 09:01:55 2010 +0000 Fix a typo in datagram.c and sctp/socket.c. Hi, This patch fixes a typo in net/core/datagram.c and in net/sctp/socket.c Regards, David Shwartz Signed-off-by: David Shwartz Signed-off-by: David S. Miller commit 22de94de7de78b8de2fb1f2df5aa85b5556cfcfd Author: Stanislaw Gruszka Date: Fri Dec 3 15:41:48 2010 +0100 iwlwifi: jiffies based tx queues watchdog This patch replace monitor/recover timer by watchdog based on time stamp. New code allow to discover hangs more precisely. Timeout values are currently doubled monitoring period values of previous timer. This have to be tuned based of firmware timing capabilities. Tested on 3945, 4965, 5300, 6300. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit abc471dc31be15f9fee5ec77f25d31b927d334b9 Author: Stanislaw Gruszka Date: Fri Dec 3 15:41:47 2010 +0100 iwl3945: prevent too frequent firmware resets Similarly like on iwlagn, initialize reset duration on iwl3945 to prevent too frequent firmware resets. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 29cbe68c516a48a9a88b3226878570c6cbd83c02 Author: Johannes Berg Date: Fri Dec 3 09:20:44 2010 +0100 cfg80211/mac80211: add mesh join/leave commands Instead of tying mesh activity to interface up, add join and leave commands for mesh. Since we must be backward compatible, let cfg80211 handle joining a mesh if a mesh ID was pre-configured when the device goes up. Note that this therefore must modify mac80211 as well since mac80211 needs to lose the logic to start the mesh on interface up. We now allow querying mesh parameters before the mesh is connected, which simply returns defaults. Setting them (internally renamed to "update") is only allowed while connected. Specify them with the new mesh join command instead where needed. In mac80211, beaconing must now also follow the mesh enabled/not enabled state, which is done by testing the mesh ID. Signed-off-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit bd90fdcc5fbd99a2a778999610420cf793bd1be2 Author: Johannes Berg Date: Fri Dec 3 09:20:43 2010 +0100 nl80211: refactor mesh parameter parsing I'm going to need this in a new place later. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f9e10ce4cf86945eb5efcab31284c971877ed012 Author: Johannes Berg Date: Fri Dec 3 09:20:42 2010 +0100 cfg80211: require add_virtual_intf to return new dev cfg80211 used to do all its bookkeeping in the notifier, but some new stuff will have to use local variables so make the callback return the netdev pointer. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 09b174702601079c3a04806754be30ffbd70db4d Author: Johannes Berg Date: Fri Dec 3 09:20:41 2010 +0100 mac80211: move mesh filter adjusting Logically, the filter adjusting belongs with starting/stopping mesh, not interface up/down, so move it there. Tested-by: Javier Cardona Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 45904f21655cf4f0ae7d0fab5906fe51bf56ecf4 Author: Javier Cardona Date: Fri Dec 3 09:20:40 2010 +0100 nl80211/mac80211: define and allow configuring mesh element TTL The TTL in path selection information elements is different from the mesh ttl used in mesh data frames. Version 7.03 of the 11s draft calls this ttl 'Element TTL'. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit b9e61f11f47035e3b4545b51fb547fef48eb3096 Author: Nick Kossifidis Date: Fri Dec 3 06:12:39 2010 +0200 ath5k: Include tx ack reporting on hw flags * Since we report tx acks to the protocol stack, add the needed flag to hw_flags. This way we'll also use the new AP probing mechanism. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit f0e134a53ad95ba7a393b299ae56c9bdcaed8aec Author: Nick Kossifidis Date: Fri Dec 3 06:09:38 2010 +0200 ath5k: Fix reporting of RX dma stop failure * Correctly report failure to stop RX DMA Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 344b54b971bc5578281264fb6896e13b4120352b Author: Nick Kossifidis Date: Fri Dec 3 06:07:13 2010 +0200 ath5k: Disable ANI during reset * Stop ANI durring reset to prevent false PHY error reports Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 19252ecb672d3f35959c576d1d26b9aca350f5bf Author: Nick Kossifidis Date: Fri Dec 3 06:05:19 2010 +0200 ath5k: Always free tx buffers before reset * Always free tx buffers before reset, since we also empty hw queues. If we don't and a queue gets stuck, we'll never decrease txq_len and sw will keep thinking the queue is still stuck even after reset. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 2d5311e4e8272fd398fc1cf278f12fd6dee4074b Author: Eric Dumazet Date: Wed Dec 1 20:46:24 2010 +0000 filter: add a security check at install time We added some security checks in commit 57fe93b374a6 (filter: make sure filters dont read uninitialized memory) to close a potential leak of kernel information to user. This added a potential extra cost at run time, while we can perform a check of the filter itself, to make sure a malicious user doesnt try to abuse us. This patch adds a check_loads() function, whole unique purpose is to make this check, allocating a temporary array of mask. We scan the filter and propagate a bitmask information, telling us if a load M(K) is allowed because a previous store M(K) is guaranteed. (So that sk_run_filter() can possibly not read unitialized memory) Note: this can uncover application bug, denying a filter attach, previously allowed. Signed-off-by: Eric Dumazet Cc: Dan Rosenberg Cc: Changli Gao Acked-by: Changli Gao Signed-off-by: David S. Miller commit ae9c416d686db74f67d73c1bebf1e3a7e8b3c5b5 Author: Changli Gao Date: Wed Dec 1 20:07:31 2010 +0000 net: arp: use assignment Only when dont_send is 0, arp_filter() is consulted, so we can simply assign the return value of arp_filter() to dont_send instead. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 6464281161e46254ac39505ad41d21dbe7d1738f Author: Sathya Perla Date: Wed Dec 1 01:04:17 2010 +0000 be2net: Handle out of buffer completions for lancer If Lancer chip does not have posted RX buffers, it posts an RX completion entry with the same frag_index as the last valid completion. The Error bit is also set. In BE, a flush completion is indicated with a zero value for num_rcvd in the completion. Such completions don't carry any data and are not processed. This patch refactors code to handle both cases with the same code. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 359a972fae84242efa26b86bf09c3ac3784405ba Author: Sathya Perla Date: Wed Dec 1 01:03:36 2010 +0000 be2net: FW init cmd fix for lancer Lancer can use the same pattern as BE to indicate a driver load to the FW. Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 63657b9c319588cd35ed869e19cc6255dbef0d20 Author: Sathya Perla Date: Wed Dec 1 01:02:28 2010 +0000 be2net: Fix be_dev_family_check() return value check Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit c56b4d90123b77e29a91b9b96bb791f929139d8e Author: Changli Gao Date: Wed Dec 1 02:52:57 2010 +0000 af_packet: remove pgv.flags As we can check if an address is vmalloc address with is_vmalloc_addr(), we remove pgv.flags. Then we may get more pg_vecs. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 0af55bb58f8fa7865004ac48d16affe125ac1b7f Author: Changli Gao Date: Wed Dec 1 02:52:20 2010 +0000 af_packet: use vmalloc_to_page() instead for the addresss returned by vmalloc() The following commit causes the pgv->buffer may point to the memory returned by vmalloc(). And we can't use virt_to_page() for the vmalloc address. This patch introduces a new inline function pgv_to_page(), which calls vmalloc_to_page() for the vmalloc address, and virt_to_page() for the __get_free_pages address. We used to increase page pointer to get the next page at the next page address, after Neil's patch, it is wrong, as the physical address may be not continuous. This patch also fixes this issue. commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit f7fce74e387e0563e5a165704664aa5ee8b2f48b Author: Eric Dumazet Date: Wed Dec 1 06:03:06 2010 +0000 net: kill an RCU warning in inet_fill_link_af() commits 9f0f7272 (ipv4: AF_INET link address family) and cf7afbfeb8c (rtnl: make link af-specific updates atomic) used incorrect __in_dev_get_rcu() in RTNL protected contexts, triggering PROVE_RCU warnings. Switch to __in_dev_get_rtnl(), wich is more appropriate, since we hold RTNL. Based on a report and initial patch from Amerigo Wang. Reported-by: Amerigo Wang Signed-off-by: Eric Dumazet Cc: Thomas Graf Reviewed-by: WANG Cong Signed-off-by: David S. Miller commit 06a9701f4b3e3381dea96fee1cc8a3bb41b0a1f1 Author: Eric Dumazet Date: Wed Dec 1 01:37:42 2010 +0000 __in_dev_get_rtnl() can use rtnl_dereference() If caller holds RTNL, we dont need a memory barrier (smp_read_barrier_depends) included in rcu_dereference(). Just use rtnl_dereference() to properly document the assertions. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit da2033c282264bfba4e339b7cb3df62adb5c5fc8 Author: Eric Dumazet Date: Tue Nov 30 21:45:56 2010 +0000 filter: add SKF_AD_RXHASH and SKF_AD_CPU Add SKF_AD_RXHASH and SKF_AD_CPU to filter ancillary mechanism, to be able to build advanced filters. This can help spreading packets on several sockets with a fast selection, after RPS dispatch to N cpus for example, or to catch a percentage of flows in one queue. tcpdump -s 500 "cpu = 1" : [0] ld CPU [1] jeq #1 jt 2 jf 3 [2] ret #500 [3] ret #0 # take 12.5 % of flows (average) tcpdump -s 1000 "rxhash & 7 = 2" : [0] ld RXHASH [1] and #7 [2] jeq #2 jt 3 jf 4 [3] ret #1000 [4] ret #0 Signed-off-by: Eric Dumazet Cc: Rui Acked-by: Changli Gao Signed-off-by: David S. Miller commit 539995d18649023199986424d140f1d620372ce5 Author: Joe Perches Date: Tue Nov 30 08:18:44 2010 +0000 ehea: Use the standard logging functions Remove ehea_error, ehea_info and ehea_debug macros. Use pr_fmt, pr_, netdev_ and netif_ as appropriate. Fix messages to use trailing "\n", some messages had an extra one as the old ehea_ macros added a trailing "\n". Coalesced long format strings. Uncompiled/untested. Signed-off-by: Joe Perches Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 7903264402546f45f9bac8ad2bfdb00d00eb124a Author: Michał Mirosław Date: Tue Nov 30 06:38:00 2010 +0000 net: Fix too optimistic NETIF_F_HW_CSUM features NETIF_F_HW_CSUM is a superset of NETIF_F_IP_CSUM+NETIF_F_IPV6_CSUM, but some drivers miss the difference. Fix this and also fix UFO dependency on checksumming offload as it makes the same mistake in assumptions. Signed-off-by: Michał Mirosław Acked-by: Jon Mason Signed-off-by: David S. Miller commit 900d495a189dc3ff5952b98a77d18e3018f8286c Author: Alexey Orishko Date: Mon Nov 29 23:23:28 2010 +0000 USB CDC NCM host driver The patch provides USB CDC NCM host driver support in the Linux Kernel. Changes: drivers/net/usb/cdc_ncm.c: - initial submission of the CDC NCM host driver; - verified on Intel 32/64 bit, Intel Atom, ST-Ericsson U8500 (ARM) - throughput measured over 100 Mbits duplex; - driver supports 16-bit NTB format only, but it is more than enough for transfers up to 64K; - driver can handle up to 32 datagrams in received NTB; - timer is used to collect several packets in Tx direction drivers/net/usb/Kconfig: - a new entry to compile CDC NCM host driver drivers/net/usb/Makefile: - a new entry to compile CDC NCM host driver Signed-off-by: Alexey Orishko Signed-off-by: David S. Miller commit 073285fd392f6dc901da7c698d46e1e2a7e26436 Author: Alexey Orishko Date: Mon Nov 29 23:23:27 2010 +0000 usbnet: changes for upcoming cdc_ncm driver Changes: include/linux/usb/usbnet.h: - a new flag to indicate driver's capability to accumulate IP packets in Tx direction and extract several packets from single skb in Rx direction. drivers/net/usb/usbnet.c: - the procedure of counting packets in usbnet was updated due to the accumulating of IP packets in the driver - no short packets are sent if indicated by the flag in driver_info structure Signed-off-by: Alexey Orishko Signed-off-by: David S. Miller commit d84938c9be85f4738a350ef44210789fef915cb7 Author: Nick Kossifidis Date: Fri Dec 3 06:03:00 2010 +0200 ath5k: Always write tx powertable on hw * By skipping tx power table calibration we also skip setting tx power table on hw. Make sure we always write tx power table on hw since it gets cleared on reset. Signed-off-by: Nick Kossifidis Tested-by: Sedat Dilek Signed-off-by: John W. Linville commit 04ac3c0ee2c773c321ec472d892635a20556f34d Author: Felix Fietkau Date: Thu Dec 2 21:01:08 2010 +0100 mac80211: speed up AP probing using nullfunc frames If the nullfunc frame used to probe the AP was not acked, there is no point in waiting for the probe timeout, so advance to the next try (or disconnect) immediately. If we do reach the probe timeout without having received a tx status, the connection is probably really bad and worth disconnecting. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 75706d0e9d19601534446982b70102bb9327169b Author: Felix Fietkau Date: Thu Dec 2 21:01:07 2010 +0100 mac80211: remove a redundant check ieee80211_is_nullfunc() implies ieee80211_is_data() Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit af5568843594fb71055debe36e521fa8072fcecc Author: Bruno Randolf Date: Thu Dec 2 19:50:37 2010 +0900 lib: Improve EWMA efficiency by using bitshifts Using bitshifts instead of division and multiplication should improve performance. That requires weight and factor to be powers of two, but i think this is something we can live with. Thanks to Peter Zijlstra for the improved formula! Signed-off-by: Bruno Randolf -- v2: use log2.h functions Signed-off-by: John W. Linville commit 5dcc03fe29537edd7819f5b121bf3d779693f37b Author: Bruno Randolf Date: Thu Dec 2 19:12:31 2010 +0900 ath5k: Use EWMA factor of 1024 instead of 1000 This prepares the only place which uses the EWMA library so far for the performance improved implementation coming up, which requires factor and weight to be a power of two. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 9a10a870e09f1fd50fd024d55232b4b72cf4e387 Author: Joe Perches Date: Wed Dec 1 09:37:55 2010 -0800 MAINTAINERS: Add ATH GENERIC UTILITIES This file pattern is not currently shown as maintained by atheros. Perhaps it should be? Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit c1ce5a74d113f221d40625bd3ad83df2db2695b7 Author: Helmut Schaa Date: Wed Dec 1 16:34:45 2010 +0100 mac80211: Update last_tx_rate only for data frames The last_tx_rate field was also updated for non-data frames that are often sent with a lower rate (for example management frames at 1 Mbps). This is confusing when the data rate is actually much higher. Hence, only update the last_tx_rate field with tx rate information gathered from last data frames. If the rate control algorithm filled in txrc.reported_rate we don't need to verify this information. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 5f79ed3b1aa7af260c82ba714b90907070aeca7a Merge: 09f921f 9f28ebc Author: John W. Linville Date: Mon Dec 6 15:52:27 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit f435d9eea01309aa7b6c1f134569a7b5957918ae Merge: 5ee4937 09f921f Author: John W. Linville Date: Mon Dec 6 15:35:34 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 991cfffa7c19aa648546aff666595af896e568ba Author: Feng Tang Date: Fri Dec 3 11:51:37 2010 +0800 x86, earlyprintk: Move mrst early console to platform/ and fix a typo Move the code to arch/x86/platform/mrst/. Also fix a typo to use the correct config option: ONFIG_EARLY_PRINTK_MRST Signed-off-by: Feng Tang Cc: alan@linux.intel.com LKML-Reference: <1291348298-21263-1-git-send-email-feng.tang@intel.com> Signed-off-by: Thomas Gleixner commit 0b9a214a606f8c7c7af3e66e7fe0caf3233cfe16 Author: Dimitris Papastamos Date: Mon Dec 6 15:49:20 2010 +0000 ASoC: soc-core: Remove useless inline function construct There is no need to mark this function as inline. Inline functions usually are small and concise functions that benefit from not needing to set up a stack frame and undergo a call/ret sequence upon each invocation. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 58818a77cd415e2f76607749de5a1ff24e58cefe Author: Dimitris Papastamos Date: Mon Dec 6 15:42:17 2010 +0000 ASoC: soc-core: Replace use of strncpy() with strlcpy() By using strncpy() if the source string does not have a null byte in the first n bytes, then the destination string is not null-terminated. This can be fixed in a two-step process by manually null-terminating the array after the use of strncpy() or by using strlcpy(). Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 589c3563f6476950f26b5bcc9beb1b39a7bcc644 Author: Jarkko Nikula Date: Mon Dec 6 16:27:07 2010 +0200 ASoC: Merge common code in DAI link and auxiliary codec probing/removal Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs" added much of code that can be shared with DAI link codec probing/removal. Merge now this common code into new soc_probe_codec, soc_remove_codec and soc_post_component_init functions. Error prints in these functions are converted to use dev_err and to print the error code. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5ee493767352314893520ac40aec5bb07d0147e0 Author: Matt Carlson Date: Mon Dec 6 08:28:54 2010 +0000 tg3: Update version to 3.116 This patch updates the tg3 version to 3.116. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit a386b9011a4687470e6168e2f2a08c468f25f72f Author: Matt Carlson Date: Mon Dec 6 08:28:53 2010 +0000 tg3: Relax EEE thresholds The hardware defaults to fairly aggressive EEE thresholds. While there appear to be no ill effects, this patch relaxes them, just as a precaution. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit a6b68dab169e2a51e59f43504f1279cbc2afcde8 Author: Matt Carlson Date: Mon Dec 6 08:28:52 2010 +0000 tg3: Minor EEE code tweaks The first hunk of this patch makes sure that the driver checks for the appropriate preconditions before checking if EEE negotiation succeeded. More specifically the link needs to be full duplex for EEE to be enabled. The second and third hunks of this patch fix a bug where the eee advertisement register would be programmed with extra bits set. The fourth hunk of this patch makes sure the EEE capability flag is not set for 5718 A0 devices and that the device is not a serdes device. None of these modifications are strictly necessary. The driver / hardware still does the right thing. They are submitted primarily for correctness. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 699c019385fcb13498a5a3a8bd368f04f1d4a223 Author: Matt Carlson Date: Mon Dec 6 08:28:51 2010 +0000 tg3: Fix 57765 EEE support EEE support in the 57765 internal phy will not enable after a phy reset unless it sees that EEE is supported in the MAC. This patch moves the code that programs the CPMU EEE registers to a place before the phy reset. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 3110f5f5545a645c50ef66b1f705d08dfd1df404 Author: Matt Carlson Date: Mon Dec 6 08:28:50 2010 +0000 tg3: Move EEE definitions into mdio.h In commit 52b02d04c801fff51ca49ad033210846d1713253 entitled "tg3: Add EEE support", Ben Hutchings had commented that the EEE advertisement register will be in a standard location. This patch moves that definition into mdio.h and changes the code to use it. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit 8fc2f9956127d2b85280c07e69aeb08b9bd85150 Author: Matt Carlson Date: Mon Dec 6 08:28:49 2010 +0000 tg3: Raise the jumbo frame BD flag threshold The current transmit routines set the jumbo frame BD flag too aggressively. This can reduce performance for common cases. This patch raises the jumbo flag threshold to 1518, up from 1500. Signed-off-by: Matt Carlson Reviewed-by: Benjamin Li Signed-off-by: David S. Miller commit df6bd743b6f06b066c1c3ba7f2853a6e8d61468c Author: Gustavo F. Padovan Date: Mon Jun 14 02:26:15 2010 -0300 Bluetooth: Don't accept ConfigReq if we aren't in the BT_CONFIG state If such event happens we shall reply with a Command Reject, because we are not expecting any configure request. Signed-off-by: Gustavo F. Padovan Signed-off-by: Marcel Holtmann commit f984ba4eb575e4a27ed28a76d4126d2aa9233c32 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:34 2010 +0900 kprobes: Use text_poke_smp_batch for unoptimizing Use text_poke_smp_batch() on unoptimization path for reducing the number of stop_machine() issues. If the number of unoptimizing probes is more than MAX_OPTIMIZE_PROBES(=256), kprobes unoptimizes first MAX_OPTIMIZE_PROBES probes and kicks optimizer for remaining probes. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Peter Zijlstra Cc: Steven Rostedt LKML-Reference: <20101203095434.2961.22657.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit cd7ebe2298ff1c3112232878678ce5fe6be8a15b Author: Masami Hiramatsu Date: Fri Dec 3 18:54:28 2010 +0900 kprobes: Use text_poke_smp_batch for optimizing Use text_poke_smp_batch() in optimization path for reducing the number of stop_machine() issues. If the number of optimizing probes is more than MAX_OPTIMIZE_PROBES(=256), kprobes optimizes first MAX_OPTIMIZE_PROBES probes and kicks optimizer for remaining probes. Changes in v5: - Use kick_kprobe_optimizer() instead of directly calling schedule_delayed_work(). - Rescheduling optimizer outside of kprobe mutex lock. Changes in v2: - Allocate code buffer and parameters in arch_init_kprobes() instead of using static arraies. - Merge previous max optimization limit patch into this patch. So, this patch introduces upper limit of optimization at once. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp Cc: Peter Zijlstra Cc: Steven Rostedt LKML-Reference: <20101203095428.2961.8994.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 7deb18dcf0478940ac979de002db1ed8ba6531dc Author: Masami Hiramatsu Date: Fri Dec 3 18:54:22 2010 +0900 x86: Introduce text_poke_smp_batch() for batch-code modifying Introduce text_poke_smp_batch(). This function modifies several text areas with one stop_machine() on SMP. Because calling stop_machine() is heavy task, it is better to aggregate text_poke requests. ( Note: I've talked with Rusty about this interface, and he would not like to expand stop_machine() interface, since it is not for generic use. ) Signed-off-by: Masami Hiramatsu Acked-by: Steven Rostedt Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: Jan Beulich Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095422.2961.51217.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 0490cd1f9d99569d3bd64e17adc88db06a5007be Author: Masami Hiramatsu Date: Fri Dec 3 18:54:16 2010 +0900 kprobes: Reuse unused kprobe Reuse unused (waiting for unoptimizing and no user handler) kprobe on given address instead of returning -EBUSY for registering a new kprobe. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095416.2961.39080.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6274de4984a630b45c6934b3ee62e5692c745328 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:09 2010 +0900 kprobes: Support delayed unoptimizing Unoptimization occurs when a probe is unregistered or disabled, and is heavy because it recovers instructions by using stop_machine(). This patch delays unoptimization operations and unoptimize several probes at once by using text_poke_smp_batch(). This can avoid unexpected system slowdown coming from stop_machine(). Changes in v5: - Split this patch into several cleanup patches and this patch. - Fix some text_mutex lock miss. - Use bool instead of int for behavior flags. - Add additional comment for (un)optimizing path. Changes in v2: - Use dynamic allocated buffers and params. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095409.2961.82733.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 61f4e13ffd85c037a942c5b7fd13f2b0c3162862 Author: Masami Hiramatsu Date: Fri Dec 3 18:54:03 2010 +0900 kprobes: Separate kprobe optimizing code from optimizer Separate kprobe optimizing code from optimizer, this will make easy to introducing unoptimizing code in optimizer. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095403.2961.91201.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6f0f1dd71953d4243c11e490dd49ef24ebaf6c0b Author: Masami Hiramatsu Date: Fri Dec 3 18:53:57 2010 +0900 kprobes: Cleanup disabling and unregistering path Merge disabling kprobe to unregistering kprobe function and add comments for disabing/unregistring process. Current unregistering code disables(disarms) kprobes after checking target kprobe status. This patch changes it to disabling kprobe first after that it changing the kprobe's state. This allows to share probe disabling code between disable_kprobe() and unregister_kprobe(). Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095356.2961.30152.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit 6d8e40a85ef72a0514ebd00748eb18cab432b200 Author: Masami Hiramatsu Date: Fri Dec 3 18:53:50 2010 +0900 kprobes: Rename old_p to more appropriate name Rename irrelevant uses of "old_p" to more appropriate names. Originally, "old_p" just meant "the old kprobe on given address" but current code uses that name as "just another kprobe" or something like that. This patch renames those pointer names to more appropriate one for maintainability. Signed-off-by: Masami Hiramatsu Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Ananth N Mavinakayanahalli Cc: Jason Baron Cc: Mathieu Desnoyers Cc: 2nddept-manager@sdl.hitachi.co.jp LKML-Reference: <20101203095350.2961.48110.stgit@ltc236.sdl.hitachi.co.jp> Signed-off-by: Ingo Molnar commit d0359c6fac18588da04fbefdad096453442653ee Author: Jeffrin Jose Date: Mon Dec 6 19:27:53 2010 +0530 sound: Fixed line limit issue in sound/ac97_bus.c This is a patch to the sound/ac97_bus.c file that fixes up a 80 character line limit issue found by the checkpatch.pl tool. Signed-off-by: Jeffrin Jose Signed-off-by: Takashi Iwai commit e4d2ebcab11b308b5b59073578efd33eccd55d46 Author: Feng Tang Date: Fri Dec 3 11:51:38 2010 +0800 x86, apbt: Setup affinity for apb timers acting as per-cpu timer Commit a5ef2e70 "x86: Sanitize apb timer interrupt handling" forgot the affinity setup when cleaning up the code, this patch just adds the forgotten part Signed-off-by: Feng Tang Cc: Jacob Pan Cc: Alan Cox LKML-Reference: <1291348298-21263-2-git-send-email-feng.tang@intel.com> Signed-off-by: Thomas Gleixner commit 5ec6960f6f0c7be9cc6e5506fdf0070add3b6e08 Author: Dirk Brandewie Date: Mon Nov 22 06:28:48 2010 -0800 ce4100: Add errata fixes for UART on CE4100 This patch enables the UART on the CE4100. The UART has a couple of issues that need to be worked around. First the UART is mostly PC compatible except that it is clocked eight times faster than a standard PC so the default configuration provided in arch/x86/include/asm/serial.h needs to be overridden. Second the TX interrupt may not be set correctly all the time. Lastly accessing the UART via I/O space for early_prink() hangs the chip when the IOAPIC is enabled. A custom mem_serial_in() is provided to work around the TX interrupt issue. The configuration issues are dealt with in the call back registered with the 8250 driver via serial8250_set_isa_configurator() Signed-off-by: Dirk Brandewie LKML-Reference: <1290436128-17958-1-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit ce47dc56a2241dc035160a85bc5e34283cdd622c Author: Chris Samuel Date: Sat Nov 13 13:35:06 2010 +1100 perf tools: Catch a few uncheck calloc/malloc's There were a few stray calloc()'s and malloc()'s which were not having their return values checked for success. As the calling code either already coped with failure or didn't actually care we just return -ENOMEM at that point. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Signed-off-by: Chris Samuel LKML-Reference: <4CDDF95A.1050400@csamuel.org> Signed-off-by: Arnaldo Carvalho de Melo commit 965bb6beaf70862d3846e330ea7a14996d82c499 Author: Stephane Eranian Date: Fri Dec 3 17:52:01 2010 +0200 perf script: Fix compiler warning in builtin_script.c:is_top_script() Fix annoying compiler warning in the is_top_script() function. The issue was that a const char * was cast into a char * to call ends_with(). We fix the users of ends_with() instead. Some are passing a char *, but it is okay to cast the return value of ends_with() to char * (because we understand what ends_with() does). Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter Cc: Stephane Eranian LKML-Reference: <4cf92096.17edd80a.1540.5d60@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit cbf41645f35224798cb61641766e6a16e141ffe4 Author: Thomas Gleixner Date: Sun Dec 5 14:32:55 2010 +0100 perf session: Sort all events if ordered_samples=true Now that we have timestamps on FORK, EXIT, COMM, MMAP events we can sort everything in time order. This fixes the following observed problem: mmap(file1) -> pagefault() -> munmap(file1) mmap(file2) -> pagefault() -> munmap(file2) Resulted in decoding both pagefaults in file2 because the file1 map was already replaced by the file2 map when the map address was identical. With all events sorted we decode both pagefaults correctly. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit e4e18d568b0e833c75c1f7833e1690cdde8f4d76 Author: Akihiro Nagai Date: Fri Dec 3 12:58:53 2010 +0900 perf options: add OPT_CALLBACK_DEFAULT_NOOPT Add new macro OPT_CALLBACK_DEFAULT_NOOPT for parse_options. It enables to pass the default value (opt->defval) to the callback function processing options require no argument. Reviewed-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Masami Hiramatsu Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20101203035853.7827.17502.stgit@localhost6.localdomain6> Signed-off-by: Akihiro Nagai Signed-off-by: Arnaldo Carvalho de Melo commit 1437a30aae865d83c7d96e3401f503a73fffe14d Author: Ian Munsie Date: Mon Dec 6 13:37:04 2010 +1100 perf hist: Better displaying of unresolved DSOs and symbols In the event that a DSO has not been identified, just print out [unknown] instead of the instruction pointer as we previously were doing, which is pretty meaningless for a shared object (at least to the users perspective). The IP we print out is fairly meaningless in general anyway - it's just one (the first) of the many addresses that were lumped together as unidentified, and could span many shared objects and symbols. In reality if we see this [unknown] output then the report -D output is going to be more useful anyway as we can see all the different address that it represents. If we are printing the symbols we are still going to see this IP in that column anyway since they shouldn't resolve either. This patch also changes the symbol address printouts so that they print out 0x before the address, are left aligned, and changes the %L format string (which relies on a glibc bug) to %ll. Before: 74.11% :3259 4a6c [k] 4a6c After: 74.11% :3259 [unknown] [k] 0x4a6c Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <1291603026-11785-2-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 0be732841fb925b6f1242211ea211c022b6ac26c Author: Chris Wilson Date: Mon Dec 6 14:36:27 2010 +0000 drm/i915: Wait for the bo if a display flip is pipelined on the other ring Signed-off-by: Chris Wilson commit 0ac74c6b3386f0413baf48f6d61850650e0dc4ab Author: Chris Wilson Date: Mon Dec 6 14:36:02 2010 +0000 drm/i915: Only emit a flush if there is an outstanding gpu write Signed-off-by: Chris Wilson commit 0afc8c733e95642ee9200966081da82564af8f8f Merge: 0d735ea 1dcb4f3 Author: Mark Brown Date: Mon Dec 6 14:14:47 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 Conflicts: include/linux/mfd/wm8994/pdata.h commit 0d735eaa2c1d80c997fd775b679e36b80b8e85d1 Author: Dimitris Papastamos Date: Mon Dec 6 09:51:57 2010 +0000 ASoC: soc-cache: Add optional cache name member to snd_soc_cache_ops Added an optional name member to snd_soc_cache_ops to enable more sensible diagnostic messages during cache init, exit and sync. Remove redundant newline in source code. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 9545cd85a6dd1cce793b309800d2a03af9a886a8 Author: Seungwhan Youn Date: Mon Dec 6 07:57:13 2010 +0900 ASoC: SAMSUNG: Remove duplicated snd_card on smdk_spdif This patch remove duplicated snd_card defination on smdk_spdif. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b0d8bef417eecc28f51f53bbac501c9984b3bcba Author: Seungwhan Youn Date: Mon Dec 6 07:56:59 2010 +0900 ASoC: SAMSUNG: Fix initial return value This patch fixed intial return value to be a '0' as asuccess on set_audio_clock_heirachy(). This avoids unintended error on initialize. Signed-off-by: Seungwhan Youn Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3028eb8c51d968b9e7b44a9786a4e521e37afb13 Author: Mark Brown Date: Sun Dec 5 12:22:46 2010 +0000 ASoC: Add trace events for jack detection As jack detection can trigger DAPM and the latency in debouncing can create confusing windows in operation provide some trace events which will hopefully help in diagnostics. The soc-jack core traces all reports that it gets and the resulting notifications to upper layers. An event for jack IRQs is also provided for instrumentation of debounce, and used in the GPIO jack code. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit de664936930dae5469170f7eed24bcff7e91ef82 Author: Clemens Ladisch Date: Thu Dec 2 11:42:48 2010 +0100 ALSA: oxygen: update hardware comments Reformat and update the comments that describe the hardware connections on the various models. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit e2943efa4fda376903974e33298b29091fc596b3 Author: Clemens Ladisch Date: Thu Dec 2 11:42:00 2010 +0100 ALSA: oxygen: show correct package ID Instead of the hardcoded "CMI8788", show the actual chip name. Note: This is neither what the chip is (it's always the same), nor what the chip is actually called. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 9719fcaa6a82be59a2d7767725e5cd8233c6a387 Author: Clemens Ladisch Date: Thu Dec 2 11:41:10 2010 +0100 ALSA: oxygen: allow to dump codec registers To help with debugging, add the registers of the model-specific codecs to the controller and AC97 register dump in the proc file. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit e96f38f732d24515792296b3738842934c985539 Author: Clemens Ladisch Date: Thu Dec 2 11:39:34 2010 +0100 ALSA: virtuoso: fix front panel routing for D1/DX/ST(X) The "Front Panel" switch on the Xonar D1/DX actually switches only the output direction, so mark it appropriately. The front panel microphone is controlled by the FMIC2MIC bit of the CM9780. It was unconditionally enabled on the D1/DX and never set on the ST(X); add a control for it. Selecting the front panel microphone as source does not actually disable the microphone jack, but this is bug-compatible with the Windows driver, and users rely on it. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 2509ec623d44320419d44d4060dbedf91b8d192d Author: Clemens Ladisch Date: Thu Dec 2 11:38:06 2010 +0100 ALSA: virtuoso: add HDMI enable switch for HDAV1.3 The GPIO bit that enables analog output on the Xonar HDAV1.3 also disables the HDMI audio output, so we better add a switch for it. Hopefully, this is sufficient to make the HDMI output work. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit f7e4bad74e1b18aaff6e89cf2bc4a3868a6ba56e Author: Clemens Ladisch Date: Thu Dec 2 11:36:51 2010 +0100 ALSA: virtuoso: initialize unknown GPIO bits Initialize the configuration of some unknown GPIO output bits (that might not be used at all) to be the same as in the Windows driver, just to be sure. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit a38c5380ef9f088be9f49b6e4c5d80af8b1b5cd4 Author: Sebastian Andrzej Siewior Date: Fri Nov 26 17:50:20 2010 +0100 x86: io_apic: Split setup_ioapic_ids_from_mpc() Sodaville needs to setup the IO_APIC ids as the boot loader leaves them uninitialized. Split out the setter function so it can be called unconditionally from the sodaville board code. Signed-off-by: Sebastian Andrzej Siewior Cc: Yinghai Lu LKML-Reference: <20101126165020.GA26361@www.tglx.de> Signed-off-by: Thomas Gleixner commit 1badabd980da3bc09933c14970017067940ecd57 Author: Mark Brown Date: Sat Dec 4 12:41:04 2010 +0000 ASoC: Add post-CODEC bias level callback for machine driver Currently the machine driver can only do bias level configuration before the CODEC bias level is brought up. This means that the machine cannot do any configuration which depends on the CODEC bias level being maintained. Provide a post-CODEC callback which allows the machine driver to do things like enable the FLL on a CODEC which is brought down to BIAS_OFF when idle. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 4a55c18e2023096c8684fae5fa1cfa96a03172ff Author: Will Deacon Date: Mon Nov 29 17:06:53 2010 +0000 ARM: hw_breakpoint: fix warnings generated by sparse sparse doesn't like per-cpu accesses such as: static DEFINE_PER_CPU(struct perf_event *, foo[MAXLEN]); struct perf_event **bar = __get_cpu_var(foo); and shouts quite loudly about it: | warning: incorrect type in assignment (different modifiers) | expected struct perf_event **slots | got struct perf_event *[noderef] * This patch adds casts to these sorts of assignments in hw_breakpoint.c in order to silence the warnings. Reported-by: Russell King Signed-off-by: Will Deacon commit ce9b1b09520789223f72a9fefd5f0e329f8d89d0 Author: Will Deacon Date: Thu Nov 25 12:59:31 2010 +0000 ARM: ptrace: fix style issue with hw_breakpoint interface This patch fixes a trivial style issue in ptrace.c. Signed-off-by: Will Deacon commit 3ce70b2e24cd35cc9f2df8cf5205b8ab4e6178e1 Author: Will Deacon Date: Wed Dec 1 17:05:24 2010 +0000 ARM: hw_breakpoint: disallow per-cpu breakpoints without overflow handler Single-stepping a breakpoint requires us to disable it temporarily so that we don't get stuck in a recursive debug trap. With per-cpu breakpoints this presents a problem where an interrupt can be taken before the single-step has completed and a new task is eventually scheduled. This new task will not hit the breakpoint because it will have been disabled during the previous handling code. This patch disallows per-cpu breakpoints on ARM when an overflow handler is not present. A similar effect can be created by placing breakpoints on a shell and then running applications there. Signed-off-by: Will Deacon commit 9ebb3cbcc39d4e61ae6751167086acfb5c201e6f Author: Will Deacon Date: Wed Dec 1 14:12:13 2010 +0000 ARM: hw_breakpoint: unify single-stepping code for watchpoints and breakpoints The single-stepping code is currently different depending on whether we are stepping over a breakpoint or a watchpoint. There is no good reason for this, so let's sort it out. This patch adds functions for enabling/disabling single-step for a particular hw_breakpoint and integrates this with the exception handling code. Signed-off-by: Will Deacon commit 93a04a3416da12647c47840ebe2bb812fcb801d0 Author: Will Deacon Date: Mon Nov 29 16:56:01 2010 +0000 ARM: hw_breakpoint: do not allocate new breakpoints with preemption disabled The watchpoint single-stepping code calls register_user_hw_breakpoint to register a mismatch breakpoint for stepping over the watchpoint. This is performed with preemption disabled, which is unsafe as we may end up scheduling whilst in_atomic(). Furthermore, using the perf API is rather overkill since we are already in the hw-breakpoint backend and only require access to reserved breakpoints anyway. This patch reworks the watchpoint stepping code so that we don't require another perf_event for the mismatch breakpoint. Instead, we hold a separate arch_hw_breakpoint_ctrl struct inside the watchpoint which is used exclusively for stepping. We can check whether or not stepping is enabled when installing or uninstalling the watchpoint and operate on the breakpoint accordingly. Signed-off-by: Will Deacon commit 0017ff42ac37ff6aeb87d0b006c5d32b9a39f5fc Author: Will Deacon Date: Sun Nov 28 15:09:36 2010 +0000 ARM: hw_breakpoint: don't advertise reserved breakpoints To permit handling of watchpoint exceptions without signalling a debugger, it is necessary to reserve breakpoint registers for in-kernel use only. This patch ensures that we record and subtract the number of reserved breakpoints from the number of usable breakpoint registers that we advertise to userspace via the ptrace API. Signed-off-by: Will Deacon commit 7e20269647169e7ea08a62bdc4979a3ba32e615c Author: Will Deacon Date: Sun Nov 28 14:57:24 2010 +0000 ARM: hw_breakpoint: disable preemption during debug exception handling On ARM, debug exceptions occur in the form of data or prefetch aborts. One difference is that debug exceptions require access to per-cpu banked registers and data structures which are not saved in the low-level exception code. For kernels built with CONFIG_PREEMPT, there is an unlikely scenario that the debug handler ends up running on a different CPU from the one that originally signalled the event, resulting in random data being read from the wrong registers. This patch adds a debug_entry macro to the low-level exception handling code which checks whether the taken exception is a debug exception. If it is, the preempt count for the faulting process is incremented. After the debug handler has finished, the count is decremented. Acked-by: Catalin Marinas Signed-off-by: Will Deacon commit 6ee33c2712fcdff2568d9bbadb25c8e5a7c36212 Author: Will Deacon Date: Thu Nov 25 12:01:54 2010 +0000 ARM: hw_breakpoint: correct and simplify alignment fixup code The current hw_breakpoint code tries to fix up the alignment of breakpoints so that we can make use of sparse byte-address-select bits in the control register and give the illusion that we can set breakpoints on unaligned addresses. Although this works on v6 cores, v7 forbids this behaviour, instead requiring breakpoints to be set on aligned addresses and have contiguous byte-address-select ranges depending on the instruction set in use. For ARM the only supported size is 4 bytes, whilst Thumb-2 also permits 2 byte breakpoints (watchpoints can be of 1, 2, 4 or 8 bytes long). This patch simplifies the alignment fixup code so that we require addresses to be aligned to the size of the corresponding breakpoint. This allows us to handle the common case of breaking on a half-word aligned Thumb-2 instruction and also allows us to set byte watchpoints on arbitrary addresses. Signed-off-by: Will Deacon commit 7d99331e4793b52d488e911876ef11d843c6c8c9 Author: Will Deacon Date: Wed Nov 24 17:45:49 2010 +0000 ARM: hw_breakpoint: reset control registers in hotplug path The ARMv7 debug architecture doesn't make any guarantees about the contents of debug control registers following a debug logic reset. This patch ensures that we reset the control registers when a cpu comes ONLINE (for example, with hotplug) so that when we enable monitor mode while inserting a breakpoint we won't exhibit random behaviour. Signed-off-by: Will Deacon commit ac88e07122fc0eb5cbad403be97ef02c317a06b7 Author: Will Deacon Date: Wed Nov 24 16:51:17 2010 +0000 ARM: hw_breakpoint: ensure OS lock is clear before writing to debug registers ARMv7 architects a system for saving and restoring the debug registers across low-power modes. At the heart of this system is a lock register which, when set, forbids writes to the debug registers. While locked, writes to debug registers via the co-processor interface will result in undefined instruction traps. Linux currently doesn't make use of this feature because we update the debug registers on context switch anyway, however the status of the lock is IMPLEMENTATION DEFINED on reset. This patch ensures that the lock is cleared during boot so that we can write to the debug registers safely. Signed-off-by: Will Deacon commit 0e44e059588e1d91f3a1974d2ce3348864d1d799 Merge: 96886c4 e8a7e48 Author: Sascha Hauer Date: Mon Dec 6 09:36:17 2010 +0100 Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 Done to resolve merge conflict: Conflicts: arch/arm/mach-mx25/devices-imx25.h Signed-off-by: Sascha Hauer commit 6bda10d152735c22baf1dcd92937420b4b0a359a Author: Chris Wilson Date: Sun Dec 5 21:04:18 2010 +0000 drm/i915: Completely disable fence pipelining. I'm still seeing tiling corruption of PutImage and CopyArea (I think) under mutter on pnv, so obviously the pipelining logic is deeply flawed. Signed-off-by: Chris Wilson commit 0cdab21f9a1fca50dd27e488839f5a6578e333b2 Author: Chris Wilson Date: Sun Dec 5 17:27:06 2010 +0000 drm/i915: Uncouple render/power ctx before suspending Signed-off-by: Chris Wilson commit 9b3826bf8420e7280d9fffa233d93a7b85dcb1db Author: Chris Wilson Date: Sun Dec 5 17:11:54 2010 +0000 drm/i915: Ignore fenced commands for gpu access on gen4 Userspace should not have been declaring that it needed fenced GPU access with gen4+ as those GPUs have no fenced commands, but to be on the safe side it is easier to ignore userspace in case they did. Signed-off-by: Chris Wilson commit e3c4e5dd5ad1993a3687862c982272f8f00cae30 Author: Chris Wilson Date: Sun Dec 5 16:49:51 2010 +0000 drm/i915: caps.has_rc6 is no longer used, remove it. Signed-off-by: Chris Wilson commit 3c8cdf9b60b98c5b408e2cfbcab3160e25e5af5a Author: Chris Wilson Date: Sun Dec 5 16:45:02 2010 +0000 drm/i915: Power Context register is only available for gen4 mobiles The ability to save the hardware context upon powering down the render clock through PWRCTXA is only available on a couple of gen4 chipsets. Signed-off-by: Chris Wilson commit 88f23b8fa3e6357c423af24ec31c661fc12f884b Author: Chris Wilson Date: Sun Dec 5 15:08:31 2010 +0000 drm/i915: Avoid using PIPE_CONTROL on Ironlake The workaround is hideous and we are using the STORE_DWORD on all other generations on all other rings, so use for the gen5 render ring as well. Signed-off-by: Chris Wilson commit 4a50bfe365a977f634311504484342fbfffe855c Author: Russell King Date: Sun Dec 5 23:06:22 2010 +0000 ARM: Ensure experimental options are so marked It is kernel-wide policy that options depending on EXPERIMENTAL should also have '(EXPERIMENTAL)' in their option text, and options with '(EXPERIMENTAL)' depend on EXPERIMENTAL. Ensure that all ARM options comply with this. Signed-off-by: Russell King commit 160b1543cdae83e9f8914ac7afc3d2bd686140af Author: Chris Wilson Date: Sun Dec 5 14:54:05 2010 +0000 drm/i915/dp: Trivial code tidy Locally scope the crtc to where it is used. Signed-off-by: Chris Wilson commit 36e9c135e2c485cabb24084834ec29efe928bb5c Author: Anssi Hannula Date: Sun Dec 5 02:34:15 2010 +0200 ALSA: hda - use generic hdmi parser for ATI R6xx codec Switch to the generic hdmi parser for codec id 1002:aa01 (ATI R6xx HDMI), as the codec appears to work fine with it. Note that the codec is still limited to stereo output only, despite it reportedly being multichannel capable. Some as of yet unknown quirks will be needed to get that working. Testing was done on 2.6.36 by John Ettedgui. Signed-off-by: Anssi Hannula Tested-by: John Ettedgui Signed-off-by: Takashi Iwai commit 5aa7d52aebfc11760bbc5b081ed621227bb77981 Merge: 382ab78 bbf0c6b Author: Chris Wilson Date: Sun Dec 5 10:43:39 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Immediate merge for the conflicting introduction of HAS_COHERENT_RINGS. Conflicts: drivers/gpu/drm/i915/i915_dma.c include/drm/i915_drm.h commit 3d09fbcd26851ffb2c40cec411b8e56db02520d1 Author: Kuninori Morimoto Date: Wed Dec 1 07:40:16 2010 +0100 ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. This is the board-specific portion of this patch-set. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman Acked-by: Magnus Damm Signed-off-by: Russell King commit 9a4af112bd252be801a433fc3bef793b7b487c3c Author: Kuninori Morimoto Date: Wed Dec 1 07:45:00 2010 +0100 ARM: 6515/1: Add zboot support for SuperH Mobile ARM When CONFIG_ZBOOT_ROM is selected, the resulting zImage file will be small boot loader and may be burned to rom or flash. This is the non-board-specific framework portion of this patch-set. Signed-off-by: Kuninori Morimoto Signed-off-by: Simon Horman Acked-by: Magnus Damm Signed-off-by: Russell King commit 0385ebc0c9b16fc2d8262c082843165313f7b1e4 Author: Russell King Date: Sat Dec 4 17:45:55 2010 +0000 ARM: move high-usage mostly read variables in setup.c to __read_mostly Signed-off-by: Russell King commit daf8741675562197d4fb4c4e9d773f53494203a5 Author: Russell King Date: Sat Dec 4 17:08:32 2010 +0000 ARM: implement support for read-mostly sections As our SMP implementation uses MESI protocols. Grouping together data which is mostly only read together means that we avoid unnecessary cache line bouncing when this code shares a cache line with other data. In other words, cache lines associated with read-mostly data are expected to spend most of their time in shared state. Signed-off-by: Russell King commit 0b05da7200dd56a5364c4d9cf5441715c1d706ed Author: Hans Ulli Kroll Date: Thu Dec 2 12:32:15 2010 +0100 ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI Today more boards with arm cpu have selectable pci bus. This patch makes this more scalable and remove line continuations in Kconfig Acked-by: Arnd Bergmann Signed-off-by: Hans Ulli Kroll Signed-off-by: Russell King commit 9c90a61c7e4286aa5a38b314a2d8f5a1e70b5135 Author: Arnaldo Carvalho de Melo Date: Thu Dec 2 10:25:28 2010 -0200 perf tools: Ask for ID PERF_SAMPLE_ info on all PERF_RECORD_ events So that we can use -T == --timestamp, asking for PERF_SAMPLE_TIME: $ perf record -aT $ perf report -D | grep PERF_RECORD_ 3 5951915425 0x47530 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff8138c1a2 period: 215979 cpu:3 3 5952026879 0x47588 [0x90]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff810cb480 period: 215979 cpu:3 3 5952059959 0x47618 [0x38]: PERF_RECORD_FORK(6853:6853):(16811:16811) 3 5952138878 0x47650 [0x78]: PERF_RECORD_SAMPLE(IP, 1): 16811/16811: 0xffffffff811bac35 period: 431478 cpu:3 3 5952375068 0x476c8 [0x30]: PERF_RECORD_COMM: find:6853 3 5952395923 0x476f8 [0x50]: PERF_RECORD_MMAP 6853/6853: [0x400000(0x25000) @ 0]: /usr/bin/find 3 5952413756 0x47748 [0xa0]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff810d080f period: 859332 cpu:3 3 5952419837 0x477e8 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44600000(0x21d000) @ 0]: /lib64/ld-2.5.so 3 5952437929 0x47840 [0x48]: PERF_RECORD_MMAP 6853/6853: [0x7fff7e1c9000(0x1000) @ 0x7fff7e1c9000]: [vdso] 3 5952570127 0x47888 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f46200000(0x218000) @ 0]: /lib64/libselinux.so.1 3 5952623637 0x478e0 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44a00000(0x356000) @ 0]: /lib64/libc-2.5.so 3 5952675720 0x47938 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f44e00000(0x204000) @ 0]: /lib64/libdl-2.5.so 3 5952710080 0x47990 [0x58]: PERF_RECORD_MMAP 6853/6853: [0x3f45a00000(0x246000) @ 0]: /lib64/libsepol.so.1 3 5952847802 0x479e8 [0x58]: PERF_RECORD_SAMPLE(IP, 1): 6853/6853: 0xffffffff813897f0 period: 1142536 cpu:3 First column is the cpu and the second the timestamp. That way we can investigate problems in the event stream. If the new perf binary is run on an older kernel, it will disable this feature automatically. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: <1291318772-30880-5-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit 640c03ce837fe8d4b56342aba376ea0da3960459 Author: Arnaldo Carvalho de Melo Date: Thu Dec 2 14:10:21 2010 -0200 perf session: Parse sample earlier At perf_session__process_event, so that we reduce the number of lines in eache tool sample processing routine that now receives a sample_data pointer already parsed. This will also be useful in the next patch, where we'll allow sample the identity fields in MMAP, FORK, EXIT, etc, when it will be possible to see (cpu, timestamp) just after before every event. Also validate callchains in perf_session__process_event, i.e. as early as possible, and keep a counter of the number of events discarded due to invalid callchains, warning the user about it if it happens. There is an assumption that was kept that all events have the same sample_type, that will be dealt with in the future, when this preexisting limitation will be removed. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: <1291318772-30880-4-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit c980d1091810df13f21aabbce545fd98f545bbf7 Author: Arnaldo Carvalho de Melo Date: Sat Dec 4 23:02:20 2010 -0200 perf events: Make sample_type identity fields available in all PERF_RECORD_ events If perf_event_attr.sample_id_all is set it will add the PERF_SAMPLE_ identity info: TID, TIME, ID, CPU, STREAM_ID As a trailer, so that older perf tools can process new files, just ignoring the extra payload. With this its possible to do further analysis on problems in the event stream, like detecting reordering of MMAP and FORK events, etc. V2: Fixup header size in comm, mmap and task processing, as we have to take into account different sample_types for each matching event, noticed by Thomas Gleixner. Thomas also noticed a problem in v2 where if we didn't had space in the buffer we wouldn't restore the header size. Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Peter Zijlstra Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6844c09d849aeb00e8ddfe9525e8567a531c22d0 Author: Arnaldo Carvalho de Melo Date: Fri Dec 3 16:36:35 2010 -0200 perf events: Separate the routines handling the PERF_SAMPLE_ identity fields Those will be made available in sample like events like MMAP, EXEC, etc in a followup patch. So precalculate the extra id header space and have a separate routine to fill them up. V2: Thomas noticed that the id header needs to be precalculated at inherit_events too: LKML-Reference: Tested-by: Thomas Gleixner Reviewed-by: Thomas Gleixner Acked-by: Ian Munsie Acked-by: Peter Zijlstra Acked-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: <1291318772-30880-2-git-send-email-acme@infradead.org> Signed-off-by: Arnaldo Carvalho de Melo commit 614b6780eb0c393d2fb49ff62d61f29b877bd07e Author: Thomas Gleixner Date: Fri Dec 3 16:24:32 2010 -0200 perf events: Fix event inherit fallout of precalculated headers The precalculated header size is not updated when an event is inherited. That results in bogus sample entries for all child events. Bug introduced in c320c7b. Cc: Frederic Weisbecker Cc: Ian Munsie Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 382ab78c0e4866eb9a812e9ba20d0f876d9634d6 Merge: f7746f0 49078f7 Author: Chris Wilson Date: Sun Dec 5 00:37:43 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit f7746f0e1f271fbc64b57c29873c47f73e28e5a0 Author: Chris Wilson Date: Sat Dec 4 23:48:40 2010 +0000 drm/i915: Enable self-refresh for Ironlake We disabled this a while ago as it was inexplicably broken. However, it now appears to work... Signed-off-by: Chris Wilson commit 1ec14ad3132702694f2e1a90b30641cf111183b9 Author: Chris Wilson Date: Sat Dec 4 11:30:53 2010 +0000 drm/i915: Implement GPU semaphores for inter-ring synchronisation on SNB The bulk of the change is to convert the growing list of rings into an array so that the relationship between the rings and the semaphore sync registers can be easily computed. Signed-off-by: Chris Wilson commit 340479aac697bc73e225c122a9753d4964eeda3f Author: Chris Wilson Date: Sat Dec 4 18:17:15 2010 +0000 drm/i915: Be paranoid and bail on resetting if we can't take the lock. This will declare the machine wedged, but is better than truly wedging the machine. Signed-off-by: Chris Wilson commit 4add75c43f39573edc884d46b7c2b7414f01171a Author: Chris Wilson Date: Sat Dec 4 17:49:46 2010 +0000 drm/i915: Allow LVDS to be on pipe A for Ironlake+ Previously we enabled this for gen4, only to have to revert it due to it causing a large number of spurious wakeups. Try again hoping that the hardware has become more sane in the mean time... Signed-off-by: Chris Wilson commit f684f5b48cd27a031928c137531aace728d765a6 Author: Chris Wilson Date: Sat Dec 4 17:22:41 2010 +0000 drm/i915: Re-enable RC6 for power-savings. Let's see if we've successfully cleared up all the bugs from last time... Signed-off-by: Chris Wilson commit c1858123dba4a9e40355363ac7a153ea23a5315d Author: Chris Wilson Date: Fri Dec 3 21:35:48 2010 +0000 drm/i915: Enable CB tuning of the Display PLL Magic numbers from the specs. This is supposed to allow the PLL some variance to improve jitter performance and VCO headroom across manufacturing and environmental variations. Signed-off-by: Chris Wilson commit a589b9f429ac0e5bcdebda0f74ee313d39d69b7f Author: Chris Wilson Date: Fri Dec 3 21:13:16 2010 +0000 drm/i915: Explain why we need to write DPLL twice ... it's because setting the Pixel Multiply bits only takes effect once the PLL is enabled and stable. Signed-off-by: Chris Wilson commit 17fe6981109e995f36723e4880a97d48fa38920a Author: Chris Wilson Date: Fri Dec 3 20:17:19 2010 +0000 drm/i915/lvds: Connect the PWM to the LVDS pipe ... and do not just assume to always use pipe B. Signed-off-by: Chris Wilson commit 0be035f3485379d812d617ee7eaa255cde97dbfa Author: Feng Tang Date: Thu Dec 2 17:14:30 2010 +0800 intel_mid_dma: add support for single item scatter-gather list Current driver's device_prep_slave_sg can't be used by DMAC2 even the sg list contains one item, this patch will enable DMAC2 to use this API. Signed-off-by: Feng Tang Acked-by: Vinod Koul Signed-off-by: Dan Williams commit ed60453fa8f8fc3d034dfdf10371a99cc6905626 Author: Rabin Vincent Date: Tue Nov 30 17:36:48 2010 +0100 ARM: 6511/1: ftrace: add ARM support for C version of recordmcount Depending on the compiler version, ARM GCC calls the mcount function either __gnu_mcount_nc or mcount. Acked-by: Steven Rostedt Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit cd3478f2bd8f2cec19f9247a8a9cd711cbe37683 Author: Rabin Vincent Date: Tue Nov 30 17:33:53 2010 +0100 ARM: 6509/1: ftrace: ignore any ftrace.o in C version of recordmcount arch/arm/kernel/ftrace.c references mcount like kernel/tracing/ftrace.c, so change the exclusion filter to match any ftrace.o. Acked-by: Steven Rostedt Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 961ec6daa7b14f376c30d447a830fa4783a2112c Author: Will Deacon Date: Thu Dec 2 18:01:49 2010 +0100 ARM: 6521/1: perf: use raw_spinlock_t for pmu_lock For kernels built with PREEMPT_RT, critical sections protected by standard spinlocks are preemptible. This is not acceptable on perf as (a) we may be scheduled onto a different CPU whilst reading/writing banked PMU registers and (b) the latency when reading the PMU registers becomes unpredictable. This patch upgrades the pmu_lock spinlock to a raw_spinlock instead. Reported-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit 4d6b7a779be34e1df296abc1dc555134a8cf34af Author: Will Deacon Date: Tue Nov 30 18:15:53 2010 +0100 ARM: 6512/1: perf: fix warnings generated by sparse Russell reported a number of warnings coming from sparse when checking the ARM perf_event.c files: | perf_event.c seems to also have problems too: | | CHECK arch/arm/kernel/perf_event.c | arch/arm/kernel/perf_event.c:37:1: warning: symbol 'pmu_lock' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:70:1: warning: symbol 'cpu_hw_events' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1006:1: warning: symbol 'armv6pmu_enable_event' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1113:1: warning: symbol 'armv6pmu_stop' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:1956:6: warning: symbol 'armv7pmu_enable_event' was not declared. Should it be static? | arch/arm/kernel/perf_event.c:3072:14: warning: incorrect type in argument 1 (different address spaces) | arch/arm/kernel/perf_event.c:3072:14: expected void const volatile [noderef] * | arch/arm/kernel/perf_event.c:3072:14: got struct frame_tail *tail | arch/arm/kernel/perf_event.c:3074:49: warning: incorrect type in argument 2 (different address spaces) | arch/arm/kernel/perf_event.c:3074:49: expected void const [noderef] *from | arch/arm/kernel/perf_event.c:3074:49: got struct frame_tail *tail This patch resolves these issues so we can live in silence again. Reported-by: Russell King Signed-off-by: Will Deacon Signed-off-by: Russell King commit b23065313297e750edd57ab6edfd36224826724e Author: Per Fransson Date: Fri Dec 3 10:53:38 2010 +0100 ARM: 6522/1: kexec: Add call to non-crashing cores through IPI When kexec is used to start a crash kernel the other cores are notified. These non-crashing cores will save their state in the crash notes and then do nothing. Signed-off-by: Per Fransson Signed-off-by: Russell King commit cd849ae9cd291117c0f7e0e8d531ab62a906e308 Author: Dave Martin Date: Wed Dec 1 18:05:14 2010 +0100 ARM: 6518/1: kexec: Fix crash_setup_regs() for ARMv7 and CONFIG_THUMB2_KERNEL * Fix kexec build failure with CONFIG_THUMB2_KERNEL. * Avoids deprecated/forbidden sp and pc usage in for ARMv7 onwards, retaining compatibility with older architecture versions. * The pc value saved to newregs is now aligned on a predictable instruction boundary. (stmia { ... pc } or str pc has implementation-defined results in most versions of the ARM architecutre, and is prohibited (unpredictable) in Thumb-2.) * Switch to named inline asm arguments (else I get readily confused ...) The resulting code should be compatible with all architecture versions >= v3, with or without CONFIG_THUMB2_KERNEL. Reviewed-by: Will Deacon Tested-by: Mika Westerberg Signed-off-by: Dave Martin Acked-by: Catalin Marinas Signed-off-by: Russell King commit 0946b8c5c5982088a26da7ad99e8bcf57f972fb5 Author: Dave Martin Date: Wed Dec 1 18:05:13 2010 +0100 ARM: 6517/1: kexec: Add missing memory clobber to inline asm in crash_setup_regs() Currently, the inline asm is passed &newregs->ARM_r0 as in input, when modifying multiple fields of newregs. It's plausible to assume that GCC will assume newregs->ARM_r0 is modified when passed the address, but unfortunately this assumption is incorrect. Also, GCC has no way to guess that the other ARM_r* fields are modified without the addition of a "memory" clobber. Signed-off-by: Dave Martin Acked-by: Catalin Marinas Acked-by: Will Deacon Signed-off-by: Russell King commit 8165984acf825917437debae519209073c32a5a7 Author: Tero Roponen Date: Wed Dec 1 20:04:20 2010 +0200 slub: Fix a crash during slabinfo -v Commit f7cb1933621bce66a77f690776a16fe3ebbc4d58 ("SLUB: Pass active and inactive redzone flags instead of boolean to debug functions") missed two instances of check_object(). This caused a lot of warnings during 'slabinfo -v' finally leading to a crash: BUG ext4_xattr: Freepointer corrupt ... BUG buffer_head: Freepointer corrupt ... BUG ext4_alloc_context: Freepointer corrupt ... ... BUG: unable to handle kernel NULL pointer dereference at 0000000000000008 IP: [] file_sb_list_del+0x1c/0x35 PGD 79d78067 PUD 79e67067 PMD 0 Oops: 0002 [#1] SMP last sysfs file: /sys/kernel/slab/:t-0000192/validate This patch fixes the problem by converting the two missed instances. Acked-by: Christoph Lameter Signed-off-by: Tero Roponen Signed-off-by: Pekka Enberg commit e2c8e425baa01a4c8e6ae1b90194ed3d3cde0c66 Author: Li Yang Date: Thu Nov 11 20:16:29 2010 +0800 fsldma: add support to 36-bit physical address Expand the dma_mask of fsldma device to 36-bit, indicating that the DMA engine can deal with 36-bit physical address and does not need the SWIOTLB to create bounce buffer for it when doing dma_map_*(). Signed-off-by: Li Yang Acked-by: Kumar Gala Signed-off-by: Dan Williams commit 3d44661ad1f6336345a9f7765afef6d0aeac543e Author: Roland Vossen Date: Wed Dec 1 21:38:31 2010 +0100 staging: brcm80211: added firmware validation Fix for https://bugzilla.kernel.org/show_bug.cgi?id=21872 New function wl_check_firmwares() checks validity of all firmware images loaded from user space. Signed-off-by: Roland Vossen Cc: stable Signed-off-by: Greg Kroah-Hartman commit fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 Merge: 367576b e3e9887 Author: Greg Kroah-Hartman Date: Fri Dec 3 12:12:29 2010 -0800 Merge branch 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 into work * 'sh/ehci' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6: sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects. usb: ehci-sh: Add missing ehci helpers. usb: ehci-sh: Fix up fault in shutdown path. sh: Add EHCI support for SH7786. usb: ehci-hcd: Add support for SuperH EHCI. usb: ohci-sh: Set IRQ as shared. commit 367576b813ed66a000e66ec18f7082bbc84c05d7 Merge: 16350a7 0607f86 Author: Greg Kroah-Hartman Date: Fri Dec 3 12:10:06 2010 -0800 Merge branch 'for-next' of git://gitorious.org/usb/usb into usb-next * 'for-next' of git://gitorious.org/usb/usb: usb: musb: gadget: prevent a NULL pointer dereference usb: musb: add names for IRQs in structure resource usb: musb: remove board_data parameter from musb_platform_init() commit 16350a7258a3158807f3fafe33f1bb22b8ddd127 Author: Namhyung Kim Date: Thu Dec 2 05:52:22 2010 +0900 uwb: fix compiler warning on i1480_est_id_table Annotate i1480_est_id_table as '__used' to fix following warning: CC drivers/uwb/i1480/i1480-est.o drivers/uwb/i1480/i1480-est.c:94: warning: ‘i1480_est_id_table’ defined but not used Signed-off-by: Namhyung Kim Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit fc33b0eb38ccbd3080a4885e8f742a72a085261d Author: Namhyung Kim Date: Thu Dec 2 05:52:21 2010 +0900 uwb: fix compiler warning on whcrc_id_table Annotate whcrc_id_table as '__used' to fix following warning: CC drivers/uwb/whc-rc.o drivers/uwb/whc-rc.c:452: warning: ‘whcrc_id_table’ defined but not used Signed-off-by: Namhyung Kim Cc: David Vrabel Signed-off-by: Greg Kroah-Hartman commit df4fedeaa623f6af0b72c0089000b5ea5540ed22 Author: Richard Röjfors Date: Wed Dec 1 11:53:00 2010 +0100 usb: g_audio: Fix crash at driver removal If g_audio fails to open the sound control device, it crashes at removal: Insertion: [ 4143.836536] g_audio gadget: unable to open sound control device file: /dev/snd/controlC0 [ 4143.836543] g_audio gadget: we need at least one control device [ 4143.836551] g_audio gadget: Linux USB Audio Gadget, version: Dec 18, 2008 [ 4143.836558] g_audio gadget: g_audio ready Removal: [ 4146.802643] BUG: unable to handle kernel paging request at 00023018 [ 4146.802655] IP: [] filp_close+0xa/0x5b [ 4146.802674] *pdpt = 0000000015426001 *pde = 0000000000000000 [ 4146.802684] Oops: 0000 [#1] PREEMPT SMP [ 4146.802692] last sysfs file: /sys/power/state [ 4146.802701] Modules linked in: g_audio(-) ioh_udc fuse asix usbnet [last unloaded: g_audio] [ 4146.802719] [ 4146.802728] Pid: 1394, comm: rmmod Not tainted 2.6.33.5-26.1-ivi #1 To be filled by O.E.M./To be filled by O.E.M. [ 4146.802738] EIP: 0060:[] EFLAGS: 00010206 CPU: 0 [ 4146.802746] EIP is at filp_close+0xa/0x5b [ 4146.802753] EAX: 00023000 EBX: 00023000 ECX: 00000046 EDX: df842680 [ 4146.802760] ESI: e071cd4c EDI: df842680 EBP: ddbbbef0 ESP: ddbbbee4 [ 4146.802768] DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068 [ 4146.802776] Process rmmod (pid: 1394, ti=ddbba000 task=dd95a4f0 task.ti=ddbba000) [ 4146.802782] Stack: [ 4146.802787] d540c280 e071cd4c df2bc000 ddbbbefc e071b82c df11e440 ddbbbf04 e071c622 [ 4146.802804] <0> ddbbbf28 e071c47f 00000008 e071cd74 df11e464 df2bc01c df2bc000 e071ce68 [ 4146.802822] <0> 00000880 ddbbbf38 e07fd1b8 e071cef0 00000000 ddbbbf40 e071b9f4 ddbbbf48 [ 4146.802842] Call Trace: [ 4146.802857] [] ? gaudio_cleanup+0x87/0xe0 [g_audio] [ 4146.802869] [] ? audio_unbind+0x8/0xc [g_audio] [ 4146.802881] [] ? composite_unbind+0x8d/0xcb [g_audio] [ 4146.802895] [] ? usb_gadget_unregister_driver+0x7b/0xc0 [ioh_udc] [ 4146.802908] [] ? usb_composite_unregister+0x15/0x17 [g_audio] [ 4146.802920] [] ? cleanup+0xd/0xf [g_audio] [ 4146.802932] [] ? sys_delete_module+0x185/0x1dd [ 4146.802944] [] ? do_page_fault+0x248/0x276 [ 4146.802956] [] ? sysenter_do_call+0x12/0x26 [ 4146.802962] Code: 12 5f 3a 00 8b 43 04 8b 40 0c 0f b3 30 3b 73 44 73 03 89 73 44 89 f8 e8 f1 61 3a 00 5b 5e 5f 5d c3 55 89 e5 57 89 d7 56 53 89 c3 <8b> 40 18 85 c0 75 0f 68 32 15 5e c1 31 f6 e8 52 39 3a 00 5a eb [ 4146.803058] EIP: [] filp_close+0xa/0x5b SS:ESP 0068:ddbbbee4 [ 4146.803071] CR2: 0000000000023018 [ 4146.803112] ---[ end trace 0989a7e023da0434 ]--- This patch makes sure not to assign the_card if gaudio_open_snd_dev fails, since the parent function will deallocate the card. Also make sure all filp's in gaudio_open_snd_dev is assigned NULL upon error and gaudio_close_snd_dev only cleanups when the filp's are non-NULL. Signed-off-by: Richard Röjfors Cc: David Brownell Signed-off-by: Greg Kroah-Hartman commit b62c99b17c2c513eaf6b77a76907a13a1beb86d3 Author: Emilio G. Cota Date: Fri Dec 3 14:20:51 2010 +0000 staging/vme_user: add missing calls to vme_master_free calls in .remove Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 4740a0846069f6d4cbba9e328a9d92e6dd76110d Author: Emilio G. Cota Date: Fri Dec 3 13:44:15 2010 +0000 staging/vme/vme_user: use __dev{init, exit} for .probe and .remove Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: Fixed checkpatch line length warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 1daa38d379932bde0d2036c2e10ced3e8842b74f Author: Emilio G. Cota Date: Fri Dec 3 09:05:08 2010 +0000 staging/vme_user: fix usage of the slave resources after they've been freed buf_unalloc() frees the memory buffers allocated with vme_alloc_consistent. The associated VME resource is needed in both vme_alloc_consistent and vme_free_consistent; however the slave VME resources are being freed before the calls to vme_free_consistent are made, which means the buffers are never returned. Fix this by freeing the VME resources only after the consistent buffers have been returned. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit ca44ac386181ba710a9ab6db900d6c1e5451b366 Author: Changli Gao Date: Mon Nov 29 22:48:46 2010 +0000 net: don't reallocate skb->head unless the current one hasn't the needed extra size or is shared skb head being allocated by kmalloc(), it might be larger than what actually requested because of discrete kmem caches sizes. Before reallocating a new skb head, check if the current one has the needed extra size. Do this check only if skb head is not shared. Signed-off-by: Changli Gao Cc: Eric Dumazet Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 289700dbc40c78741f17e2304ed4ac0db3c3afd3 Author: Don Skidmore Date: Fri Dec 3 03:32:58 2010 +0000 ixgbe: add support for new format of PBA numbers The new PBA format is stored as a string. This patch allows the driver to support both the old and new format. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dbffcb210f45239ea530e0a71470e48abefe4210 Author: Don Skidmore Date: Fri Dec 3 03:32:34 2010 +0000 ixgbe: add support for 82599 FCoE SKU Add both NIC and backplane support for FCoE enabled devices IDs. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 0b077feac00a8b7b0afbab3274b2e74b749bc917 Author: Don Skidmore Date: Fri Dec 3 03:32:13 2010 +0000 ixgbe: add WOL support for SFP+ subdevice This patch will add wake on LAN support to the dev/sub_dev 10FB 11A9. This will also include ixgbe ethtool support for this device. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit c6ecf39a10ceec3e97096e2a8d3eadcecd593422 Author: Don Skidmore Date: Fri Dec 3 03:31:51 2010 +0000 ixgbe: fix link behavior for SFP+ when driver is brought down We have had several requests to have ifconfig down command disable the SFP+ laser and thus make link go down. Likewise on ifconfig up the laser would be enabled and link would come up. This patch enables that behavior. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit e4d849b8113b0cf7b6ebfa9ee4c47bd514ea49d3 Author: Anirban Chakraborty Date: Thu Dec 2 20:42:08 2010 +0000 qlcnic: Updated driver version to 5.0.13 Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 40839129f77903cbbb7f232e2e2ab08dfe4a4f8d Author: Sritej Velaga Date: Thu Dec 2 20:41:56 2010 +0000 qlcnic: LICENSE file for qlcnic Signed-off-by: Sritej Velaga Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 091056b2ad04df09a3cb78a4c4ea098709b98eb3 Author: Amit Kumar Salecha Date: Thu Dec 2 20:41:43 2010 +0000 qlcnic: validate eswitch config values for PF Currently driver set default eswitch configuration values for PF function, instead of validating values sent by application. Signed-off-by: Amit Kumar Salecha Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 97319a270da37a5eab14a770f1417d8229245270 Author: Sucheta Chakraborty Date: Thu Dec 2 20:41:23 2010 +0000 qlcnic: Disable loopback support Loopback mode can not be supported in CNA mode. Removing it until FW is fixed. Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 28216bf48bbe4314a7a02b7c9822dbb26aca530c Merge: 4514e89 af745bd Author: Mark Brown Date: Fri Dec 3 17:28:29 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 7e300bc8e6736d41e7b92978f415572ac60fd59b Author: Ben Hutchings Date: Thu Dec 2 13:48:28 2010 +0000 sfc: Store MAC address from NVRAM in net_device::perm_addr For some reason we failed to make this change when perm_addr was introduced. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 02ebc26865c2755720d2ede90a5ab27c45741823 Author: Ben Hutchings Date: Thu Dec 2 13:48:20 2010 +0000 sfc: Use current MAC address, not NVRAM MAC address, for WoL filter Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4f3907e9a600a46d8c946469ce6636080310d12e Author: Steve Hodgson Date: Thu Dec 2 13:48:14 2010 +0000 sfc: When waking a stopped tx_queue, only lock that tx_queue Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 78d4189d6b000898db2d9a9d745468f1322cbc71 Author: Ben Hutchings Date: Thu Dec 2 13:47:56 2010 +0000 sfc: Update kernel-doc to match earlier move of Toeplitz hash key Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit cef68bde74f083d83c18ce870ed834e82ee0ae5a Author: Ben Hutchings Date: Thu Dec 2 13:47:51 2010 +0000 sfc: Move xmac_poll_required into struct falcon_nic_data Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 40641ed93cd53561f7d53b5fd5ed656b35f3aabd Author: Ben Hutchings Date: Thu Dec 2 13:47:45 2010 +0000 sfc: Move Falcon global event handling to falcon.c Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4833f02a2972b7da4c8a15e1e329db0f984a75d9 Author: Ben Hutchings Date: Thu Dec 2 13:47:35 2010 +0000 sfc: Move mdio_lock to struct falcon_nic_data We only have direct access to MDIO on Falcon, so move this out of struct efx_nic. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4de92180258ac661bbce0f0065c9c81633ac862b Author: Ben Hutchings Date: Thu Dec 2 13:47:29 2010 +0000 sfc: Move SPI state to struct falcon_nic_data We only have direct access to SPI on Falcon, so move all this state out of struct efx_nic. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 90b7a4ee610bf1d14120f5e0618ae2a3568394a5 Author: Ben Hutchings Date: Thu Dec 2 13:47:17 2010 +0000 sfc: Remove unnecessary inclusion of various private header files Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6a8872c54d177abd900a0cf165b76ecb4803f052 Author: Ben Hutchings Date: Thu Dec 2 13:47:10 2010 +0000 sfc: Expose Falcon BootROM config through MTD, not ethtool The ethtool EEPROM interface is really meant for exposing chip configuration, not BootROM configuration. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 6c88b0b6dc886e49c0e6ee21d677c2e380bde688 Author: Ben Hutchings Date: Thu Dec 2 13:47:01 2010 +0000 sfc: Remove broken automatic fallback for invalid Falcon chip/board config If the Falcon board config is invalid, we cannot proceed - we do not have a valid board type to pass to falcon_probe_board(), and if we kluge that to work with an unknown board then other initialisation code will crash. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 18e3ee2cf96adf072deeb291eed670f2c23bb2fc Author: Steve Hodgson Date: Thu Dec 2 13:46:55 2010 +0000 sfc: Fix event based MCDI completion and MC REBOOT/CMDDONE ordering issue The mcfw *never* sends CMDDONE when rebooting. Changing this so that it always sends CMDDONE *before* REBOOT is easy on Siena, but it's not obvious that we could guarantee to be able to implement this on future hardware. Given this, I'm less convinced that the protocol should be changed. To reiterate the failure mode: The driver sees this: issue command receive REBOOT event Was that reboot event sent before the command was issued, or in response to the command? If the former then there will be a subsequent CMDDONE event, if the latter, then there will be no CMDDONE event. Options to resolve this are: 1. REBOOT always completes an outstanding mcdi request, and we set the credits count to ignore a subsequent CMDDONE event with mismatching seqno. 2. REBOOT never completes an outstanding mcdi request. If there is no CMDDONE event then we rely on the mcdi timeout code to complete the outstanding request, incurring a 10s delay. I'd argue that (2) is tidier, but that incurring a 10s delay is a little needless. Let's go with (1). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 3157183a90fdbd686f939d2f032b675f7e9983d6 Author: Ben Hutchings Date: Thu Dec 2 13:46:37 2010 +0000 sfc: Clear RXIN_SEL when soft-resetting QT2025C When we enable PMA/PMD loopback this automatically sets RXIN_SEL (inverse polarity for RXIN). We need to clear that bit during the soft-reset sequence, as it is not done automatically. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit adc1d234116c22247e3886fb6e9bef450a0110f2 Author: Ben Hutchings Date: Thu Dec 2 13:46:31 2010 +0000 sfc: Read-to-clear LM87 alarm/interrupt status at start of day We do not want to shut down the board based on a fault that has already been cleared. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 71839f7d162f973f5931d30d1376a2dc5c0bed5a Author: Ben Hutchings Date: Thu Dec 2 13:46:24 2010 +0000 sfc: Distinguish critical and non-critical over-temperature conditions Set both the 'maximum' and critical temperature limits for LM87 hardware monitors on Falcon boards. Do not shut down a port until the critical temperature is reached, but warn as soon as the 'maximum' temperature is reached. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4484cd7dedecf59aee0775c6658f95bdee65f277 Author: Ben Hutchings Date: Thu Dec 2 13:46:14 2010 +0000 sfc: Fix condition for no-op in set_phy_flash_cfg() Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit f18ca364617d5e1fdd7300e025473496e397db4b Author: Ben Hutchings Date: Thu Dec 2 13:46:09 2010 +0000 sfc: Reduce log level for MCDI error response in efx_mcdi_rpc() Some errors are expected, e.g. when sending new commands to an MC running old firmware. Only the caller of efx_mcdi_rpc() can decide what is a real error. Therefore log the error responses with netif_dbg(). Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 4514e8997fbefd5befd6176ac9785e287b4daed4 Author: Mark Brown Date: Fri Dec 3 16:02:10 2010 +0000 ASoC: When disabling WM8994 FLL force a source selection When we disable the WM8994 FLL code path sharing means that we end up writing out a configuration. Currently this is the currently active input and output frequency (which causes snd_soc_update_bits() to suppress actual writes both immediately and in the common case where we reenable the same configuration later) but we allow machine drivers to pass through a source of zero. Since the register values written are one less than the source constants this causes corruption of other bitfields in the register. Fix this by using the most recently configured FLL source when none is provided. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit 062869382bb2821bb8482db1e67850dfd11296fb Author: Jassi Brar Date: Fri Dec 3 10:34:25 2010 +0900 ASoC: WM8580: Debug interface index We want the index of DAI's driver here. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 001ae4c0350a35e8358514326e5c3d165357979a Author: Mark Brown Date: Thu Dec 2 16:21:08 2010 +0000 ASoC: Constify struct snd_soc_codec_driver Allow the CODEC driver structure to be marked const by making all the APIs that use it do so. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fdf0f54dab8e401fd9bdd441c3fc4fa5c8837646 Author: Dimitris Papastamos Date: Thu Dec 2 16:11:06 2010 +0000 ASoC: soc-core: Allow machine drivers to override compress_type This patch allows machine drivers to override the compression type provided by the codec driver. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3335ddca9367675f4ee0bd50cc70402c4919a10d Author: Dimitris Papastamos Date: Thu Dec 2 16:11:05 2010 +0000 ASoC: soc-cache: Use reg_def_copy instead of reg_cache_default Make sure to use codec->reg_def_copy instead of codec_drv->reg_cache_default wherever necessary. This change is necessary because in the next patch we move the cache initialization code outside snd_soc_register_codec() and by that time any data marked as __devinitconst such as the original reg_cache_default array might have already been freed by the kernel. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4ccb3b4497ce01fab4933704fe21581e30fda1a5 Author: David Woodhouse Date: Fri Dec 3 16:36:34 2010 +0000 mtd: nand: Fix integer overflow in ONFI detection of chips >= 4GiB Signed-off-by: David Woodhouse commit ff819b8357df0ca9903ff7c9ad518b949c410123 Author: Dimitris Papastamos Date: Thu Dec 2 14:53:03 2010 +0000 ASoC: soc-core: Generalize snd_soc_prefix_map and rename to snd_soc_codec_conf The snd_soc_codec_conf struct now holds codec specific configuration information. A new configuration option has been added to allow machine drivers to override the compression type set by the codec driver. In the absence of providing an snd_soc_codec_conf struct or when providing one but not setting the compress_type member to anything, the one supplied by the codec driver will be used instead. In all other cases the one set in the snd_soc_codec_conf struct takes effect. Signed-off-by: Dimitris Papastamos Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 119bd789f6405b8bf351b58561d08d8fc4e2d10b Author: Dimitris Papastamos Date: Thu Dec 2 14:53:02 2010 +0000 ASoC: Change the base value of compress_type Ensure that the base value of compress_type starts at 1 so that we know whether the machine driver has provided a compress_type for overriding the codec supplied one. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 01039e4e63a8ea0d66fcfc71d7b99769bbbed9d6 Author: Roman Tereshonkov Date: Thu Dec 2 15:28:38 2010 +0200 mtd: onenand: bugfix for 2x mode bad block handling This bug becomes visible in 2x mode when chip->writesize is different from mtd->writesize (= 2 * chip->writesize). At this case the bad block information is read from the first and the third physical pages instead of the first and the second as specification states. Signed-off-by: Roman Tereshonkov Acked-by: Kyungmin Park Signed-off-by: David Woodhouse commit 23bbce34f47762ce944ea9b8b3b3e05e220c6a2e Author: Dimitris Papastamos Date: Thu Dec 2 14:53:01 2010 +0000 ASoC: Add compress_type as a member to snd_soc_codec We need to keep a copy of the compress_type supplied by the codec driver so that we can override it if necessary with whatever the machine driver has provided us with. The reason for not modifying the codec->driver struct directly is that ideally we'd like to keep it const. Adjust the code in soc-cache and soc-core to make use of the compress_type member in the snd_soc_codec struct. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8a8f632d8534d0c403831341450bd8db9e842f05 Author: Kyungmin Park Date: Thu Dec 2 09:24:16 2010 +0900 mtd: OneNAND: Fix 4KiB pagesize OOB handling Original 4KiB pagesize chip (SLC) doesn't support OOB operations at Spec. And it's also same at Flex-OneNAND. Remove the MLC macro if possible and use 4KiB pagesize macro since MLC has 4KiB pagesize. Signed-off-by: Kyungmin Park Signed-off-by: David Woodhouse commit b5602e86432aaf0cc90dd207bf74e3a2bfb5078b Author: Linus Walleij Date: Mon Nov 29 13:52:27 2010 +0100 mtd: FSMC NAND fix obvious speling errors Fix spelling in the interface file. Signed-off-by: Linus Walleij Signed-off-by: David Woodhouse commit 593cd8711221c9661dbf9beb2fb42fecca03e693 Author: Linus Walleij Date: Mon Nov 29 13:52:19 2010 +0100 mtd: FSMC NAND use the PrimeCell identifier macros The FSMC actually has a standard ARM PrimeCell ID register, and the "revision" part of that register contains the thing that the code is looking at. Reuse the infrastructure from the AMBA bus abstraction and rid local defines. Signed-off-by: Linus Walleij Signed-off-by: David Woodhouse commit 4ad916bca7c372110815e77c2db95fb2eb2f8ab3 Author: Linus Walleij Date: Mon Nov 29 13:52:06 2010 +0100 mtd: FSMC NAND remove PARTITION macro and fix compile noise This removes the PARTITION macro that David didn't like and also removes a local variable that was dangling unused in some #ifdefs by being a bit more clever. Signed-off-by: Linus Walleij Signed-off-by: David Woodhouse commit 6b2995b62eba81df0f7d0b4be5b782be623c13eb Author: Fabio Estevam Date: Fri Nov 26 14:31:44 2010 -0200 mtd: fix section mismatch on sst25l Building the kernel with 'make CONFIG_DEBUG_SECTION_MISMATCH=y´ resulted in: WARNING: vmlinux.o(.data+0x15938): Section mismatch in reference from the variable sst25l_driver to the function .init.text:sst25l_probe() The variable sst25l_driver references the function __init sst25l_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, Fix the section mismatch. Signed-off-by: Fabio Estevam Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 2ebf0622cdc5d2b51f22b68a0983d90df8a976c8 Author: Fabio Estevam Date: Tue Nov 23 17:02:13 2010 -0200 mtd: mxc_nand: Fix warning on nr_parts unused variable If CONFIG_MTD_PARTITIONS is not selected, then the following warning is generated: CC drivers/mtd/nand/mxc_nand.o drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_probe': drivers/mtd/nand/mxc_nand.c:1014: warning: unused variable 'nr_parts' Fix it by marking nr_parts as __maybe_unused. Signed-off-by: Fabio Estevam Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit eeda667a29698b9a4d16dce8979afc6f512f3c42 Author: Sergej.Stepanov@ids.de Date: Tue Nov 23 18:38:36 2010 +0100 mtd: fsl_elbc_nand: fix jffs2 problem after NAND-flash image record in u-boot This patch should fix the following problem: 1. the jffs2-image update in the u-boot was ok 2. first restart and first mount of the NAND-flash-partition was also ok 3. before the restart of controller there are no any activity on NAND-flash except of the jffs2_gcd_mtdX-process ... 4. BUT after the second restart the NAND-flash-partition could not be really used after the second mount, dmesg filled with messages: ... jffs2_scan_eraseblock(): Magic bitmask 0x1985 not found at 0x03ce0000: 0xc0ff instead jffs2_scan_eraseblock(): Magic bitmask 0x1985 not found at 0x03d00000: 0xc0ff instead .... Just for for info: the behaviour observed on mpc8313-based board with the large-page NAND. The only activity on NAND-flash was the garbage collector process, that looks for CLEANMARKER-nodes As Scott said it was broken by commit 3ab8f2a2e7011c5e83363b42950757e46ef06824 Signed-off-by: Sergej Stepanov -- Signed-off-by: David Woodhouse commit a7e93dcd9aacb3ef4acfcc4310577f3ae0741821 Author: Roman Tereshonkov Date: Tue Nov 23 14:17:17 2010 +0200 mtd: fix master device identification for mtd repartition Function mtd_has_master renamed as mtd_is_partition to follow the function logic. The patch fixes the problem of checking the right mtd device for partition creation. To delete partition checking is not needed here so as it is done in mtd_del_partition. By master we consider the mtd device which does not belong to any partition. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit e14feafbe0d5c6d64bb6fe4eba928cb57ac9a4c8 Author: Jason Liu Date: Fri Nov 19 16:40:45 2010 +0800 mtd: nand: add check for out of page read When run mtd_oobtest case, there will be one error for step(4), which turned out it need add one check for out of page read in nand_do_read_oob just like mtd_do_write_oob did it already. This commit also fix one typo error for comments in mtd_do_write_oob Signed-off-by: Jason Liu Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 1534b8b09757190ce6e97fa97f9ad77c49082cd8 Author: Randy Dunlap Date: Thu Nov 18 15:02:21 2010 -0800 mtd: fix nand kernel-doc warnings Warning(include/linux/mtd/nand.h:543): No description found for parameter 'badblockbits' Warning(drivers/mtd/nand/nand_bbt.c:1101): No description found for parameter 'mtd' Signed-off-by: Randy Dunlap Cc: David Woodhouse Cc: linux-mtd@lists.infradead.org Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit cc31822250236ec173bb2aa149ebe2ba35405db2 Author: Guillaume LECERF Date: Wed Nov 17 12:35:50 2010 +0100 mtd: cfi_fixup: remove unused 'param' parameter The 'param' parameter has never been used since its introduction, so simply remove it. Signed-off-by: Guillaume LECERF Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 027d9ac2c8de9f70b7319e08dee121b8b85c8d88 Author: Dan Carpenter Date: Mon Nov 15 21:20:05 2010 +0300 jffs2: typo in comment It says FB instead of FS (file system). Signed-off-by: Dan Carpenter Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f326966b3df47f4fa7e90425f60efdd30c31fe19 Author: Vasiliy Kulikov Date: Sun Nov 14 23:08:39 2010 +0300 jffs2: fix error value sign do_verify_xattr_datum(), do_load_xattr_datum(), load_xattr_datum() and verify_xattr_ref() should return negative value on error. Sometimes they return EIO that is positive. Change this to -EIO. Signed-off-by: Vasiliy Kulikov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 23079f94daabc4e06436ab2b643fac31dec017d1 Author: Joe Perches Date: Fri Nov 12 13:37:58 2010 -0800 mtd: nand: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f9a5279c70af10e967872e922b91310a91f87b05 Author: Joe Perches Date: Fri Nov 12 13:37:57 2010 -0800 mtd: maps: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 9118ea321ee320e3c670540122857ff0eba91e32 Author: Lars-Peter Clausen Date: Thu Nov 11 19:02:48 2010 +0100 mtd: NAND: jz4740: Remove custom {read,write}_page handlers Now that the mtd core supports more then 64 ecc bytes we can use it instead of some a custom hack in the jz4740 nand driver. This patch removes the custom {read,write}_page handlers from the jz4740 nand driver. Thus the driver will now fallback to the default handlers from the nand core. Signed-off-by: Lars-Peter Clausen Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit a338adafed0d09d823169161e938b1eab4dce901 Author: Lars-Peter Clausen Date: Thu Nov 11 19:02:47 2010 +0100 mtd: NAND: jz4740: Make 'struct platform_driver jz_nand_driver' static Signed-off-by: Lars-Peter Clausen Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit ce4a37f7c93e9b12ac1452bedd823d73c43c0e63 Author: Jesper Juhl Date: Tue Nov 9 00:09:02 2010 +0100 mtd: 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/mtd/ Signed-off-by: Jesper Juhl Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 65ab220c30bc2120eaa39753cadec68616e3f906 Author: Viresh Kumar Date: Mon Nov 8 11:17:54 2010 +0530 mtd: fsmc.h: including linux/io.h for definition of readl Signed-off-by: Viresh Kumar Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit a0c5a3944ce121bb2417c771f77b18485cd84e18 Author: Vasiliy Kulikov Date: Sat Nov 6 17:41:24 2010 +0300 mtd: mtdchar: fix information leak to userland Structure mtd_info_user is copied to userland with padding byted between "type" and "flags" fields uninitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit ac80dac00f8630803dc0c7f8fbe6983a8e2a8b5f Author: Roman Tereshonkov Date: Wed Nov 3 12:55:21 2010 +0200 mtd: onenand: implement cache program feature for 4KiB page onenand Implement cache program feature for 4KiB page onenand. This feature improves the write data performance. The observed 128KiB data program speed change is from 8827KiB/s to 14156 KiB/s when the feature is enabled. Signed-off-by: Roman Tereshonkov Acked-by: Mike Frysinger Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit d19d7b46d2b4936be14cfeef779ffeb76cf7b757 Author: Roman Tereshonkov Date: Wed Nov 3 12:55:20 2010 +0200 mtd: onenand: fix omap2 code to handle cache program feature Some fixes are introduced into omap2 code to handle errors when cache program feature is used. Signed-off-by: Roman Tereshonkov Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 3e3198f1adda8e0fbd499bde806781237d6c841f Author: Roman Tereshonkov Date: Wed Nov 3 12:55:19 2010 +0200 mtd: onenand: add option and variable for cache program feature A new option is added for cache program feature. A new variable ongoing is introduced for onenand_chip to handle the multi-command cache program operation. Signed-off-by: Roman Tereshonkov Acked-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 7ddbead6e6d3c730570a215ab9a6b1d126c54d34 Author: Joe Perches Date: Thu Nov 4 20:08:02 2010 -0700 jffs2: use vzalloc Signed-off-by: Joe Perches Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 309b5e4e4154721f8079bc250d2233fd4b3aa039 Author: Joe Perches Date: Thu Nov 4 20:07:40 2010 -0700 mtd: use vzalloc Signed-off-by: Joe Perches Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 08b3af3092bb2c284796e4e823c5309c2d0a9bca Author: Kyungmin Park Date: Tue Nov 2 10:28:46 2010 +0900 mtd: OneNAND: Fix page offset handling at 2KiB pagesize When use the 2KiB pagesize, it should be set the correct page offset. Signed-off-by: Kyungmin Park Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit daf05ec00c6e60a2c705820e7f93cbd31c804fe3 Author: srimugunthan Date: Sat Nov 13 12:46:05 2010 +0200 mtd: nandsim: spell fixes in comments Signed-off-by: srimugunthan Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit ac622f583dccb025250becd2d4e60badaf571713 Author: Kevin Cernekee Date: Sat Oct 30 21:11:04 2010 -0700 mtd: m25p80: Add support for Macronix MX25L25655E Untested, but expected to be compatible with MX25L25635E which I did test. Signed-off-by: Kevin Cernekee Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 4b7f7422b0331e802f8b7c593e058ccee981cff5 Author: Kevin Cernekee Date: Sat Oct 30 21:11:03 2010 -0700 mtd: m25p80: Add support for Macronix MX25L25635E This is a 256Mbit (32MiB) part so minor changes were made to support 4-byte addressing. Signed-off-by: Kevin Cernekee Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit f0dff9bd00d2cffea160fb3fa015b77607458634 Author: Kevin Cernekee Date: Sat Oct 30 21:11:02 2010 -0700 mtd: m25p80: Reinstate error print on unrecognized flash Commit b34bc037b26e621e5fc13466767e4da110a7b3d3 removed the "unrecognized JEDEC id" error message, causing the probe function to silently abort if the flash ID is unrecognized. It is desirable to produce diagnostic output in this situation so that the user has some idea what went wrong. Signed-off-by: Kevin Cernekee Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit b7b6e08f9265db56129931983fc6c06d62c9f4f9 Author: Grant Likely Date: Sat Oct 30 07:35:02 2010 +0100 mtd: Fix MTD_OF_PARTS for all arch and minor tidy of MTD_PARTITIONS MTD_OF_PARTS should be possible on all architectures, not just powerpc and microblaze, and it probably should not be a user selectable option. Neither does it need to be in a separate module. Also, rework MTD Kconfig to group options dependant on MTD_PARTITIONS into a if/endif block. Do the same for MTD_REDBOOT_PARTS. Signed-off-by: Grant Likely Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 3345cc4f6d779753810c7f13aab6b29417869548 Author: Guillaume LECERF Date: Fri Oct 29 16:17:49 2010 +0200 mtd: bcm963xx-flash: try JEDEC probe if CFI fails Signed-off-by: Guillaume LECERF Acked-by: Florian Fainelli Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse commit 287050d390264402e11bea8b811859e42e8faa29 Author: Steven Rostedt Date: Thu Dec 2 16:46:18 2010 -0500 tracing: Add TRACE_EVENT_CONDITIONAL() There are instances in the kernel that we only want to trace a tracepoint when a certain condition is set. But we do not want to test for that condition in the core kernel. If we test for that condition before calling the tracepoin, then we will be performing that test even when tracing is not enabled. This is 99.99% of the time. We currently can just filter out on that condition, but that happens after we write to the trace buffer. We just wasted time writing to the ring buffer for an event we never cared about. This patch adds: TRACE_EVENT_CONDITION() and DEFINE_EVENT_CONDITION() These have a new TP_CONDITION() argument that comes right after the TP_ARGS(). This condition can use the parameters of TP_ARGS() in the TRACE_EVENT() to determine if the tracepoint should be traced or not. The TP_CONDITION() will be placed in a if (cond) trace; For example, for the tracepoint sched_wakeup, it is useless to trace a wakeup event where the caller never actually wakes anything up (where success == 0). So adding: TP_CONDITION(success), which uses the "success" parameter of the wakeup tracepoint will have it only trace when we have successfully woken up a task. Acked-by: Mathieu Desnoyers Acked-by: Frederic Weisbecker Cc: Arjan van de Ven Cc: Thomas Gleixner Signed-off-by: Steven Rostedt commit 1db7ccdb2ef4dbd8df0e0f742c9da9b054d899ba Author: Takashi Iwai Date: Fri Dec 3 15:19:14 2010 +0100 ALSA: hda - Fix beep-tone on IDT 92HD87/88 codecs It sounds like a non-linear beep tone on my test machines... Signed-off-by: Takashi Iwai commit 1e1675e9c1342a841e87e5427e77da78e980da06 Author: Takashi Iwai Date: Fri Dec 3 14:58:37 2010 +0100 ALSA: hda - Enable beep for IDT92HD87 / 88 codecs These codecs have the digital beep widget in NID 0x21. Signed-off-by: Takashi Iwai commit c8a09ff8ca2235bccdaea8a52fbd5349646a8ba4 Author: Dave Chinner Date: Sat Dec 4 00:02:40 2010 +1100 xfs: convert log grant heads to atomic variables Convert the log grant heads to atomic64_t types in preparation for converting the accounting algorithms to atomic operations. his patch just converts the variables; the algorithmic changes are in a separate patch for clarity. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 1c3cb9ec07fabf0c0970adc46fd2a1f09c1186dd Author: Dave Chinner Date: Tue Dec 21 12:28:39 2010 +1100 xfs: convert l_tail_lsn to an atomic variable. log->l_tail_lsn is currently protected by the log grant lock. The lock is only needed for serialising readers against writers, so we don't really need the lock if we make the l_tail_lsn variable an atomic. Converting the l_tail_lsn variable to an atomic64_t means we can start to peel back the grant lock from various operations. Also, provide functions to safely crack an atomic LSN variable into it's component pieces and to recombined the components into an atomic variable. Use them where appropriate. This also removes the need for explicitly holding a spinlock to read the l_tail_lsn on 32 bit platforms. Signed-off-by: Dave Chinner commit 676ad98a06a629e6273819a54b70f3987044b608 Author: Jarkko Nikula Date: Fri Dec 3 09:18:22 2010 +0200 ASoC: Don't oops in soc_probe_aux_dev in case of missing codec Blind copy of codec finding algorithm from soc_bind_dai_link does not work in soc_probe_aux_dev if matching codec name is not found. In that case the code falls through and tries to start the probing procedure with invalid codec pointer. Fix this and add an error print showing the codec name that cannot be found. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4bd3a1f415affa4729856dca7e39c5093a9a954f Author: Axel Lin Date: Fri Dec 3 17:25:57 2010 +0800 ASoC: Fix inconsistent meaning of default case while checking alc5623->id In alc5623_i2c_probe(), the default case for checking alc5623->id behaves the same as case 0x23. However, In alc5623_probe() the default case for checking alc5623->id becomes to be the same as case 0x21. This makes the meaning of default case inconsistent. Since we have checked codec id in alc5623_i2c_probe() by comparing vid2 with id->driver_data, it is not possible to run into the default case now. In case we may add more supported devices to alc5623_i2c_table in the future, this patch changes the default case return -EINVAL to let people know that they should not run into this case. They should also add a new case accordingly for the new id. Signed-off-by: Axel Lin Acked-by: Arnaud Patard Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 43fa95caab86fec0af7333bda407dd14f0c2127c Author: Kuninori Morimoto Date: Fri Dec 3 17:38:03 2010 +0900 ASoC: sh: fsi: remove runtime register check from fsi_master_xxx Current FSI driver was checking register range on fsi_master_xxx function. This runtime check was added to avoid an illegal access from wrong/mistake implementation. But it is useless check under the correct implementation. This patch escape runtime check by using macro technique. If there is wrong implementation, it will be compile error. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e8c8b6318c3dad742d03b5fff5360729f7ac2e5a Author: Kuninori Morimoto Date: Fri Dec 3 17:37:55 2010 +0900 ASoC: sh: fsi: remove runtime register check from fsi_reg_xxx Current FSI driver was checking register range on fsi_reg_xxx function. This runtime check was added to avoid an illegal access from wrong/mistake implementation. But it is useless check under the correct implementation. This patch escape runtime check by using macro technique. If there is wrong implementation, it will be compile error. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 2b0e73025f74699e9cc9df60649fcc14cd02481b Author: Kuninori Morimoto Date: Fri Dec 3 17:37:44 2010 +0900 ASoC: sh: fsi: change fsi->mst_ctrl to master->a/b_mclk There was a strange part where fsi->xxx had been used for fsi_master_xxx function instead of master->xxx in current FSI. This patch modify it. Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 48d78e5879b9f9e1beed341f6a30add127f43907 Author: Kuninori Morimoto Date: Fri Dec 3 17:37:31 2010 +0900 ASoC: sh: fsi: remove fsi_master_write Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f7d711e3bb92fcf01ee14b7decf0059ac184efc2 Author: Kuninori Morimoto Date: Fri Dec 3 17:36:24 2010 +0900 ASoC: sh: fsi: clean up SPDIF defines Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c3acec2671cc448bc549b06b561ae2454238e9a0 Author: Mark Brown Date: Thu Dec 2 16:15:29 2010 +0000 ASoC: Move active copy of CODEC read and write into runtime structure We shouldn't be assigning to the driver structure (which really ought to be const, further patch to follow) though there's unlikely to be any actual problem except in the unlikely case that two devices with the same driver but different bus types appear in the same system. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 1ee46ebd0435d547c078859c719d7c892ff7ab2d Author: Mark Brown Date: Thu Dec 2 16:10:09 2010 +0000 ASoC: Make the DAI ops constant in the DAI structure Neither drivers nor the core should be fiddling with the actual ops structure at runtime. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a00f90f9306c06bee8e909628f39052bb3b0cc9e Author: Mark Brown Date: Thu Dec 2 16:24:24 2010 +0000 ASoC: Apostrophe patrol in soc-core.c Silly little grammar nit but it bugs the hell out of me. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a3de8ab8853c5a14e881f0a01aa31e3dc87fc304 Author: Takashi Iwai Date: Fri Dec 3 12:29:14 2010 +0100 ALSA: hda - Clean up cxt5066 port-D handling & co Instead of hard-coded magic numbers, properly define and use macros for improve the readability. Also, dell_automute is handled samely as thinkpad, since it also sets port_d_mode, too. Signed-off-by: Takashi Iwai commit 4c98ec1170b9c03d5e0f57688ce9f5cecffbd22b Merge: dc42717 3a25344 Author: Takashi Iwai Date: Fri Dec 3 12:27:47 2010 +0100 Merge branch 'fix/hda' into topic/hda commit a1087ef6abedf0bfd60e5e3fddf33192cb2c1325 Author: Julia Lawall Date: Wed Nov 24 15:54:18 2010 +0100 scripts/coccinelle: update for compatability with Coccinelle 0.2.4 For doubleinit.cocci, Coccinelle 0.2.4 requires a comma after ... in a field list. Coccinelle also now behaves gracefully when a definition is provided for a virtual that doesn't exist, so there is no need for the semantic patch code to check for this case. Updated the documentation to reflect the fact that the best results will now be obtained with Coccinelle version 0.2.4 or later. Signed-off-by: Julia Lawall commit 84f3c683c4d3f36d3c3ed320babd960a332ac458 Author: Dave Chinner Date: Fri Dec 3 22:11:29 2010 +1100 xfs: convert l_last_sync_lsn to an atomic variable log->l_last_sync_lsn is updated in only one critical spot - log buffer Io completion - and is protected by the grant lock here. This requires the grant lock to be taken for every log buffer IO completion. Converting the l_last_sync_lsn variable to an atomic64_t means that we do not need to take the grant lock in log buffer IO completion to update it. This also removes the need for explicitly holding a spinlock to read the l_last_sync_lsn on 32 bit platforms. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 2ced19cbae5448b720919a494606c62095d4f4db Author: Dave Chinner Date: Tue Dec 21 12:09:20 2010 +1100 xfs: make AIL tail pushing independent of the grant lock The xlog_grant_push_ail() currently takes the grant lock internally to sample the tail lsn, last sync lsn and the reserve grant head. Most of the callers already hold the grant lock but have to drop it before calling xlog_grant_push_ail(). This is a left over from when the AIL tail pushing was done in line and hence xlog_grant_push_ail had to drop the grant lock. AIL push is now done in another thread and hence we can safely hold the grant lock over the entire xlog_grant_push_ail call. Push the grant lock outside of xlog_grant_push_ail() to simplify the locking and synchronisation needed for tail pushing. This will reduce traffic on the grant lock by itself, but this is only one step in preparing for the complete removal of the grant lock. While there, clean up the formatting of xlog_grant_push_ail() to match the rest of the XFS code. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit eb40a87500ac2f6be7eaf8ebb35610e6d0e60e9a Author: Dave Chinner Date: Tue Dec 21 12:09:01 2010 +1100 xfs: use wait queues directly for the log wait queues The log grant queues are one of the few places left using sv_t constructs for waiting. Given we are touching this code, we should convert them to plain wait queues. While there, convert all the other sv_t users in the log code as well. Seeing as this removes the last users of the sv_t type, remove the header file defining the wrapper and the fragments that still reference it. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a69ed03c24d4a336c23b7116127713d5a8c5ac4d Author: Dave Chinner Date: Tue Dec 21 12:08:20 2010 +1100 xfs: combine grant heads into a single 64 bit integer Prepare for switching the grant heads to atomic variables by combining the two 32 bit values that make up the grant head into a single 64 bit variable. Provide wrapper functions to combine and split the grant heads appropriately for calculations and use them as necessary. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 663e496a720a3a9fc08ea70b29724e8906b34e43 Author: Dave Chinner Date: Tue Dec 21 12:06:05 2010 +1100 xfs: rework log grant space calculations The log grant space calculations are repeated for both write and reserve grant heads. To make it simpler to convert the calculations toa different algorithm, factor them so both the gratn heads use the same calculation functions. Once this is done we can drop the wrappers that are used in only a couple of place to update both grant heads at once as they don't provide any particular value. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 3f336c6fa17c2b3d14b3dd1bd6e64e9cc97b6359 Author: Dave Chinner Date: Tue Dec 21 12:02:52 2010 +1100 xfs: fact out common grant head/log tail verification code Factor repeated debug code out of grant head manipulation functions into a separate function. This removes ifdef DEBUG spagetti from the code and makes the code easier to follow. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 1054794198e39103cb986618c4c10ec2252b7089 Author: Dave Chinner Date: Tue Dec 21 12:02:25 2010 +1100 xfs: convert log grant ticket queues to list heads The grant write and reserve queues use a roll-your-own double linked list, so convert it to a standard list_head structure and convert all the list traversals to use list_for_each_entry(). We can also get rid of the XLOG_TIC_IN_Q flag as we can use the list_empty() check to tell if the ticket is in a list or not. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 9552e7f2f3dd13a7580e488a7a3582332daad4f5 Author: Dave Chinner Date: Mon Dec 20 12:36:15 2010 +1100 xfs: use AIL bulk delete function to implement single delete We now have two copies of AIL delete operations that are mostly duplicate functionality. The single log item deletes can be implemented via the bulk updates by turning xfs_trans_ail_delete() into a simple wrapper. This removes all the duplicate delete functionality and associated helpers. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e60599492990d1b52c70e9ed2f8e062fe11ca937 Author: Dave Chinner Date: Mon Dec 20 12:34:26 2010 +1100 xfs: use AIL bulk update function to implement single updates We now have two copies of AIL insert operations that are mostly duplicate functionality. The single log item updates can be implemented via the bulk updates by turning xfs_trans_ail_update() into a simple wrapper. This removes all the duplicate insert functionality and associated helpers. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 3013683253ad04f67d8cfaa25be708353686b90a Author: Dave Chinner Date: Mon Dec 20 12:03:17 2010 +1100 xfs: remove all the inodes on a buffer from the AIL in bulk When inode buffer IO completes, usually all of the inodes are removed from the AIL. This involves processing them one at a time and taking the AIL lock once for every inode. When all CPUs are processing inode IO completions, this causes excessive amount sof contention on the AIL lock. Instead, change the way we process inode IO completion in the buffer IO done callback. Allow the inode IO done callback to walk the list of IO done callbacks and pull all the inodes off the buffer in one go and then process them as a batch. Once all the inodes for removal are collected, take the AIL lock once and do a bulk removal operation to minimise traffic on the AIL lock. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 96886c4361f1ae3f6c775d7c9295e2d557101d0f Author: Arnaud Patard (Rtp) Date: Fri Nov 26 15:20:52 2010 +0100 iMX51: introduce IMX_GPIO_NR Currently, to define a GPIO number, we're using something like : #define EFIKAMX_PCBID0 (2*32 + 16) to define GPIO 3 16. This is not really readable and it's error prone imho (note the 3 vs 2). So, I'm introducing a new macro to define this in a better way. Now, the code sample become : #define EFIKAMX_PCBID0 IMX_GPIO_NR(3, 16) v2: - move to gpio.h - add parens & spaces - switch to IMX_GPIO_NR instead of MX51_GPIO_NR Signed-off-by: Arnaud Patard Cc: Amit Kucheria Cc: Sascha Hauer Cc: Eric Bénard Signed-off-by: Sascha Hauer commit b99545cb59dc0a55507100a1335f4fd0ed521032 Author: Fabio Estevam Date: Fri Nov 26 12:25:59 2010 -0200 ARM: mx5: dynamically allocate imx2-wdt devices Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit d94ed1287e11f91e4f4096838179984b0206be5e Author: Fabio Estevam Date: Fri Nov 26 12:25:58 2010 -0200 ARM: mx5: introduce SOC_IMX51 Introduce SOC_IMX51 to keep consistency with the other i.MX devices Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit abebbb468050ad63caed55fdb7a6bfce732e9a7f Author: Vasiliy Kulikov Date: Fri Nov 26 20:05:55 2010 +0300 arm: dma: check clk_get() result clk_get() may return ERR_PTR(), if so propagate return code as imx_dma_init() return code. Signed-off-by: Vasiliy Kulikov Signed-off-by: Sascha Hauer commit 0ef51953be84cf910cdf5d9a6b8ccb75fd3dd10c Author: Arnaud Patard (Rtp) Date: Fri Nov 26 15:27:53 2010 +0100 mx5: Fix efikamx build Commit 124bf94a "ARM: imx: fix name for functions adding sdhci-esdhc-imx devices" changed some devices and Kconfig entry and didn't change every places it should have. It's breaking efikamx build. I've fixed 3ds Kconfig entry as I believe it's broken there too. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 4c6c32b3f856346158161a8c9824b4dd2bff0893 Author: Uwe Kleine-König Date: Mon Nov 29 08:58:14 2010 +0100 ARM: mx25: fix offset for usb host controller In commit 2c20b9f (ARM: mx25: dynamically allocate mxc-ehci devices) I changed the offset to the value specified in the reference manual intending to test this change on hardware. This slipped through and now prooved to be wrong. So fix it and add a comment about the documentation being wrong. Reported-by: Jaume Ribot Cc: Michael Trimarchi Cc: Shawn Guo Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 29bb6afcb077bd153c7738e73840dde808132fb5 Author: Eric Bénard Date: Sat Nov 27 09:15:38 2010 +0100 plat-mxc/ehci.c: fix compile breakage commits 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 and 9e1dde33876ba83ad586c336647fff133d0f5472 renamed some defines but didn't fix all the places where these defines are used leading to a compile failure for USB on i.MX31, 35 and 27. Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 4e5cf41eeb254b7e50666496ac5697188b31320b Author: Sascha Hauer Date: Thu Nov 4 15:50:38 2010 +0100 ARM i.MX SDMA: Add ROM script addresses to platform_data Signed-off-by: Sascha Hauer commit 5b28aa319bba96987316425a1131813d87cbab35 Author: Sascha Hauer Date: Wed Oct 6 15:41:15 2010 +0200 dmaengine i.MX SDMA: Allow to run without firmware The SDMA firmware consists of a ROM part and a RAM part. The ROM part is always present in the SDMA engine and is sufficient for many cases. This patch allows to pass in platform data containing the script addresses in ROM, so loading a firmware is optional now. Signed-off-by: Sascha Hauer Acked-by: Dan Williams commit 66bde0b70aa2e348ac2c9b9626743c1402b9d466 Author: Dan Carpenter Date: Thu Oct 28 15:41:56 2010 +0200 dma/intel_mid_dma: remove unneeded null check Smatch complains because we dereference "mid" before checking it. It turns out that "mid" is always a valid pointer here so we can just remove the check. Signed-off-by: Dan Carpenter Signed-off-by: Dan Williams commit 0df7095205cbf6ea1cdfe6254e0d6a3b823caa3b Author: Russell King Date: Thu Dec 2 19:16:56 2010 +0000 ARM: SMP: remove IRQ-disabling for smp_cross_call() As we've now removed the spinlock and bitmask, we have nothing left which requires interrupts to be disabled when sending an IPI. All current IPI-sending implementations use the GIC, which also does not require interrupts disabled when calling gic_raise_softirq(). Remove the now unnecessary IRQ disable. Signed-off-by: Russell King commit 24480d980e9063b3ebd0dfdf2f396c305956c356 Author: Russell King Date: Mon Nov 15 09:54:18 2010 +0000 ARM: SMP: avoid using bitmasks and locks for IPIs, use hardware instead Avoid using bitmasks and locks in the percpu area for IPIs, and instead use individual software generated interrupts to identify the reason for the IPI. This avoids the problems of having spinlocks in the percpu area. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit ad3b6993b9c5482e8a2ec5aed181538c921fdcbd Author: Russell King Date: Mon Nov 15 09:42:08 2010 +0000 ARM: SMP: pass an ipi number to smp_cross_call() This allows us to use smp_cross_call() to trigger a number of different software generated interrupts, rather than combining them all on one SGI. Recover the SGI number via do_IPI. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit d92e04713c6323e09a0d0fdfa0d7cbcedb175e49 Author: Russell King Date: Mon Nov 15 09:36:18 2010 +0000 ARM: remove obsolete smp_cross_call_done() smp_cross_call_done() was removed long ago (see 78d236c - remove useless smp_cross_call_done()). Remove those which have been subsequently merged. Reviewed-by: Catalin Marinas Signed-off-by: Russell King commit f6d84f4a7df8057247a3f1723169586af3882436 Author: Magnus Damm Date: Fri Dec 3 07:22:31 2010 +0000 ARM: mach-shmobile: AG5 clock framework improvements This patch improves the state of the AG5 clock framework support. The main clock parent is automatically detected, but most of the clocks are not used by any driver or subsystem at this point. More work is needed for support of multi media hardware such as FSI and/or LCDC/MIPI-DSI. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c90821a26a8c90ad1e3116393b8a8260ab46bffb Author: Dave Chinner Date: Fri Dec 3 17:00:52 2010 +1100 xfs: consume iodone callback items on buffers as they are processed To allow buffer iodone callbacks to consume multiple items off the callback list, first we need to convert the xfs_buf_do_callbacks() to consume items and always pull the next item from the head of the list. The means the item list walk is never dependent on knowing the next item on the list and hence allows callbacks to remove items from the list as well. This allows callbacks to do bulk operations by scanning the list for identical callbacks, consuming them all and then processing them in bulk, negating the need for multiple callbacks of that type. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e677d0f9548e2245ee3c2977661ca8ca165af188 Author: Dave Chinner Date: Fri Dec 17 20:08:04 2010 +1100 xfs: reduce the number of AIL push wakeups The xfaild often tries to rest to wait for congestion to pass of for IO to complete, but is regularly woken in tail-pushing situations. In severe cases, the xfsaild is getting woken tens of thousands of times a second. Reduce the number needless wakeups by only waking the xfsaild if the new target is larger than the old one. Further make short sleeps uninterruptible as they occur when the xfsaild has decided it needs to back off to allow some IO to complete and being woken early is counter-productive. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 0e57f6a36f9be03e5abb755f524ee91c4aebe854 Author: Dave Chinner Date: Mon Dec 20 12:02:19 2010 +1100 xfs: bulk AIL insertion during transaction commit When inserting items into the AIL from the transaction committed callbacks, we take the AIL lock for every single item that is to be inserted. For a CIL checkpoint commit, this can be tens of thousands of individual inserts, yet almost all of the items will be inserted at the same point in the AIL because they have the same index. To reduce the overhead and contention on the AIL lock for such operations, introduce a "bulk insert" operation which allows a list of log items with the same LSN to be inserted in a single operation via a list splice. To do this, we need to pre-sort the log items being committed into a temporary list for insertion. The complexity is that not every log item will end up with the same LSN, and not every item is actually inserted into the AIL. Items that don't match the commit LSN will be inserted and unpinned as per the current one-at-a-time method (relatively rare), while items that are not to be inserted will be unpinned and freed immediately. Items that are to be inserted at the given commit lsn are placed in a temporary array and inserted into the AIL in bulk each time the array fills up. As a result of this, we trade off AIL hold time for a significant reduction in traffic. lock_stat output shows that the worst case hold time is unchanged, but contention from AIL inserts drops by an order of magnitude and the number of lock traversal decreases significantly. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit f689b34bfbd2154a8fa255060dd872a6db3b4742 Author: Miloslav Trmač Date: Fri Dec 3 13:51:52 2010 +0800 include: Install linux/if_alg.h for user-space crypto API Signed-off-by: Miloslav Trmač Signed-off-by: Herbert Xu commit eb3efa1249b6413be930bdf13d10b6238028a440 Author: Dave Chinner Date: Fri Dec 3 16:42:57 2010 +1100 xfs: clean up xfs_ail_delete() xfs_ail_delete() has a needlessly complex interface. It returns the log item that was passed in for deletion (which the callers then assert is identical to the one passed in), and callers of xfs_ail_delete() still need to invalidate current traversal cursors. Make xfs_ail_delete() return void, move the cursor invalidation inside it, and clean up the callers just to use the log item pointer they passed in. While cleaning up, remove the messy and unnecessary "/* ARGUSED */" comments around all these functions. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit b199c8a4ba11879df87daad496ceee41fdc6aa82 Author: Dave Chinner Date: Mon Dec 20 11:59:49 2010 +1100 xfs: Pull EFI/EFD handling out from under the AIL lock EFI/EFD interactions are protected from races by the AIL lock. They are the only type of log items that require the the AIL lock to serialise internal state, so they need to be separated from the AIL lock before we can do bulk insert operations on the AIL. To acheive this, convert the counter of the number of extents in the EFI to an atomic so it can be safely manipulated by EFD processing without locks. Also, convert the EFI state flag manipulations to use atomic bit operations so no locks are needed to record state changes. Finally, use the state bits to determine when it is safe to free the EFI and clean up the code to do this neatly. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 9c5f8414efd5eeed9f498d4170337a3eb126341f Author: Dave Chinner Date: Mon Dec 20 11:57:24 2010 +1100 xfs: fix EFI transaction cancellation. XFS_EFI_CANCELED has not been set in the code base since xfs_efi_cancel() was removed back in 2006 by commit 065d312e15902976d256ddaf396a7950ec0350a8 ("[XFS] Remove unused iop_abort log item operation), and even then xfs_efi_cancel() was never called. I haven't tracked it back further than that (beyond git history), but it indicates that the handling of EFIs in cancelled transactions has been broken for a long time. Basically, when we get an IOP_UNPIN(lip, 1); call from xfs_trans_uncommit() (i.e. remove == 1), if we don't free the log item descriptor we leak it. Fix the behviour to be correct and kill the XFS_EFI_CANCELED flag. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 2e5702aff39532662198459726c624d5eadbdd78 Author: Francisco Jerez Date: Fri Nov 19 18:08:47 2010 +1000 drm/nouveau: fabricate DCB encoder table for iMac G4 In typical Apple fashion there's no standard information about what encoders are present on this machine, this patch adds a quirk to provide it. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 7f4a195fcbd8b16f25f1de7f1419414d7505daa5 Author: Ben Skeggs Date: Tue Nov 16 11:50:09 2010 +1000 drm/nouveau: tidy up and extend dma object creation interfaces Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 6d6c5a157af45a5bd50ab913b07d826811a9ea0a Author: Ben Skeggs Date: Tue Nov 16 10:17:53 2010 +1000 drm/nouveau: remove some useless GETPARAMs These have been unused since UMS support was ripped out, so lets remove them completely. Signed-off-by: Ben Skeggs commit 2cb3d3b6c64d37514fd8865748de66ff35a489af Author: Ben Skeggs Date: Mon Nov 15 16:28:19 2010 +1000 drm/nv84: fix minor issues in PCRYPT implementation Fix running of destroy_context() when create_context() has never been called for the channel, and fill in engine's tlb_flush() function pointer. Signed-off-by: Ben Skeggs commit 7b4808bb6ee63c9cc9c9be5a52f0c7babfc50659 Author: Ben Skeggs Date: Mon Nov 15 12:54:57 2010 +1000 drm/nouveau: remove dummy page use from PCI(E)GART, use PTE present instead Signed-off-by: Ben Skeggs commit 9fea1bcbff037cb61f71e0d699180030b1f509a5 Author: Ben Skeggs Date: Mon Nov 15 12:52:23 2010 +1000 drm/nv50: fix 0x100c90 init for NVAF Signed-off-by: Ben Skeggs commit 20f63afe988a25b0a4d991e87b41f76ee14e2a84 Author: Ben Skeggs Date: Mon Nov 15 12:50:50 2010 +1000 drm/nv50: allocate page for unknown PFB object in nv50_fb.c Signed-off-by: Ben Skeggs commit e41115d0ad5c40a7ea4d85b1c77b4c02185a5581 Author: Ben Skeggs Date: Mon Nov 1 11:45:02 2010 +1000 drm/nouveau: rework gpu-specific instmem interfaces Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit dc1e5c0dbff27c2b5147eaea16c578d2337870c3 Author: Ben Skeggs Date: Mon Oct 25 15:23:59 2010 +1000 drm/nouveau: simplify gpuobj suspend/resume Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit fce2bad0ee2666d6a10bfeb634b1021469cc3d79 Author: Ben Skeggs Date: Thu Nov 11 16:14:56 2010 +1000 drm/nv50: rework PGPIO IRQ handling and hotplug detection Allows callers to install their own handlers for when a GPIO line changes state (such as for hotplug detect). This also fixes a bug where we weren't acknowledging the GPIO IRQ until after the bottom half had run, causing a severe IRQ storm in some cases. Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit e4cbadcaaa4678020e37ca93502942ffdf9aef80 Author: Ben Skeggs Date: Thu Nov 11 13:59:05 2010 +1000 drm/nv04-nv40: unregister irq handler on destroy Signed-off-by: Ben Skeggs commit 274fec93cdd627408a799519fa602f2eecb14d2f Author: Ben Skeggs Date: Wed Nov 3 13:16:18 2010 +1000 drm/nouveau: tidy+move PGRAPH ISRs to their respective *_graph.c files Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 5178d40dff23b5eef7f0a3be2411fa6a347e750d Author: Ben Skeggs Date: Wed Nov 3 10:56:05 2010 +1000 drm/nouveau: move PFIFO ISR into nv04_fifo.c Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 25b85783da8c71e577c676173e9d60a1b7e6113a Author: Ben Skeggs Date: Wed Nov 3 11:36:09 2010 +1000 drm/nv04-nv40: register vblank isr Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 8cbe71a6e70b5439ae60bd542231c4b8878a8f1c Author: Ben Skeggs Date: Wed Nov 3 10:45:48 2010 +1000 drm/nouveau: move bitfield/enum helpers to nouveau_util.c Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 19b7fc7bf59f4bf02ee738a79baaccae31220df3 Author: Ben Skeggs Date: Wed Nov 3 10:27:27 2010 +1000 drm/nv50: use register/unregister functionality for PDISPLAY ISR Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 2cbd4c818578ef8f2e486dc77267ead1e503c637 Author: Ben Skeggs Date: Wed Nov 3 10:18:04 2010 +1000 drm/nv50: move GPIO ISR to nv50_gpio.c Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit d7facf9dc50acff69de9688088caa78b3cf69ebb Author: Ben Skeggs Date: Wed Nov 3 10:06:43 2010 +1000 drm/nv84: move PCRYPT ISR out of nouveau_irq.c Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 8f8a54482b008714ccfad15f4592b3802b80d479 Author: Ben Skeggs Date: Wed Nov 3 09:57:28 2010 +1000 drm/nouveau: allow irq handlers to be installed by engine-specific code Lets start to clean up this mess! Reviewed-by: Francisco Jerez Signed-off-by: Ben Skeggs commit a169f09b96306cc353ffe0e1bc4bc0e1e9492281 Author: Ben Skeggs Date: Fri Nov 5 09:40:00 2010 +1000 drm/nv50: 0x50c0 apparently works on NVA3+ too, so lets allow it Signed-off-by: Ben Skeggs commit aa2c2e8039e3692065022a7ff885009b2d88818a Author: Ben Skeggs Date: Thu Nov 4 13:40:15 2010 +1000 drm/nv50: fix compute object class Signed-off-by: Ben Skeggs commit 23c45e8ed203f933753fb66a6290c4ff853eb7bb Author: Francisco Jerez Date: Thu Oct 28 23:10:29 2010 +0200 drm/nouveau: Fix sleep while atomic in nouveau_bo_fence(). Reported-by: Pekka Paalanen Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 87a326a38589e1c919af5f86a59cd571ff0aa831 Author: Francisco Jerez Date: Sun Oct 24 16:36:12 2010 +0200 drm/nv20: Add Z compression support. Signed-off-by: Francisco Jerez Tested-by: Xavier Chantry Signed-off-by: Ben Skeggs commit a5cf68b04b2b8ea716cf6fd8499c1c54d05fdf5e Author: Francisco Jerez Date: Sun Oct 24 16:14:41 2010 +0200 drm/nouveau: Rework tile region handling. The point is to share more code between the PFB/PGRAPH tile region hooks, and give the hardware specific functions a chance to allocate per-region resources. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit e419cf0954901bb3a987f8b76cbc9654ca06121c Author: Francisco Jerez Date: Mon Oct 25 23:38:59 2010 +0200 drm/nouveau: Add a separate class for the kernel channel mutex. nouveau_bo_move_m2mf() needs to lock the kernel channel, and it may be called from the pushbuf IOCTL with an user channel already locked. Use a separate subclass for the kernel channel mutex because this is legitimate mutex nesting. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 1f6d2de2c539df6fe52ad2187191a9dfe10c7233 Author: Francisco Jerez Date: Sun Oct 24 14:15:58 2010 +0200 drm/nv50: Keep track of the head a channel is vsync'ing to. In a multihead setup vblank interrupts may end up enabled in both heads. In that case we want to ignore the vblank interrupts coming from the wrong CRTC to avoid tearing and unbalanced calls to drm_vblank_get/put (fdo bug 31074). Reported-by: Felix Leimbach Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 1c180fa5bd5f264e4863bb88861e8cd7d135b917 Author: Francisco Jerez Date: Mon Oct 25 03:30:34 2010 +0200 drm/nouveau: Call drm_vblank_pre/post_modeset() around mode setting. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 332b242f47786d1a43bd7a19a0513dd5d493db8e Author: Francisco Jerez Date: Wed Oct 20 23:35:40 2010 +0200 drm/nouveau: Implement the pageflip ioctl. nv0x-nv4x should be mostly fine, nv50 doesn't work yet. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 042206c0cd4924879c4292c5ffa2bf1e8023ae5a Author: Francisco Jerez Date: Thu Oct 21 18:19:29 2010 +0200 drm/nouveau: Implement the vblank DRM hooks. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 63f7fcfebd2ff1995b649101d6120b60fa0e5b06 Author: Francisco Jerez Date: Fri Oct 22 04:31:02 2010 +0200 drm/nv04: Make CRTC base changes effective in the next hsync. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 382d62e524db528cdf53563ad9a018adc170dfde Author: Marcin Slusarz Date: Wed Oct 20 21:50:24 2010 +0200 drm/nouveau: fix annoying nouveau_fence type issue nouveau_fence_* functions are not type safe, which could lead to bugs. Additionally every use of nouveau_fence_unref had to cast struct nouveau_fence to void **. Fix it by renaming old functions and creating static inline functions with new prototypes. We still need old functions, because we pass function pointers to ttm. As we are wrapping functions, drop unused "void *arg" parameter where possible. Signed-off-by: Marcin Slusarz Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 5f80198e43cf96542923269ccb607052e5f144cc Author: Ben Skeggs Date: Fri Oct 22 08:44:09 2010 +1000 drm/nv50: regression fix, point NVAA/NVAC at correct PM functions Signed-off-by: Ben Skeggs commit 35fa2f2ad161024e735fb0cd571cb92e50171afd Author: Ben Skeggs Date: Thu Oct 21 14:07:03 2010 +1000 drm/nouveau: add support for MSI Only supported on NV50+ so far, and disabled by default currently. The module parameter "msi=1" will enable it. There's a kernel bug which will cause this to fail if the module (or the NVIDIA binary driver) has ever been loaded before loading nouveau with MSI enabled. As such, this is only safe to enable if you have nouveau load on boot, and don't wish to ever reload it. The workaround is to "echo 0 > /sys/bus/pci/devices//enable" until the enable count reads 0. Then you should be able to load nouveau with MSI enabled. Signed-off-by: Ben Skeggs commit 01d63187d1aad6236dd229d5824c61a60f1ab42c Author: Ben Skeggs Date: Thu Oct 21 11:37:21 2010 +1000 drm/nv10: fix thinko and let nv17 do 3d again :) Signed-off-by: Ben Skeggs commit 8888cb18ffd1f32c51e61ca8d3d179c3c3946d1e Author: Ben Skeggs Date: Wed Oct 20 15:35:28 2010 +1000 drm/nv50: fix evo instmem alignment Not an issue right now, we're forced to 64k size/alignment by the BO allocator anyway. This won't be the case soon. Signed-off-by: Ben Skeggs commit 97e2000f757c19bb53e032320669f9a0d0b2a989 Author: Ben Skeggs Date: Wed Oct 20 14:23:29 2010 +1000 drm/nv50: improve evo error handler when more than just channel 0 active Signed-off-by: Ben Skeggs commit 43ce028ff2b1df68c690f0af14a109288d3e9e86 Author: Ben Skeggs Date: Tue Oct 19 18:01:41 2010 +1000 drm/nv50: rework evo init to match nvidia more closely Signed-off-by: Ben Skeggs commit 1e96268aca1bb40f42bdbc9d2293b123b072f1de Author: Ben Skeggs Date: Tue Oct 19 14:18:06 2010 +1000 drm/nv50: initial work to allow multiple evo channels This doesn't work yet for unknown reasons. Signed-off-by: Ben Skeggs commit b7bc613a4cc08d867b43189c2af0bb83b1fa1dc6 Author: Ben Skeggs Date: Tue Oct 19 13:05:51 2010 +1000 drm/nv50: move evo handling to nv50_evo.c Signed-off-by: Ben Skeggs commit 106ddad5aa8e8e03503cea05f9a64611f849952f Author: Ben Skeggs Date: Tue Oct 19 11:14:17 2010 +1000 drm/nv50: clearer separation of the stages of evo init Signed-off-by: Ben Skeggs commit f4512e6579ddaa9b1f8ab1d5659131243ffc421f Author: Ben Skeggs Date: Wed Oct 20 11:47:09 2010 +1000 drm/nv50: create graph and crypt contexts on demand This really needs cleaning up somehow, and probably investigate what's needed to do this on earlier generations. NVIDIA do something similar there too. Signed-off-by: Ben Skeggs commit 3052be2cea64371300a0338d3ca5d3575fbd109c Author: Ben Skeggs Date: Wed Oct 20 11:46:38 2010 +1000 drm/nv50: remove excessive alignment of graph/crypt contexts Signed-off-by: Ben Skeggs commit bd2e597de8dbd000a3977871f15cb81e2925d63e Author: Ben Skeggs Date: Tue Oct 19 20:06:01 2010 +1000 drm/nv84: add support for the PCRYPT engine Signed-off-by: Ben Skeggs commit b8c157d3a9a13871742c8a8d3d4598c3791ed5f5 Author: Ben Skeggs Date: Wed Oct 20 10:39:35 2010 +1000 drm/nouveau: only expose the object classes that are supported by the chipset We previously added all the available classes for the entire generation, even though the objects wouldn't work on the hardware. Signed-off-by: Ben Skeggs commit a6a1a38075661bec189f2bad7912f8861e6ce357 Author: Ben Skeggs Date: Tue Oct 19 19:57:34 2010 +1000 drm/nouveau: use object class structs more extensively The structs themselves, as well as the non-sw object creation function are probably very misnamed now. That's a problem for later :) Signed-off-by: Ben Skeggs commit 50536946faaf3d9ac0245838eb09e5eb1065b06c Author: Ben Skeggs Date: Tue Oct 19 19:47:06 2010 +1000 drm/nouveau: store engine type in gpuobj class structs We will eventually want to address hw engines other than PGRAPH. Signed-off-by: Ben Skeggs commit 9100468d1be26063aa25ecd667ea922c101d203f Author: Ben Skeggs Date: Fri Oct 15 09:15:26 2010 +1000 drm/nouveau: pass gpuobj alignment request down into backing allocator Signed-off-by: Ben Skeggs commit 0541324abce0225a795222558fdfe35c8dbc5b4f Author: Francisco Jerez Date: Mon Oct 18 16:15:15 2010 +0200 drm/nv40: Ignore sync-to-vblank active when waiting for idle. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 889fa93dc0ab94b9255e9dd8e2036facfee5485e Author: Francisco Jerez Date: Mon Oct 18 03:57:19 2010 +0200 drm/nouveau: Take fence spinlock in nouveau_fence_channel_fini(). Without it there's a potential race with nouveau_fence_update(). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 2b478addc0bfaaf5031e36ee166c9457ceae628c Author: Francisco Jerez Date: Mon Oct 18 03:56:40 2010 +0200 drm/nouveau: Avoid race in the interchannel sync code. It needs a "strong" channel reference because it actually writes to the channel pushbuf, otherwise the corresponding FIFO context could get kicked off in the middle of nouveau_fence_sync(). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 2a6789ae5e8a6b25a0835834655205166a757a81 Author: Francisco Jerez Date: Mon Oct 18 03:56:14 2010 +0200 drm/nouveau: Make fences take a weak channel reference. Fences didn't increment the channel reference count, and the fenced channel could go away at any time. Fixes a potential race in nouveau_fence_update(). Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit f091a3d403065416b7d27221bbeb956481132ffd Author: Francisco Jerez Date: Mon Oct 18 03:55:48 2010 +0200 drm/nouveau: Implement weak channel references. nouveau_channel_ref() takes a "weak" channel reference that doesn't prevent the hardware channel resources from being released, it just keeps the channel data structure alive. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 36c952e8b3bad911ef13111058f0a5c4b361027e Author: Francisco Jerez Date: Mon Oct 18 03:01:34 2010 +0200 drm/nouveau: Fix lock unbalance on card take down. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit feeb0aecfb73b5b7699c0a85ba1650e6f9c50be2 Author: Francisco Jerez Date: Mon Oct 18 02:58:04 2010 +0200 drm/nouveau: Add unlocked variants of nouveau_channel_get/put. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit f175b745b50c5c5356e8b3b409b7f38aa44de6bb Author: Francisco Jerez Date: Mon Oct 18 03:54:33 2010 +0200 drm/nouveau: Fix race condition in channel refcount handling. nouveau_channel_put() can be executed after the 'refcount == 0' check in nouveau_channel_get() and before the channel reference count is incremented. In that case CPU0 will take the context down while CPU1 thinks it owns the channel and 'refcount == 1'. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit 3945e47543863385b54d94c94b023ee7ca9df972 Author: Francisco Jerez Date: Mon Oct 18 03:53:39 2010 +0200 drm/nouveau: Refactor context destruction to avoid a lock ordering issue. The destroy_context() engine hooks call gpuobj management functions to release the channel resources, these functions use HARDIRQ-unsafe locks whereas destroy_context() is called with the HARDIRQ-safe context_switch_lock held, that's a lock ordering violation. Push the engine-specific channel destruction logic into destroy_context() and let the hardware-specific code lock and unlock when it's actually needed. Change the engine destruction order to avoid a race in the small gap between pgraph and pfifo context uninitialization. Reported-by: Marcin Slusarz Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit fcccab2e4eb8d579837481054cc2cb28eea0baef Author: Francisco Jerez Date: Thu Oct 14 21:55:23 2010 +0200 drm/nouveau: Use lazy fence waits when doing software interchannel sync. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit aa5ac7358c010dcb5916d1d0c2651ae65a4f7ab7 Author: Francisco Jerez Date: Thu Oct 14 20:37:56 2010 +0200 drm/nouveau: Leave BO eviction synchronization for later. The pushbuf ioctl syncs after validation, no need for this anymore. Signed-off-by: Francisco Jerez Signed-off-by: Ben Skeggs commit cbb4b608b603c7fba4c1cf5b298d1aa23d3fdd22 Author: Ben Skeggs Date: Mon Oct 18 12:34:04 2010 +1000 drm/nv50: remove some unnecessary PDISPLAY init Signed-off-by: Ben Skeggs commit 9acc8100cb14b91d446a482fdd0cf7e3ccbcf930 Author: Ben Skeggs Date: Thu Oct 14 14:55:23 2010 +1000 drm/nouveau: fallback to sw fbcon if we can't get mutex immediately Signed-off-by: Ben Skeggs commit 6032649df9f456f379be8d51f64488cacbfa8317 Author: Ben Skeggs Date: Tue Oct 12 12:31:32 2010 +1000 drm/nouveau: hook up acpi power supply change tracking Not used at all yet, but lets hook it up now anyway. Signed-off-by: Ben Skeggs commit 18a16a768c3d37f5bfdbb414217b530294d5d442 Author: Ben Skeggs Date: Tue Oct 12 10:11:00 2010 +1000 drm/nouveau: return error from nouveau_ramht_remove() if not found Signed-off-by: Ben Skeggs commit 938c40ed69b2c1eceb72247b5e8975b28afc195f Author: Ben Skeggs Date: Tue Oct 12 09:54:54 2010 +1000 drm/nouveau: use interruptible waits during pushbuf validation Signed-off-by: Ben Skeggs commit 08cd3d4311fb9c5038bc6fb0c83c250cfb218da2 Author: Ben Skeggs Date: Tue Oct 12 08:01:59 2010 +1000 drm/nouveau: fix thinko in channel locking in semaphore path Signed-off-by: Ben Skeggs commit 21e86c1c8a844bf978f8fc431a59c9f5a578812d Author: Ben Skeggs Date: Mon Oct 11 11:48:45 2010 +1000 drm/nouveau: remove cpu_writers lock No other driver uses this, and userspace should be responsible for handling locking between them if they share BOs. Signed-off-by: Ben Skeggs commit b12120a58e06cc6b799494c80215e418c14f9f5f Author: Ben Skeggs Date: Wed Oct 6 16:20:17 2010 +1000 drm/nouveau: switch to unlocked ioctls Signed-off-by: Ben Skeggs commit cff5c1332486ced8ff4180e957e04983cb72a39e Author: Ben Skeggs Date: Wed Oct 6 16:16:59 2010 +1000 drm/nouveau: add more fine-grained locking to channel list + structures Signed-off-by: Ben Skeggs commit 6a6b73f254123851f7f73ab5e57344a569d6a0ab Author: Ben Skeggs Date: Tue Oct 5 16:53:48 2010 +1000 drm/nouveau: add per-channel mutex, use to lock access to drm's channel This fixes a race condition between fbcon acceleration and TTM buffer moves. To reproduce: - start X - switch to vt and "while (true); do dmesg; done" - switch to another vt and "sleep 2 && cat /path/to/debugfs/dri/0/evict_vram" - switch back to vt running dmesg We don't make use of this on any other channel yet, they're currently protected by drm_global_mutex. This will change in the near future. Signed-off-by: Ben Skeggs commit ceed5f30bf0f515b52246230e5faacf89983fd8f Author: Ben Skeggs Date: Tue Oct 5 16:41:29 2010 +1000 drm/nouveau: disallow fbcon accel if running in interrupt context A future commit will add locking to the DRM's channel, and there's numerous problems that come up if we allow printk from an interrupt context to be accelerated. It seems saner to just disallow it completely. As a nice side-effect, all the "to accel or not to accel" logic gets moved out of the chipset-specific code. Signed-off-by: Ben Skeggs commit 7c74cbd01b2698583fb74ebdfcd7ef4c768e6346 Author: Ben Skeggs Date: Thu Sep 23 11:03:01 2010 +1000 drm/nouveau: tidy fifo swmthd handler a little Signed-off-by: Ben Skeggs commit f7eb0c55416aba7478932cedbaccc2bdacd8a95d Merge: 7e76c5c 439bd6c Author: Dave Airlie Date: Fri Dec 3 14:01:08 2010 +1000 Merge branch 'drm-radeon-fusion' of ../drm-radeon-next into drm-core-next * 'drm-radeon-fusion' of ../drm-radeon-next: drm/radeon/kms: add Ontario APU ucode loading support drm/radeon/kms: add Ontario Fusion APU pci ids drm/radeon/kms: enable MSIs on fusion APUs drm/radeon/kms: add power table parsing support for Ontario fusion APUs drm/radeon/kms: refactor atombios power state fetching drm/radeon/kms: add bo blit support for Ontario fusion APUs drm/radeon/kms: add thermal sensor support for fusion APUs drm/radeon/kms: fill in GPU init for AMD Ontario Fusion APUs drm/radeon/kms: add radeon_asic struct for AMD Ontario fusion APUs drm/radeon/kms: evergreen.c updates for fusion drm/radeon/kms: MC setup changes for fusion APUs drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function drm/radeon/kms: add support for ss overrides on Fusion APUs drm/radeon/kms: Add support for external encoders on fusion APUs drm/radeon/kms: atom changes for DCE4.1 devices drm/radeon/kms: add new family id for AMD Ontario APUs drm/radeon/kms: upstream power table updates drm/radeon/kms: upstream atombios.h updates drm/radeon/kms: upstream ObjectID.h updates drm/radeon/kms: setup mc chremap properly on r7xx/evergreen commit 7e76c5cf6f4dbfb18325de5408c0ac8d3f271d85 Merge: a9979d6 acb3250 Author: Dave Airlie Date: Fri Dec 3 14:00:52 2010 +1000 Merge branch 'drm-radeon-next' of ../drm-radeon-next into drm-core-next * 'drm-radeon-next' of ../drm-radeon-next: drm/radeon/kms: improve pflip precision on r1xx-r4xx drm/kms/radeon: Use high precision timestamps for pageflip completion events. drm/kms/radeon: Reorder vblank and pageflip interrupt handling. drm/radeon/kms: add pageflip ioctl support (v3) drm/kms/radeon: Add support for precise vblank timestamping. commit a9979d6077e4482dbe64cedc4bb181d5576d13f7 Merge: 27641c3 147666f Author: Dave Airlie Date: Fri Dec 3 13:59:36 2010 +1000 Merge branch 'drm-ttm-next' into drm-core-next * drm-ttm-next: drm/radeon: Use the ttm execbuf utilities drm/ttm: Fix up io_mem_reserve / io_mem_free calling drm/ttm/vmwgfx: Have TTM manage the validation sequence. drm/ttm: Improved fencing of buffer object lists drm/ttm/radeon/nouveau: Kill the bo lock in favour of a bo device fence_lock drm/ttm: Don't deadlock on recursive multi-bo reservations drm/ttm: Optimize ttm_eu_backoff_reservation drm/ttm: Use kref_sub instead of repeatedly calling kref_put kref: Add a kref_sub function drm/ttm: Add a bo list reserve fastpath (v2) commit 5403187f83c12c6f4c03547e0cc05bac0310be7b Author: Aaro Koskinen Date: Thu Dec 2 15:51:24 2010 +0000 arm: mach-omap2: rx51: clean up dummy onenand init When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit a1a92e6fccadbba1846a081f21d0c12a10addd56 Author: Aaro Koskinen Date: Thu Dec 2 15:51:23 2010 +0000 arm: mach-omap2: n8x0: clean up dummy onenand init When OneNAND support is disabled, the platform code defines NULL board_onenand_data and empty init function for us. By utilizing this we can avoid cluttering board files with dummy definitions/wrappers. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 7203f8a48bb63015ebe58a6f2a38aec1cb208b9d Author: Aaro Koskinen Date: Thu Dec 2 13:25:40 2010 +0000 arm: mach-omap2: remove NULL board_mux from board files If CONFIG_OMAP_MUX is not enabled, we can define board_mux in the header file instead of forcing every single board to define it. Signed-off-by: Aaro Koskinen [tony@atomide.com: updated for combined board-zoom files] Signed-off-by: Tony Lindgren commit 08ec0c58fb8a05d3191d5cb6f5d6f81adb419798 Author: John Stultz Date: Tue Jul 27 17:00:00 2010 -0700 x86: Improve TSC calibration using a delayed workqueue Boot to boot the TSC calibration may vary by quite a large amount. While normal variance of 50-100ppm can easily be seen, the quick calibration code only requires 500ppm accuracy, which is the limit of what NTP can correct for. This can cause problems for systems being used as NTP servers, as every time they reboot it can take hours for them to calculate the new drift error caused by the calibration. The classic trade-off here is calibration accuracy vs slow boot times, as during the calibration nothing else can run. This patch uses a delayed workqueue to calibrate the TSC over the period of a second. This allows very accurate calibration (in my tests only varying by 1khz or 0.4ppm boot to boot). Additionally this refined calibration step does not block the boot process, and only delays the TSC clocksoure registration by a few seconds in early boot. If the refined calibration strays 1% from the early boot calibration value, the system will fall back to already calculated early boot calibration. Credit to Andi Kleen who suggested using a timer quite awhile back, but I dismissed it thinking the timer calibration would be done after the clocksource was registered (which would break things). Forgive me for my short-sightedness. This patch has worked very well in my testing, but TSC hardware is quite varied so it would probably be good to get some extended testing, possibly pushing inclusion out to 2.6.39. Signed-off-by: John Stultz LKML-Reference: <1289003985-29060-1-git-send-email-johnstul@us.ibm.com> Reviewed-by: Thomas Gleixner CC: Thomas Gleixner CC: Ingo Molnar CC: Martin Schwidefsky CC: Clark Williams CC: Andi Kleen commit b0f969009f647cd473c5e559aeec9c4229d12f87 Merge: 3561d43 d3b8f88 Author: John Stultz Date: Thu Dec 2 16:47:52 2010 -0800 Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc Conflicts: Documentation/kernel-parameters.txt commit 87de5ac782761a3ebf806e434e8c9cc205a87274 Author: John Stultz Date: Mon Sep 20 17:42:46 2010 -0700 timers: Introduce timerlist infrastructure. The timerlist infrastructure is a thin layer over the rbtree code that implements a simple list of timers sorted by an expires value, and a getnext function that provides a pointer to the earliest timer. This infrastructure allows drivers and other kernel infrastructure to easily implement timers without duplicating code. Signed-off-by: John Stultz LKML Reference: <1290136329-18291-2-git-send-email-john.stultz@linaro.org> Reviewed-by: Thomas Gleixner CC: Alessandro Zummo CC: Thomas Gleixner CC: Richard Cochran commit b9e68670cc3a13166b389ce847af19b0d0d33c67 Merge: 60de2ba 5bddd17 Author: Chris Wilson Date: Thu Dec 2 23:36:21 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_drv.h commit b924dcf0038b8f83e65b44f679ad480d44f85aa6 Author: Allan Stephens Date: Tue Nov 30 12:01:03 2010 +0000 tipc: Delete tipc_ownidentity() Moves the content of the native API routine tipc_ownidentity() into the sole routine that calls it, since it can no longer be called in isolation. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 12bae479ee414f45ad8fe93530f5b6ea241bde3f Author: Allan Stephens Date: Tue Nov 30 12:01:02 2010 +0000 tipc: Eliminate obsolete native API forwarding routines Moves the content of each native API message forwarding routine into the sole routine that calls it, since the forwarding routines no longer be called in isolation. Also removes code in each routine that altered the outgoing message's importance level since this is now no longer possible. The previous function mapping (parent function, and child API) was as follows: tipc_send2name \--tipc_forward2name tipc_send2port \--tipc_forward2port tipc_send_buf2port \--tipc_forward_buf2port After this commit, the children don't exist and their functionality is completely in the respective parent. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 471450f7ec24ccd9ac24e6f05cd9358d40c09d03 Author: Allan Stephens Date: Tue Nov 30 12:01:01 2010 +0000 tipc: Eliminate an unused symbolic constant in link code Removes a symbol that is not referenced anywhere by TIPC's link code. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 52fe7b725e0a1360d36c720ee87ab1e559df69db Author: Allan Stephens Date: Tue Nov 30 12:01:00 2010 +0000 tipc: Eliminate useless initialization when creating subscriber Removes initialization of a local variable that is always assigned a different value before it is referenced. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 38f232eae20cefed2e2379d77c54babb0de6d024 Author: Allan Stephens Date: Tue Nov 30 12:00:59 2010 +0000 tipc: Remove unused domain argument from multicast send routine Eliminates an unused argument from tipc_multicast(), now that this routine can no longer be called by kernel-based applications. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit a5c2af9922a94a875c5f4b2dcd357a1c399b7ea6 Author: Allan Stephens Date: Tue Nov 30 12:00:58 2010 +0000 tipc: Remove support for TIPC mode change callback Eliminates support for the callback routine invoked when TIPC changes its mode of operation from inactive to standalone or from standalone to networked. This callback was part of TIPC's obsolete native API and is not used by TIPC internally. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 528c771e87c3fa661bc6983b5bf0ba464d9f7c3a Author: Allan Stephens Date: Tue Nov 30 12:00:57 2010 +0000 tipc: Delete useless function prototypes Removes several function declarations that aren't used anywhere, either because they reference routines that no longer exist or because all users of the function reference it after it has already been defined. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 28cc937eac00805e8b9c6e7ed7d590567378187f Author: Allan Stephens Date: Tue Nov 30 12:00:56 2010 +0000 tipc: Eliminate useless return value when disabling a bearer Modifies bearer_disable() to return void since it always indicates success anyway. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit 8d71919d7afc4ade0d9de09e1d50fbf9168c368d Author: Allan Stephens Date: Tue Nov 30 12:00:55 2010 +0000 tipc: Delete unused configuration service structure definition Removes a structure definition that is no longer used by TIPC's configuration service. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit c80262829769419e19527f972672e8df0480235a Author: Allan Stephens Date: Tue Nov 30 12:00:54 2010 +0000 tipc: Remove obsolete inclusions of header files Gets rid of #include statements that are no longer required as a result of the merging of obsolete native API header file content into other TIPC include files. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit d265fef6ddf9042195aae551e1fde211c2a1588b Author: Allan Stephens Date: Tue Nov 30 12:00:53 2010 +0000 tipc: Remove obsolete native API files and exports As part of the removal of TIPC's native API support it is no longer necessary for TIPC to export symbols for routines that can be called by kernel-based applications, nor for it to have header files that kernel-based applications can include to access the declarations for those routines. This commit eliminates the exporting of symbols by TIPC and migrates the contents of each obsolete native API include file into its corresponding non-native API equivalent. The code which was migrated in this commit was migrated intact, in that there are no technical changes combined with the relocation. Signed-off-by: Allan Stephens Signed-off-by: Paul Gortmaker Signed-off-by: David S. Miller commit dca9b2404a6d6579828da2425c051462701efd3f Author: Shan Wei Date: Wed Dec 1 18:05:17 2010 +0000 net: kill unused macros from head file These macros have been defined for several years since v2.6.12-rc2（tracing by git）, but never be used. So remove them. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit b672083ed36a49c323737b7c7e1d5264a7c193af Author: Shan Wei Date: Wed Dec 1 18:05:12 2010 +0000 ipv6: use ND_REACHABLE_TIME and ND_RETRANS_TIMER instead of magic number ND_REACHABLE_TIME and ND_RETRANS_TIMER have defined since v2.6.12-rc2, but never been used. So use them instead of magic number. This patch also changes original code style to read comfortably . Thank YOSHIFUJI Hideaki for pointing it out. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 97b1ce25e8fc27f74703537ec09d4996c7a6e38a Author: Shan Wei Date: Wed Dec 1 18:04:50 2010 +0000 tcp: use TCP_BASE_MSS to set basic mss value TCP_BASE_MSS is defined, but not used. commit 5d424d5a introduce this macro, so use it to initial sysctl_tcp_base_mss. commit 5d424d5a674f782d0659a3b66d951f412901faee Author: John Heffner Date: Mon Mar 20 17:53:41 2006 -0800 [TCP]: MTU probing Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a9527a3b621e507c85b639c183c3aa22afd4eb61 Author: Shan Wei Date: Wed Dec 1 18:04:43 2010 +0000 net: snmp: fix the wrong ICMP_MIB_MAX value __ICMP_MIB_MAX is equal to the total number of icmp mib, So no need to add 1. This wastes 4/8 bytes memory. Change it to be same as ICMP6_MIB_MAX, TCP_MIB_MAX, UDP_MIB_MAX. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit fe27d4b012273640e033be80f143bdc54daa8e16 Merge: ad9c2b0 676dac4 Author: James Morris Date: Fri Dec 3 08:21:01 2010 +1100 Merge branch 'smack-next-master' into next commit 415103f9932d45f7927f4b17e3a9a13834cdb9a1 Author: Eric Paris Date: Thu Dec 2 16:13:40 2010 -0500 SELinux: do not compute transition labels on mountpoint labeled filesystems selinux_inode_init_security computes transitions sids even for filesystems that use mount point labeling. It shouldn't do that. It should just use the mount point label always and no matter what. This causes 2 problems. 1) it makes file creation slower than it needs to be since we calculate the transition sid and 2) it allows files to be created with a different label than the mount point! # id -Z staff_u:sysadm_r:sysadm_t:s0-s0:c0.c1023 # sesearch --type --class file --source sysadm_t --target tmp_t Found 1 semantic te rules: type_transition sysadm_t tmp_t : file user_tmp_t; # mount -o loop,context="system_u:object_r:tmp_t:s0" /tmp/fs /mnt/tmp # ls -lZ /mnt/tmp drwx------. root root system_u:object_r:tmp_t:s0 lost+found # touch /mnt/tmp/file1 # ls -lZ /mnt/tmp -rw-r--r--. root root staff_u:object_r:user_tmp_t:s0 file1 drwx------. root root system_u:object_r:tmp_t:s0 lost+found Whoops, we have a mount point labeled filesystem tmp_t with a user_tmp_t labeled file! Signed-off-by: Eric Paris Reviewed-by: Reviewed-by: James Morris commit 2989042ca86b94bf4ffa9486921bb300ad44225f Author: Tomoya Date: Mon Nov 29 18:19:52 2010 +0000 can: EG20T PCH: Delete unnecessary spin_lock Delete unnecessary spin_lock for accessing Message Object. Since all message objects are divided into tx/rx area completely, spin_lock processing is unnecessary. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit d68f6837c4972b0433e41f8bee4b2b8205610f31 Author: Tomoya Date: Mon Nov 29 18:16:15 2010 +0000 can: EG20T PCH: Enumerate LEC macros For easy to readable, LEC #define macros are replaced to enums. Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 15ffc8fddf72712cc45d51c64bd500760ec63c80 Author: Tomoya Date: Mon Nov 29 18:15:02 2010 +0000 can: EG20T PCH: Change Message Object Index For easy to readable, add Message Object index like below. PCH_RX_OBJ_START PCH_RX_OBJ_END PCH_TX_OBJ_START PCH_TX_OBJ_END Signed-off-by: Tomoya MORINAGA Signed-off-by: David S. Miller commit 8339a7ed562719e040ca783bf59fa2d614d10ac9 Author: Tomoya Date: Mon Nov 29 18:11:52 2010 +0000 can: EG20T PCH: Separate Interface Register(IF1/IF2) CAN register of Intel PCH EG20T has 2 sets of interface register. To reduce whole of code size, separate interface register. As a result, the number of function also can be reduced. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 09f921f83faa49cdea25abfb98c439c01526b89d Merge: 4cebb34 d89197c Author: John W. Linville Date: Thu Dec 2 15:46:37 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 Conflicts: drivers/net/wireless/ath/ath9k/ar9003_eeprom.c commit d5c21fc6155549e7f92fdeb039227f2b8e597e98 Author: Matthias Brugger Date: Thu Dec 2 14:13:04 2010 +0100 staging: adis16255 delete driver This patch deletes the adis16255 driver from staging as a similar implementation exists inside the iio subsystem. Signed-off-by: Matthias Brugger Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit d1f521c16a4d7e46bbb9c6968076f80be995e0ed Author: Peter Huewe Date: Thu Dec 2 00:43:34 2010 +0100 staging/sep: Fix printk format warning This patch fixes gcc's complaints about the wrong format string for size_t arguments: "format '%x' expects type 'unsigned int', but argument has type 'size_t'" Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit dda16b23e32cf2351aa03590f43cc8a2873dc6a9 Author: Peter Huewe Date: Thu Dec 2 00:43:33 2010 +0100 staging/sep: Fix sparse warning 'Using plain integer as NULL pointer' This patch fixes the warning generated by sparse: "Using plain integer as NULL pointer" by replacing the offending 0s with NULL. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit eb6b420da13fee2edc30b7bde67c0c8993c4c30d Author: Peter Huewe Date: Thu Dec 2 00:43:32 2010 +0100 staging/sep: Fix sparse warning 'do-while statement is not a compound statement' This patch fixes the warning generated by sparse: 'do-while statement is not a compound statement' by adding the necessary brackets around the do block Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit ff29ee8f9301c38f28d4d22fe49373d3b996956e Author: Arend van Spriel Date: Thu Dec 2 15:44:52 2010 +0100 staging: brcm80211: remove redundant CHIPREV macro The CHIPREV macro simply expands to the macro argument so it is redundant and as such removed. Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit dfa26436109d06f233a0ad735731cfb2d0c6ab5a Author: Arend van Spriel Date: Thu Dec 2 15:44:51 2010 +0100 staging: brcm80211: remove redundant CHIPID macro The CHIPID macro simply expands to the macro argument so it is redundant and as such removed. Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 92246bcbd7730eaaec0c29a2adc1cb4b4451ed9e Author: Arend van Spriel Date: Thu Dec 2 15:44:50 2010 +0100 staging: brcm80211: remove redundant CHIPTYPE macro The CHIPTYPE macro simply expands to the macro argument so it is redundant and as such removed. Reviewed-by: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c523ea78ec9a33586fa7a73859de7c462097cdfc Author: Brett Rudley Date: Wed Dec 1 15:36:39 2010 -0800 staging: brcm80211: absorb linux_osl.h into osl.h Move code from linux_osl.h into osl.h and delete linux_osl.h, which created a bunch of checkpatch errors... I fixed most but volatile warnings will have to be dealt with later. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit df880a42dc4086ba7ff16f6ccb255e78fc0dc374 Author: Brett Rudley Date: Wed Dec 1 15:36:38 2010 -0800 staging: brcm80211: Remove unused code from osl.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 4cebb34caa5122216a1e2451eae9e0fc47ec2589 Author: Felix Fietkau Date: Thu Dec 2 10:27:21 2010 +0100 ath5k: Fix reset and interrupts for AHB type of devices. On WiSoc we cannot access mac register before it is resetted. It will crash hardware otherwise. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit a0b907ee2a71052fefdf6151764095f3f97b3275 Author: Felix Fietkau Date: Thu Dec 2 10:27:16 2010 +0100 ath5k: Add AHB bus support. AHB specific functions are now in ahb.c file. AHB bus is compiled in when CONFIG_ATHEROS_AR231X is set in kernel. All other platforms will use PCI bus. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit c31b5c9c806b1fbdc9e98885d897664a0d482989 Author: Felix Fietkau Date: Thu Dec 2 10:27:11 2010 +0100 ath5k: Add initial registers values for radio RF2317 chip. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit e7aecd327d80b2f156b54769013aaccb2a20645a Author: Felix Fietkau Date: Thu Dec 2 10:27:06 2010 +0100 ath5k: Add a function to read chipset's MAC revision Add bus dependent revision read function which is used to determine chipset's MAC before hardware is initialized. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 8efa5d7d6ad307ae2d220def37ca89594062c40d Author: Felix Fietkau Date: Thu Dec 2 10:27:06 2010 +0100 ath5k: Check if pci pdev struct is initialized in common functions. To be able to support other busses than PCI check if pci device structure is initialized. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 4aa5d783c9e1c72e4950ff34f388077ccecac74a Author: Felix Fietkau Date: Thu Dec 2 10:27:01 2010 +0100 ath5k: Use generic eeprom read from common ath_bus_opts struct. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit e5b046d86fac609f636d127a38de94a175c7e83b Author: Felix Fietkau Date: Thu Dec 2 10:27:01 2010 +0100 ath5k: Move PCI bus functions to separate file. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit 132b1c3ee38ea6fa0501004fd0f19acb554e5a44 Author: Felix Fietkau Date: Thu Dec 2 10:26:56 2010 +0100 ath5k: Introduce ath5k_init_softc function as in ath9k Split pci initialization into hardware specific functions and softc structure initialization. Make function naming similar to ones ath9k. Introduce ath_bus_opts in ath5k for later AHB bus integration. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit aeae4ac9090462ea38387dcdbac4f01b944af6a4 Author: Felix Fietkau Date: Thu Dec 2 10:26:51 2010 +0100 ath5k: Use Generic DMA for later support of AHB bus. Signed-off-by: Felix Fietkau Signed-off-by: Wojciech Dubowik Signed-off-by: John W. Linville commit c30ae138aa0570665725166679bdf4207041c8df Merge: 78b8595 be21871 Author: John W. Linville Date: Thu Dec 2 15:17:46 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6 commit 78b8595691c34478a51d1c2bcbbb0f6ec8a28247 Author: Andy Shevchenko Date: Thu Dec 2 14:45:07 2010 +0200 wireless: ray_cs: use '%pm' format option to print MAC Signed-off-by: Andy Shevchenko Cc: "John W. Linville" Cc: linux-wireless@vger.kernel.org Signed-off-by: John W. Linville commit 547025d5d4d1056fb4b5a0c9c3c0d5c2fe22c082 Author: Bruno Randolf Date: Thu Dec 2 16:23:12 2010 +0900 cfg80211: Add documentation for antenna ops The last patch with the same title was for mac80211 ops, accidentally. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c1927d7a8fab07171d08f7a3a8b7e5fe87bb70d4 Author: Johannes Berg Date: Wed Dec 1 09:43:35 2010 +0100 mac80211: publish SMPS docs Create a new chapter about SMPS in the driver API part of the mac80211 book and populate it with the existing docs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f6b8bef3634a5c9ea326b3ab0c9615fdac5f18ab Author: Johannes Berg Date: Wed Dec 1 09:43:34 2010 +0100 mac80211: document station handling Add some existing documentation about station handling to a new chapter about advanced APIs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit eebbb348df5a8c239a6300188907dec7e427bf70 Author: Johannes Berg Date: Wed Dec 1 09:43:33 2010 +0100 mac80211: publish interface iteration docs Publish the documentation for the interface iteration functions in the right section of the book. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e16c01030b8794992590ff9b1b1e4b1b89e0cad3 Author: Johannes Berg Date: Wed Dec 1 09:43:32 2010 +0100 mac80211: document aggregation Include the aggregation documentation in the docbook, split up by public and internal docs. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit cf6cb7ab59e0b37afe6e76b2e444479bf86bf933 Author: Johannes Berg Date: Wed Dec 1 09:43:31 2010 +0100 mac80211: publish some rate control docs Add an API chapter to the rate control part of the mac80211 book and populate it with some existing documentation. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 625208138550562fd3bc731f53f43cb66a3be70a Author: Johannes Berg Date: Wed Dec 1 09:43:30 2010 +0100 mac80211: publish some misc docs There isn't a clear TX documentation yet, so put these into the misc section for now. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 7bcfda13fea4a8770deaf4b22093dc2708760128 Author: Johannes Berg Date: Wed Dec 1 09:43:29 2010 +0100 mac80211: publish docs for _ni functions Put them along with their "regular" versions for now, we should write more docs in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit d7ae30f073a179a9cebd663e7502843ddf4ba672 Author: Johannes Berg Date: Wed Dec 1 09:43:28 2010 +0100 mac80211: document workqueue Create a new chapter for the mac80211 workqueue that contains the documentation written for it. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 2e54a7a20cf7c02ee17c56488fedb8cd3d2c2f35 Author: Johannes Berg Date: Wed Dec 1 09:43:27 2010 +0100 cfg80211: include CQM packet loss docs Just include them in the list of functions, there aren't any more detailed docs (yet). Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6a0141175b6026e13652339e607a35f4b6687f27 Author: Sujith Manoharan Date: Wed Dec 1 12:30:09 2010 +0530 ath9k_htc: Remove unused structures Signed-off-by: Sujith Manoharan Signed-off-by: John W. Linville commit b2767363192d5937e0f61f05b1b6b881da9ee55a Author: Joe Perches Date: Tue Nov 30 13:42:08 2010 -0800 wireless: Remove unnecessary casts of usb_get_intfdata Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit e7797bf2c0297098056a95b6b03ea5a9a3285e36 Author: Rafał Miłecki Date: Tue Nov 30 22:33:16 2010 +0100 b43: N-PHY: fix code path on PHY init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 76b002bd6dfdd66c58669cbdfa5cd92084b6936e Author: Rafał Miłecki Date: Tue Nov 30 22:33:15 2010 +0100 b43: N-PHY: use defines for RSSI types Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 99f6c2ef1e968c0dbdfa8c5b8f2869129b860d88 Author: Rafał Miłecki Date: Tue Nov 30 22:33:14 2010 +0100 b43: N-PHY: fix RSSI selection Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 44b23b488d44e56d467764ecb661830e5b02b308 Author: Joe Perches Date: Tue Nov 30 12:19:11 2010 -0800 ath9k: hif_usb: Reduce indent 1 column Invert test and return early. Move variable declarations to local scope. Don't initialize variables to 0 unnecessarily. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit eb272441fc14ad126abfa46de8a9c58bda8added Author: Ben Greear Date: Mon Nov 29 14:13:22 2010 -0800 ath9k: Move debugfs under ieee80211/[phyname]/ath9k/ This fixes debugfs problems when a phy is renamed, and is able to remove a bit of code that is no longer needed. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit db3949c4506a21633469d71f2915cf660eea0a35 Author: David S. Miller Date: Thu Dec 2 11:52:07 2010 -0800 tcp: Implement ipv6 ->get_peer() and ->tw_get_peer(). Now ipv6 timewait recycling is fully implemented and enabled. Signed-off-by: David S. Miller commit 493f377d6dd56f4e98b198d637fe714ab124681b Author: David S. Miller Date: Thu Dec 2 12:14:29 2010 -0800 tcp: Add timewait recycling bits to ipv6 connect code. This will also improve handling of ipv6 tcp socket request backlog when syncookies are not enabled. When backlog becomes very deep, last quarter of backlog is limited to validated destinations. Previously only ipv4 implemented this logic, but now ipv6 does too. Now we are only one step away from enabling timewait recycling for ipv6, and that step is simply filling in the implementation of tcp_v6_get_peer() and tcp_v6_tw_get_peer(). Signed-off-by: David S. Miller commit bafbb8df076de1e3b63914473a403fba96b88f3c Author: Greg Kroah-Hartman Date: Thu Dec 2 12:12:46 2010 -0800 Staging: hv: remove vmbus_on_event_dpc() Just call VmbusOnEvents() as that's all the function did, so we can remove it. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit cef6dbfa8ef6b8c474e020a24758aa848a2632fa Author: Greg Kroah-Hartman Date: Thu Dec 2 12:11:25 2010 -0800 Staging: hv: make some vmbus_drv functions static Now that vmbus_drv.c is merged with vmbus.c, some of the newly global functions can now be marked static. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 6d26e38fa2085ab3ba37a52e34caf46f8e049544 Author: Greg Kroah-Hartman Date: Thu Dec 2 12:08:08 2010 -0800 Staging: hv: merge VmbusInitialize into vmbus_bus_init No need to have two functions for this. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 0bdb250c69251499f53a4ac6f9dae117da490696 Author: Greg Kroah-Hartman Date: Thu Dec 2 12:04:59 2010 -0800 Staging: hv: remove gDriver variable It's only set and never used anymore, so remove it. Gotta love static variables with a "global" hungarian notatation on the name... Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 6c884555f23d0c73f7e71ce977ee4dd882532c0f Author: Greg Kroah-Hartman Date: Thu Dec 2 12:04:00 2010 -0800 Staging: hv: call VmbusInitialize directly from vmbus_bus_init() No need to pass a function pointer to a function in the same file. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 36199a992aba4f3ea1bc0430f04655e99010a65d Author: Greg Kroah-Hartman Date: Thu Dec 2 11:59:22 2010 -0800 Staging: hv: remove vmbus.c Merge the functions into vmbus_drv.c as there's no need to have them separate anymore. It will also make unwinding some of the function and pointer mess easier, as well as making functions static in the future. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 8cbe6e66889d2e4dbea37b2fc6f276bd69d1ef67 Author: Rafał Miłecki Date: Sun Nov 28 12:59:45 2010 +0100 b43: N-PHY: fix RSSI calibration Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 8c1d5a7a2230a162af709fa118f051e0d18ff427 Author: Rafał Miłecki Date: Sun Nov 28 12:59:44 2010 +0100 b43: N-PHY: initialize perical variable, add missing call to CCA reset Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 161d540c8ef31e5adbced3248873024476e2c26f Author: Rafał Miłecki Date: Sun Nov 28 12:59:43 2010 +0100 b43: N-PHY: implement very basic TX power control management Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 40277cabfee7c8ef45055155895dcbef0f983c63 Author: Rafał Miłecki Date: Sun Nov 28 12:59:42 2010 +0100 b43: N-PHY: swap values for radio registers 0x3b and 0x3c Specs were updated plus we become wl compatible. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7 Author: Hauke Mehrtens Date: Sun Nov 28 12:22:52 2010 +0100 ssb: Add sysfs attributes to ssb devices Make it possible to read out the attributes, till now only show on dmesg, through sysfs. This patch was some time in OpenWrt. Signed-off-by: Bernhard Loos Signed-off-by: Hauke Mehrtens Signed-off-by: John W. Linville commit 172c69a47675dc1ca9c7243c031d8d77701bccc0 Author: Rafał Miłecki Date: Sun Nov 28 10:39:35 2010 +0100 ssb: extract indexes for power tables Signed-off-by: Rafał Miłecki Acked-by: Michael Buesch Signed-off-by: John W. Linville commit 1953ecfc293911311f04d8c19f04d2249a30707b Author: Greg Kroah-Hartman Date: Thu Dec 2 11:28:28 2010 -0800 Staging: hv: rename the vmbus to "hyperv" This changes the name of the bus in sysfs from "vmbus" to "hyperv" which is the name it should show (vmbus is way to generic). Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit ae4694b2d3e4c0f47c0e804a68417be57e5daf85 Author: David S. Miller Date: Thu Dec 2 10:59:22 2010 -0800 ipv6: Create inet6_csk_route_req(). Brother of ipv4's inet_csk_route_req(). Signed-off-by: David S. Miller commit 15c054251ab84895ec043e90826612c1a3d6d4f1 Author: David S. Miller Date: Thu Dec 2 10:16:06 2010 -0800 ipv6: Add rt6_get_peer() helper. To go along side ipv4's rt_get_peer(). Signed-off-by: David S. Miller commit a69a6691d71cc24979ce29394478218307a77a84 Author: Greg Kroah-Hartman Date: Thu Dec 2 09:42:18 2010 -0800 Staging: hv: remove struct vmbus_driver It's only a wrapper for the struct hv_driver structure, so just use that instead, as there are no other fields left in it at the moment. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 98293a279cc0ff085ead7c032c6b8cb7b6ad7e88 Author: Greg Kroah-Hartman Date: Thu Dec 2 09:16:04 2010 -0800 Staging: hv: remove OnChildDeviceAdd vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 21486af0f34d03b813b023d7a2b887b329f60486 Author: Sebastian Andrzej Siewior Date: Fri Oct 8 18:11:19 2010 +0200 spi/pxa2xx: pass of_node to spi device and set a parent device the of_node will auto-publish devices which are added to the device tree. Signed-off-by: Sebastian Andrzej Siewior commit 579d3bb2ac1a351bbf536480a9ab38199bbf901d Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:17 2010 -0800 spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes. After all TX bytes are sent, the driver spins while the SPI core is busy and then it spins for a "short" period of time until RX bytes are available. On Sodavile the busy flag disappears pretty quick and after that it takes approx ~130ms (sometimes less but not much) until there are bytes available in the RX FIFO. This patch removes the busy loop and modifies the RX threshould so we get woken up once the remainings bytes arrived. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 2a8626a9e2d86d114a2d9f813a1acebf9d53dd10 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:17 2010 -0800 spi/pxa2xx: Add chipselect support for Sodaville The SPI core on Sodaville supports chip selects. Its configuration moved into the SSSR register at bit 0 and 1. Thus Sodaville can be hooked up with up to 4 devices. This patch ensures that the bits which are otherwiese reserved are only touched on Sodaville and not on any other PXAs. Also it makes sure that the status register does not lose the CS information while clearing the ROR bit. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 2d6e882bada0ca7828347647c5b1091bf5f18fee Author: Greg Kroah-Hartman Date: Thu Dec 2 08:50:58 2010 -0800 Staging: hv: remove GetChannelOffers vmbus_driver callback It's only ever set to one function, so just call that function instead. Actually, that wrapper function only ever called vmbus_request_offers() so just call that function instead, no need for a do-nothing intermediate step here. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit c722bd3e2cb92be7afec346894faa29605436c1a Author: Greg Kroah-Hartman Date: Thu Dec 2 08:47:11 2010 -0800 Staging: hv: remove OnEventDpc vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 4a1494fc101b05f895ef52b9d01769d382c5a6e2 Author: Greg Kroah-Hartman Date: Thu Dec 2 08:44:48 2010 -0800 Staging: hv: remove OnMsgDpc vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 097e310329fb69c928aa44b517a547e4a17658fd Author: Greg Kroah-Hartman Date: Thu Dec 2 08:41:05 2010 -0800 Staging: hv: remove OnIsr vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 9f28ebc381ca00af0f9033a29776775068344b06 Author: Wey-Yi Guy Date: Fri Nov 26 13:24:19 2010 -0800 iwlagn: name change for bt_ch_announce module parameter Change the module parameter name to bt_ch_inhibition from bt_ch_announce to better describe the functionality In order to allow Bluetooth to activate a smart AFH mechanism and to maximize its available bandwidth the WiFi will request BT Core to inhibit its activity in channels that interfere with WiFi activity (and vice versa) if bt_ch_inhibition is enabled Set module parameter "bt_ch_inhibition=0" will disable the channel inhibition function Signed-off-by: Wey-Yi Guy commit adb90a00371a9a06a55c7b7ed7b38152f8e960c3 Author: Wey-Yi Guy Date: Fri Nov 26 11:09:42 2010 -0800 iwlwifi: check for STATUS_EXIT_PENDING when send RXON command If driver is on the way down, there is no need to send RXON to uCode, check the condition before continuous the process. Signed-off-by: Wey-Yi Guy commit 8b3ee29626031155c7844988ebe4321c151c03a2 Author: Wey-Yi Guy Date: Thu Nov 18 11:41:48 2010 -0800 iwlagn: remove structure name reference to gen2 Give the corresponding name for .cfg data structure Signed-off-by: Wey-Yi Guy commit e7cad69cdab4d6f0caadbcdd58b54214243ba98a Author: Grumbach, Emmanuel Date: Thu Nov 18 03:47:38 2010 -0800 iwlagn: Enable PCI L1 ACTIVE state after uCode has been loaded PCI L1 Active needs to be disabled while loading the uCode so that the bus doesn't go to sleep. The enablement of L1 Active should be done after the uCode has sent the ALIVE response. The enablement of L1 Active was missing. Enabling L1 Active allows to save power if the BIOS / bus driver allows it. I measured the power consumption while not associated and idle/associated: L1 Active disabled: 39 mA = 130mW L1 Active enabled: 6 mA = 20 mW Signed-off-by: Emmanuel Grumbach Signed-off-by: Wey-Yi Guy commit 40b97c2fe96a476f1c228345f0c6a2d135a8b226 Author: Wey-Yi Guy Date: Wed Nov 17 14:17:53 2010 -0800 iwlagn: fix race condition when reprogram sta During reprogram stations, do not send link quality command. uCode will crash if receive link quality command for invalid station Signed-off-by: Wey-Yi Guy commit 9d8bd71ad4f295f80450b5089d239c3135802699 Author: Greg Kroah-Hartman Date: Thu Dec 2 08:34:45 2010 -0800 Staging: hv: remove OnChildDeviceRemove vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 9205307cd88f09e51f2c4aeba79266317a299853 Author: Greg Kroah-Hartman Date: Thu Dec 2 08:25:17 2010 -0800 Staging: hv: remove OnChildDeviceDestroy vmbus_driver callback No one ever calls it so get rid of it, it's pointless. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 89733aa9cca016a542dc621d147a32d6b0fcdad5 Author: Greg Kroah-Hartman Date: Thu Dec 2 08:22:41 2010 -0800 Staging: hv: remove OnChildDeviceCreate vmbus_driver callback It's only ever set to one function, so just call that function instead. Cc: Haiyang Zhang Cc: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 676dac4b1bee0469d6932f698aeb77e8489f5861 Author: Casey Schaufler Date: Thu Dec 2 06:43:39 2010 -0800 This patch adds a new security attribute to Smack called SMACK64EXEC. It defines label that is used while task is running. Exception: in smack_task_wait() child task is checked for write access to parent task using label inherited from the task that forked it. Fixed issues from previous submit: - SMACK64EXEC was not read when SMACK64 was not set. - inode security blob was not updated after setting SMACK64EXEC - inode security blob was not updated when removing SMACK64EXEC commit 1036dc169f4cc6e5b753b1596d285d1cc3311a23 Author: Juuso Oikarinen Date: Mon Nov 29 12:05:53 2010 +0200 wl12xx: Remove 11j channels from the supported channels list. Because we don't support them at this stage. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 870c367cf829466f315de785ac613dd94eff5c50 Author: Roger Quadros Date: Mon Nov 29 16:24:57 2010 +0200 wl1271: Add wl1271_load_firmware() and export some functions For the SDIO testing module we need to load the firmware but not boot it. wl1271_load_firmware() is meant to do just the firmware loading part. We also export some functions so they are usable in the testing module. Signed-off-by: Roger Quadros Signed-off-by: Luciano Coelho commit 43a598d5e40485fcfbebe0700077e83afd803ed5 Author: Luciano Coelho Date: Tue Nov 30 14:58:46 2010 +0200 wl12xx: fix illegal memset if debugfs is not enabled If we try to reset the debugfs statistics when debugfs is not configured in the kernel, we're memset an illegal pointer, because it has never been allocated. So check whether we have debugfs enabled by looking into the wl->rootdir before trying to reset the fw_stats struct. Reported-by: Joerie de Gram Signed-off-by: Luciano Coelho commit d60080ae06b98790036104f07fa897cfc151ce12 Author: Eliad Peller Date: Wed Nov 24 12:53:16 2010 +0200 wl1271: move wl12xx debugfs directory to under wiphy's debugfs Use per-device debugfs path, so multiple devices won't collide. in order to use wl->hw->wiphy->debugfsdir, we have to move the debugfs creation from wl1271_debugfs_init() to wl1271_register_hw(). Reported-by: Johannes Berg Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 7cb2cea9f0f207f819db9823413fa263175b6230 Author: Eliad Peller Date: Wed Nov 24 12:53:15 2010 +0200 wl1271: use debugfs_remove_recursive Documentation/filesystems/debugfs.txt: """ Once upon a time, debugfs users were required to remember the dentry pointer for every debugfs file they created so that all files could be cleaned up. We live in more civilized times now, though, and debugfs users can call: void debugfs_remove_recursive(struct dentry *dentry); """ Signed-off-by: Eliad Peller Signed-off-by: Luciano Coelho commit 43f901fbc8ba94bfa8d58155ba9378d7a13af636 Author: Thomas Chou Date: Wed Oct 6 15:13:53 2010 +0800 gen_init_cpio: remove leading `/' from file names When we extracted the generated cpio archive using "cpio -id" command, it complained, cpio: Removing leading `/' from member names var/run cpio: Removing leading `/' from member names var/lib cpio: Removing leading `/' from member names var/lib/misc It is worse with the latest "cpio" or "pax", which tries to overwrite the host file system with the leading '/'. So the leading '/' of file names should be removed. This is consistent with the initramfs come with major distributions such as Fedora or Debian, etc. Signed-off-by: Thomas Chou Acked-by: Mike Frysinger Signed-off-by: Michal Marek commit 8bc3c2c207dc82d47ffc6ef7b788e04ea637d3f1 Author: Mark Brown Date: Tue Nov 30 14:56:18 2010 +0000 ASoC: Tune performance of WM8958 revision A Update some of the default configuration for the device to improve the performance. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit dd31b310b9104327fb6bf7d2fe3b0f0f6fde4dd7 Author: Mark Brown Date: Thu Dec 2 11:44:00 2010 +0000 ASoC: Automatically manage WM8731 deemphasis The deemphasis filter should be selected based on sample rate for optimal performance. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 59f7297014b7e96779493f132eed04a3d44565df Author: Mark Brown Date: Tue Nov 30 21:03:44 2010 +0000 ASoC: Split WM8731 enumeration array into individual enums This is much more maintainable than the array. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d921184e82e828e9c0bc3958f838decaaa9191a8 Author: Mark Brown Date: Tue Nov 30 21:03:09 2010 +0000 ASoC: Provide WM8731 microphone boost TLV information Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fbe609e41b48f2e7da7c053ca835ba1277d3bed2 Author: Axel Lin Date: Wed Dec 1 14:38:24 2010 +0800 ASoC: Remove unused aic3x_i2c_init and aic3x_i2c_exit functions Signed-off-by: Axel Lin Acked-by: Mark Brown Acked-by: Jarkko Nikula Signed-off-by: Liam Girdwood commit 39646871a47fd8808c08de0ce7d7ca8393af2805 Author: Peter Ujfalusi Date: Thu Dec 2 09:29:56 2010 +0200 ASoC: tpa6130a2: Replace DAPM code with direct interface The use of DAPM widgets, and extra routing can cause ordering problems in the system. Machine drivers should use the exported direct interface with SND_SOC_DAPM_HP's event callback to manage the state of the amplifier. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 0a18a9386c056028799938960f91be338c4ff349 Author: Uwe Kleine-König Date: Thu Nov 4 10:24:16 2010 +0100 tags: put function prototypes back! Commit 7db86dc (ctags: usability fix) removed function prototypes from tags file claiming "It makes no real sense to include function prototypes". But it is useful for quickly determining which header file developer needs to include to fix compilation. Now if someone wants to remove forward declarations (which I agree are baggage), write a postprocessing script. Signed-off-by: Alexey Dobriyan Signed-off-by: Uwe Kleine-König Signed-off-by: Michal Marek commit ff0fba0bca4182e022c0a2ac0f3e63508e86e9f1 Author: Omar Ramirez Luna Date: Fri Oct 22 20:10:58 2010 -0500 OMAP: mailbox: fix detection for previously supported chips Fix the mailbox detection for OMAP3630 and 2430, also minor cleanup on conditional ifdef's that could affect it. Given that 2430 has an iva too, include it, as the same steps for omap3 apply. Signed-off-by: Omar Ramirez Luna Acked-by: Hiroshi Doyu commit 5d783731c683161d5d921c2ed03a43d6d31cf418 Author: Omar Ramirez Luna Date: Wed Dec 1 14:15:08 2010 -0600 OMAP: mailbox: remove unreachable return Remove unreachable return statement. Signed-off-by: Omar Ramirez Luna Acked-by: Benoit Cousson Acked-by: Hiroshi Doyu commit 582563074a691eb45cb22d2eca70eed8f2091c5f Author: Kanigeri, Hari Date: Mon Nov 29 20:24:14 2010 +0000 OMAP: mailbox: add notification support for multiple readers In the current mailbox driver, the mailbox internal pointer for callback can be directly manipulated by the Users, so a second User can easily corrupt the first user's callback pointer. The initial effort to correct this issue can be referred here: https://patchwork.kernel.org/patch/107520/ Along with fixing the above stated issue, this patch adds the flexibility option to register notifications from multiple readers to the events received on a mailbox instance. The discussion regarding this can be referred here. http://www.mail-archive.com/linux-omap@vger.kernel.org/msg30671.html Signed-off-by: Hari Kanigeri Signed-off-by: Fernando Guzman Lugo Acked-by: Hiroshi Doyu commit a42743c26a53a2a5f2b2018a9659ab3fb604d5bc Author: Kanigeri, Hari Date: Mon Nov 29 20:24:13 2010 +0000 OMAP: mailbox: send message in process context Schedule the Tasklet to send only when mailbox fifo is full and there are pending messages in kfifo, else send the message directly in the Process context. This would avoid needless scheduling of Tasklet for every message transfer Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit ab66ac3007cb3e59fe80dfcf36aff243d3008cb9 Author: Kanigeri, Hari Date: Mon Nov 29 20:24:12 2010 +0000 OMAP: mailbox: fix checkpatch warnings Fix the following checkpatch warnings observed in mailbox module. WARNING: please, no space for starting a line, excluding comments + fail_alloc_rxq:$ WARNING: please, no space for starting a line, excluding comments + fail_alloc_txq:$ WARNING: please, no space for starting a line, excluding comments + fail_request_irq:$ WARNING: line over 80 characters + mbox_kfifo_size = max_t(unsigned int, mbox_kfifo_size, sizeof(mbox_msg_t)); Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit d2295042b783c2b17d93cd5ab786bbfd4f2f5c90 Author: Fernando Guzman Lugo Date: Mon Nov 29 20:24:11 2010 +0000 OMAP: mailbox: change full flag per mailbox queue instead of global The variable rq_full flag is a global variable, so if there are multiple mailbox users there will be conflicts. Now there is a full flag per mailbox queue. Reported-by: Ohad Ben-Cohen Signed-off-by: Fernando Guzman Lugo Signed-off-by: Hari Kanigeri Acked-by: Hiroshi Doyu commit a44a11e9a049b491445bfbd93969d23c49047714 Author: Arnaud Lacombe Date: Thu Nov 4 00:16:08 2010 -0400 kconfig: the day kconfig warns about "select"-abuse has come CC: catalin.marinas@arm.com Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 60de2ba51eaba9eefcc355cb20c8582b1481e755 Author: Chris Wilson Date: Fri Nov 12 15:53:11 2010 +0000 drm/i915: Kill the get_fence tracepoint As the tracepoint is now decoupled from when the actual register is assigned and was never complemented by detailing when the object lost its fence, it has outlived its limited usefulness. Profiling the actual stalls is a far more profitable venture anyway. Signed-off-by: Chris Wilson commit e4b546a3643fbfc510d5ef7db538e4d3ab00effb Merge: b3d006c d7470b6 Author: Ingo Molnar Date: Thu Dec 2 11:20:11 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/core commit c6748e09eed072be077fe583976516b76daf42ec Author: Chris Wilson Date: Fri Nov 12 16:02:21 2010 +0000 drm/i915: Remove inactive LRU tracking from set_domain_ioctl As the userspace mappings are torn down on every GPU write, we prefer to track when the buffer is activated (via a fresh i915_gem_fault). This makes the LRU conceptually simpler. With coherent mappings, the remaining use-case for set_domain_ioctl is GPU synchronisation. Signed-off-by: Chris Wilson commit d9e86c0ee60f323e890484628f351bf50fa9a15d Author: Chris Wilson Date: Wed Nov 10 16:40:20 2010 +0000 drm/i915: Pipelined fencing [infrastructure] With this change, every batchbuffer can use all available fences (save pinned and scanout, of course) without ever stalling the gpu! In theory. Currently the actual pipelined update of the register is disabled due to some stability issues. However, just the deferred update is a significant win. Based on a series of patches by Daniel Vetter. The premise is that before every access to a buffer through the GTT we have to declare whether we need a register or not. If the access is by the GPU, a pipelined update to the register is made via the ringbuffer, and we track the last seqno of the batches that access it. If by the CPU we wait for the last GPU access and update the register (either to clear or to set it for the current buffer). One advantage of being able to pipeline changes is that we can defer the actual updating of the fence register until we first need to access the object through the GTT, i.e. we can eliminate the stall on set_tiling. This is important as the userspace bo cache does not track the tiling status of active buffers which generate frequent stalls on gen3 when enabling tiling for an already bound buffer. Signed-off-by: Chris Wilson Reviewed-by: Daniel Vetter commit 87ca9c8a7ea9c8c7ce1561edaad1aa8570f1a01e Author: Chris Wilson Date: Thu Dec 2 09:42:56 2010 +0000 drm/i915: Prevent stalling for a GTT read back from a read-only GPU target Signed-off-by: Chris Wilson commit efce41b65f66251d60484781df305e8a85c9507b Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:32 2010 +0200 crypto: omap-aes - checkpatch --file warning fixes Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 83ea7e0fe1471508ab8e8d7b317e743fe7a05a5f Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:31 2010 +0200 crypto: omap-aes - initialize aes module once per request AES module was initialized for every DMA transaction. That is redundant. Now it is initialized once per request. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 67a730ce449561f6df838f0b38a2b72cbf4e3c4c Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:30 2010 +0200 crypto: omap-aes - unnecessary code removed Key and IV should always be set before AES operation. So no need to check if it has changed or not. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 21fe9767f3bd56fd9a271dc43b93cd4608d47f4a Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:29 2010 +0200 crypto: omap-aes - error handling implementation improved Previous version had not error handling. Request could remain uncompleted. Also in the case of DMA error, FLAGS_INIT is unset and accelerator will be initialized again. Buffer size allignment is checked. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit eeb2b202c5b886b76c3bfa76f47e450fa69389fb Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:28 2010 +0200 crypto: omap-aes - redundant locking is removed Submitting request involved double locking for enqueuing and dequeuing. Now it is done under the same lock. FLAGS_BUSY is now handled under the same lock. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 3bd2e2216bc82a83fc5048f8e61d2d22dd5d9cda Author: Dmitry Kasatkin Date: Tue Nov 30 10:13:27 2010 +0200 crypto: omap-aes - DMA initialization fixes for OMAP off mode DMA parameters for constant data were initialized during driver probe(). It seems that those settings sometimes are lost when devices goes to off mode. This patch makes DMA initialization just before use. It solves off mode problems. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit c920fa6051c1e7eb3733eaefd01e5bcdddb3d4c8 Author: Steffen Klassert Date: Mon Nov 22 11:26:54 2010 +0100 crypto: Use scatterwalk_crypto_chain Use scatterwalk_crypto_chain in favor of locally defined chaining functions. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 079f2f7485648c1397a35575fae45908a0db5ba6 Author: Steffen Klassert Date: Mon Nov 22 11:25:50 2010 +0100 crypto: scatterwalk - Add scatterwalk_crypto_chain helper A lot of crypto algorithms implement their own chaining function. So add a generic one that can be used from all the algorithms that need scatterlist chaining. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 821eb21d97a8b686649c08b7284d0b9f34d0e138 Author: Dave Chinner Date: Thu Dec 2 16:31:13 2010 +1100 xfs: connect up buffer reclaim priority hooks Now that the buffer reclaim infrastructure can handle different reclaim priorities for different types of buffers, reconnect the hooks in the XFS code that has been sitting dormant since it was ported to Linux. This should finally give use reclaim prioritisation that is on a par with the functionality that Irix provided XFS 15 years ago. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 430cbeb86fdcbbdabea7d4aa65307de8de425350 Author: Dave Chinner Date: Thu Dec 2 16:30:55 2010 +1100 xfs: add a lru to the XFS buffer cache Introduce a per-buftarg LRU for memory reclaim to operate on. This is the last piece we need to put in place so that we can fully control the buffer lifecycle. This allows XFS to be responsibile for maintaining the working set of buffers under memory pressure instead of relying on the VM reclaim not to take pages we need out from underneath us. The implementation introduces a b_lru_ref counter into the buffer. This is currently set to 1 whenever the buffer is referenced and so is used to determine if the buffer should be added to the LRU or not when freed. Effectively it allows lazy LRU initialisation of the buffer so we do not need to touch the LRU list and locks in xfs_buf_find(). Instead, when the buffer is being released and we drop the last reference to it, we check the b_lru_ref count and if it is none zero we re-add the buffer reference and add the inode to the LRU. The b_lru_ref counter is decremented by the shrinker, and whenever the shrinker comes across a buffer with a zero b_lru_ref counter, if released the LRU reference on the buffer. In the absence of a lookup race, this will result in the buffer being freed. This counting mechanism is used instead of a reference flag so that it is simple to re-introduce buffer-type specific reclaim reference counts to prioritise reclaim more effectively. We still have all those hooks in the XFS code, so this will provide the infrastructure to re-implement that functionality. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit ccb7c410ddc054b8c1ae780319bc98ae092d3854 Author: David S. Miller Date: Wed Dec 1 18:09:13 2010 -0800 timewait_sock: Create and use getpeer op. The only thing AF-specific about remembering the timestamp for a time-wait TCP socket is getting the peer. Abstract that behind a new timewait_sock_ops vector. Support for real IPV6 sockets is not filled in yet, but curiously this makes timewait recycling start to work for v4-mapped ipv6 sockets. Signed-off-by: David S. Miller commit 4399ce402c7c837dec80bf9fb40d079b39b9265a Author: David S. Miller Date: Wed Dec 1 17:29:08 2010 -0800 inetpeer: Fix incorrect comment about inetpeer struct size. Now with ipv6 support it is no longer less than 64 bytes. Signed-off-by: David S. Miller commit 8790ca172a1550949804a2ad59ccea310f680c9f Author: David S. Miller Date: Wed Dec 1 17:28:18 2010 -0800 inetpeer: Kill use of inet_peer_address_t typedef. They are verboten these days. Signed-off-by: David S. Miller commit be21871f24b0fcd8d0d09c8090385c9cec80efa3 Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:26 2010 +0200 Bluetooth: clean up legal text Remove extra spaces from legal text so that legal stuff looks the same for all bluetooth code. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 70f23020e6d89155504b5b39f22505f4aec6fa6f Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:25 2010 +0200 Bluetooth: clean up hci code Do not use assignment in IF condition, remove extra spaces, fixing typos, simplify code. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 894718a6be69d8cfd191dc291b42be32a1e4851b Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:24 2010 +0200 Bluetooth: clean up l2cap code Do not initialize static vars to zero, macros with complex values shall be enclosed with (), remove unneeded braces. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 285b4e90318dcf421a00b2ac3fe8ab713f3281e3 Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:23 2010 +0200 Bluetooth: clean up rfcomm code Remove extra spaces, assignments in if statement, zeroing static variables, extra braces. Fix includes. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 735cbc4784a084b7a76c43c69f9dba683bb3b48b Author: Andrei Emeltchenko Date: Wed Dec 1 16:58:22 2010 +0200 Bluetooth: clean up sco code Do not use assignments in IF condition, remove extra spaces Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit b78d7b4f204a6ba1901af36c95e10fded9816054 Author: Anderson Lizardo Date: Mon Nov 29 12:15:50 2010 -0400 Bluetooth: Fix error handling for l2cap_init() create_singlethread_workqueue() may fail with errors such as -ENOMEM. If this happens, the return value is not set to a negative value and the module load will succeed. It will then crash on module unload because of a destroy_workqueue() call on a NULL pointer. Additionally, the _busy_wq workqueue is not being destroyed if any errors happen on l2cap_init(). Signed-off-by: Anderson Lizardo Signed-off-by: Gustavo F. Padovan commit eeb366564be7c311b31c70821d18a43a8a57f9bc Author: Gustavo F. Padovan Date: Mon Nov 1 18:43:53 2010 +0000 Bluetooth: Get rid of __rfcomm_get_sock_by_channel() rfcomm_get_sock_by_channel() was the only user of this function, so I merged both into rfcomm_get_sock_by_channel(). The socket lock now should be hold outside of rfcomm_get_sock_by_channel() once we hold and release it inside the same function now. Signed-off-by: Gustavo F. Padovan commit e0f0cb56364958223f0cb1f1b0b0eecf1b8dcb95 Author: Gustavo F. Padovan Date: Mon Nov 1 18:43:53 2010 +0000 Bluetooth: Get rid of __l2cap_get_sock_by_psm() l2cap_get_sock_by_psm() was the only user of this function, so I merged both into l2cap_get_sock_by_psm(). The socket lock now should be hold outside of l2cap_get_sock_by_psm() once we hold and release it inside the same function now. Signed-off-by: Gustavo F. Padovan commit cc11b9c14da4ca1c545b424dae2ae8fb1ab04063 Author: Andrei Emeltchenko Date: Mon Nov 22 13:21:37 2010 +0200 Bluetooth: do not use assignment in if condition Fix checkpatch errors like: "ERROR: do not use assignment in if condition" Simplify code and fix one long line. Signed-off-by: Andrei Emeltchenko Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit 940a9eea80946b64b96bd8af1fc71b30c602d057 Author: Andrei Emeltchenko Date: Wed Nov 3 12:32:45 2010 +0200 Bluetooth: timer check sk is not owned before freeing In timer context we might delete l2cap channel used by krfcommd. The check makes sure that sk is not owned. If sk is owned we restart timer for HZ/5. Signed-off-by: Andrei Emeltchenko Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit a49184c229535ebedbb659214db2d4d1d77b7c07 Author: Andrei Emeltchenko Date: Wed Nov 3 12:32:44 2010 +0200 Bluetooth: Check sk is not owned before freeing l2cap_conn Check that socket sk is not locked in user process before removing l2cap connection handler. lock_sock and release_sock do not hold a normal spinlock directly but instead hold the owner field. This means bh_lock_sock can still execute even if the socket is "locked". More info can be found here: http://www.linuxfoundation.org/collaborate/workgroups/networking/socketlocks krfcommd kernel thread may be preempted with l2cap tasklet which remove l2cap_conn structure. If krfcommd is in process of sending of RFCOMM reply (like "RFCOMM UA" reply to "RFCOMM DISC") then kernel crash happens. ... [ 694.175933] Unable to handle kernel NULL pointer dereference at virtual address 00000000 [ 694.184936] pgd = c0004000 [ 694.187683] [00000000] *pgd=00000000 [ 694.191711] Internal error: Oops: 5 [#1] PREEMPT [ 694.196350] last sysfs file: /sys/devices/platform/hci_h4p/firmware/hci_h4p/loading [ 694.260375] CPU: 0 Not tainted (2.6.32.10 #1) [ 694.265106] PC is at l2cap_sock_sendmsg+0x43c/0x73c [l2cap] [ 694.270721] LR is at 0xd7017303 ... [ 694.525085] Backtrace: [ 694.527587] [] (l2cap_sock_sendmsg+0x0/0x73c [l2cap]) from [] (sock_sendmsg+0xb8/0xd8) [ 694.537292] [] (sock_sendmsg+0x0/0xd8) from [] (kernel_sendmsg+0x48/0x80) Signed-off-by: Andrei Emeltchenko Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit d31dbf6e5989b2fd9a30ec5b25436e94f009d6df Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:31 2010 +0400 Bluetooth: hidp: fix information leak to userland Structure hidp_conninfo is copied to userland with version, product, vendor and name fields unitialized if both session->input and session->hid are NULL. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 3185fbd9d7bb166992f072440b3329f58bf2c60a Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:26 2010 +0400 Bluetooth: cmtp: fix information leak to userland Structure cmtp_conninfo is copied to userland with some padding fields unitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 5520d20f68310fc158dcbbecfd5eac5cdfc5a241 Author: Vasiliy Kulikov Date: Sat Oct 30 18:26:21 2010 +0400 Bluetooth: bnep: fix information leak to userland Structure bnep_conninfo is copied to userland with the field "device" that has the last elements unitialized. It leads to leaking of contents of kernel stack memory. Signed-off-by: Vasiliy Kulikov Acked-by: Marcel Holtmann Signed-off-by: Gustavo F. Padovan commit 127178d24c7eb2df53b1ba2b6f6f743e88178a1b Author: Johan Hedberg Date: Thu Nov 18 22:22:29 2010 +0200 Bluetooth: Automate remote name requests In Bluetooth there are no automatic updates of remote device names when they get changed on the remote side. Instead, it is a good idea to do a manual name request when a new connection gets created (for whatever reason) since at this point it is very cheap (no costly baseband connection creation needed just for the sake of the name request). So far userspace has been responsible for this extra name request but tighter control is needed in order not to flood Bluetooth controllers with two many commands during connection creation. It has been shown that some controllers simply fail to function correctly if they get too many (almost) simultaneous commands during connection creation. The simplest way to acheive better control of these commands is to move their sending completely to the kernel side. This patch inserts name requests into the sequence of events that the kernel performs during connection creation. It does this after the remote features have been successfully requested and before any pending authentication requests are performed. The code will work sub-optimally with userspace versions that still do the name requesting themselves (it shouldn't break anything though) so it is recommended to combine this with a userspace software version that doesn't have automated name requests. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 392599b95d76f4f3102d8614bdc1957795cd1a3a Author: Johan Hedberg Date: Thu Nov 18 22:22:28 2010 +0200 Bluetooth: Create a unified authentication request function This patch adds a single function that's responsible for requesting authentication for outgoing connections. This is preparation for the next patch which will add automated name requests and thereby move the authentication requests to a different location. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit ccd556fe334914bf2e465eb5bc480d49cd4406d7 Author: Johan Hedberg Date: Wed Nov 10 17:11:51 2010 +0200 Bluetooth: Simplify remote features callback function logic The current remote and remote extended features event callbacks logic can be made simpler by using a label and goto statements instead of the current multiple levels of nested if statements. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 17f490bcedd7b6677140b2d49efe9e9e6b84de60 Merge: 61790c5 be93112 Author: Gustavo F. Padovan Date: Wed Dec 1 21:04:09 2010 -0200 Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-2.6 into test commit 2cb22a7a5624603b9db3571fc65489f5389b512c Author: Roland Vossen Date: Wed Dec 1 21:37:34 2010 +0100 staging: brcm80211: replaced typedef struct wl_info_t by struct wl_info. Part of the code cleanup effort. CodingStyle doc advises to restrict the usage of typedefs. Also moved several function declarations from .c to .h file because this typedef replace operation induced checkpatch.pl warnings. Signed-off-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman commit 01d11441fd7ede922e10008986ecdb0a84256bc5 Author: Randy Dunlap Date: Wed Dec 1 11:16:35 2010 -0800 staging: brcm80211 needs lots of delay.h Fix lots of errors like: drivers/staging/brcm80211/phy/wlc_phy_n.c:17613: error: implicit declaration of function 'mdelay' drivers/staging/brcm80211/util/nicpci.c:246: error: implicit declaration of function 'udelay' Signed-off-by: Randy Dunlap Cc: Brett Rudley Cc: Henry Ptasinski Cc: Dowan Kim Cc: Roland Vossen Cc: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit a043b26646444eba28e5010965dbf61bc3ba5277 Author: Brett Rudley Date: Tue Nov 30 20:32:51 2010 -0800 staging: brcm80211: bcmp => memcmp s/bcmp/memcmp/ Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 9249ede9d4d9dbf41ab6545a7a43fd5f6e5aa620 Author: Brett Rudley Date: Tue Nov 30 20:09:49 2010 -0800 staging: brcm80211: bzero => memset s/bzero/memset/g Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit c10407ac459577f6b58f3db0777b6d0d53a3be9f Author: Brett Rudley Date: Tue Nov 30 17:35:09 2010 -0800 staging: brcm80211: remove OSL_SYSUPTIME_SUPPORT Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit c53d201371bf45cdb5b843ade52edd8903bb72f6 Author: Brett Rudley Date: Tue Nov 30 15:22:15 2010 -0800 staging: brcm80211: Remove bogus gcc version checking Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit f5343314f62ba392ec069210ae342bc32c4ce367 Author: Brett Rudley Date: Tue Nov 30 15:22:14 2010 -0800 staging: brcm80211: Remove unused PKTFREESETCB Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 954c7a6c960bcedf28e8b5dcdcd6fe68d8c6c110 Author: Brett Rudley Date: Tue Nov 30 15:22:13 2010 -0800 staging: brcm80211: Remove OSL_DMADDRWIDTH Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit b834517572d19d34c9cd9adb878aec3138db9224 Author: David Chosrova Date: Wed Dec 1 13:42:16 2010 +0100 Staging: rtl8192u: check return code kmalloc. This patch checks the return code of kmalloc when trying to allocate memory for priv->rx_urb in rtl8192_usb_initendpoints(), return -ENOMEM when failed. Signed-off-by: David Chosrova Signed-off-by: Greg Kroah-Hartman commit 8c66be9203d891ea37346a78925f0e6534b98bd3 Author: Michael Hennerich Date: Wed Dec 1 17:34:39 2010 +0100 staging: iio: dds: ad9832: Fix kconfig description The AD9832 driver doesn't support the AD9833 and AD9834 Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0e7a3e7a746b5dc6ccf9896e882441c4fdbfd09a Author: David Chosrova Date: Mon Nov 29 21:50:48 2010 +0100 Staging: rtl8192u: remove dead code to disable dot11d This patch removes all the ENABLE_DOT11D ifdefs. It is always defined for driver. DOT11D has to do with regulatory domains. What prompted this patch was a warning message in Sparse. drivers/staging/rtl8192u/r8192U_core.c:247:1: warning: "eqMacAddr" redefined in file included from drivers/staging/rtl8192u/:81:81: drivers/staging/rtl8192u/dot11d.h:35:1: warning: this is the location of the previous definition Now there are no ifdefs around dot11d.h it made no sense to have this second definition, so I removed that macro as well. ( Thanks Dan ;-) ). Acked-by. Dan Carpenter Signed-off-by: David Chosrova Signed-off-by: Greg Kroah-Hartman commit 2894c6cd0ea84c30fc028ba92f8e61fbe7971e65 Author: Pekka Enberg Date: Sun Nov 28 23:00:08 2010 +0200 Staging: w35und: Kill struct wb_usb This patch kills struct wb_usb which now only contains a pointer to struct usb_device. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 9be98819d31c4e105ad028ee092d27a46a9e298a Author: Pekka Enberg Date: Sun Nov 28 23:00:07 2010 +0200 Staging: w35und: Remove unused fields from struct wb_usb This patch removes two unused fields from struct wb_usb: - DetectCount which is always zero - IsUsb20 which is a write-only struct member Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 4398954e5f91e340f5a2db53d219b6562e3e1bf0 Author: Pekka Enberg Date: Sun Nov 28 23:00:06 2010 +0200 Staging: w35und: Kill wblinux_f.h header The wblinux_f.h header file doesn't contain anything that's actually used. Kill it. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 01b5ceeca5aa45735a987420c83228a9778a791f Author: Pekka Enberg Date: Sun Nov 28 23:00:05 2010 +0200 Staging: w35und: Merge mlmetxrx.c to mds.c This patch merges mlmetxrx.c to mds.c because it's small and the functions are only used in mto.c. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 37b0544a4a455609cbf25fa56441a6f1221dec85 Author: Pekka Enberg Date: Sun Nov 28 23:00:04 2010 +0200 Staging: w35und: Kill _IBSS_BEACON_SEQ_STICK_ This patch kills the _IBSS_BEACON_SEQ_STICK_ ifdefs because the macro is never defined. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 9618386a4e58e0459932846d9b07fa81225840d3 Author: Pekka Enberg Date: Sun Nov 28 23:00:03 2010 +0200 Staging: w35und: Kill write-only ->TxToggle This patch removes ->TxToggle from struct wb35_mds because it's a write only struct member. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 9255650cbf997762bd667896b0b86661cd81c9b4 Author: Pekka Enberg Date: Sun Nov 28 23:00:02 2010 +0200 Staging: w35und: Kill Vendor2 ifdef from hal_init_hardware The Vendor2 macro is never defined so remove the ifdef'd block from hal_init_hardware(). Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit ddee7e28e7d5e4ba2b8537c6a59b035745c250bb Author: Pekka Enberg Date: Sun Nov 28 23:00:01 2010 +0200 Staging: w35und: Remove empty sysdef.h header The sysdef.h header is empty now so kill it. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 2855bb79d75ad1419b1f54008f861a39517acfd5 Author: Pekka Enberg Date: Sun Nov 28 23:00:00 2010 +0200 Staging: w35und: Use pr_debug() for debugging Use pr_debug() for debugging printk's and kill the FULL_DEBUG macro. It would be even better to use dev_dbg() but unfortunately looking up struct device in the current code structure makes things very ugly. Please note that I dropped the DataDmp() calls from RFSynthesizer_SwitchingChannel() because that function doesn't exist. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit a4170e3dddc5eb88d23dd5f6e7c9cdefc244001e Author: Pekka Enberg Date: Sun Nov 28 22:59:59 2010 +0200 Staging: w35und: Kill unused code in mac_structures.h This patch kills tons of unused macros and struct definitions from mac_structures.h. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit c84fa49f61798b6248cef56876f1643db3b7b2f3 Author: Pekka Enberg Date: Sun Nov 28 22:59:58 2010 +0200 Staging: w35und: Kill WPA2 definitions The _WPA2_ macro is always defined but the data structures that are wrapped by it are never used. Kill them. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 1140bd9f30f4d6dac6b53365a70819ecd4cc8c54 Author: Pekka Enberg Date: Sun Nov 28 22:59:57 2010 +0200 Staging: w35und: Kill _USE_FALLBACK_RATE_ macro The _USE_FALLBACK_RATE_ macro parametrizes DEFAULT_RATE_RETRY_LIMIT. It's only used in Mxx_initial() in reg.c where _USE_FALLBACK_RATE_ is always defined because the reg.c file includes sysdef.h at the top. It's therefore safe to remove the _USE_FALLBACK_RATE_ macro. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit ac5435b9800f313bdcd6a43444ceb1d89f241a5e Author: Pekka Enberg Date: Sun Nov 28 22:59:56 2010 +0200 Staging: w35und: Remove unused defines from sysdef.h This patch removes all the defines in sysdef.h that are not used at all. Cc: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit d7470b6afca85ed4388fff57fc9d89f5a3be02ff Author: Stephane Eranian Date: Wed Dec 1 18:49:05 2010 +0200 perf stat: Add csv-style output This patch adds an option (-x/--field-separator) to print counts using a CSV-style output. The user can pass a custom separator. This makes it very easy to import counts directly into your favorite spreadsheet without having to write scripts. Example: $ perf stat --field-separator=, -a -- sleep 1 4009.961740,task-clock-msecs 13,context-switches 2,CPU-migrations 189,page-faults 9596385684,cycles 3493659441,instructions 872897069,branches 41562,branch-misses 22424,cache-references 1289,cache-misses Works also in non-aggregated mode: $ perf stat -x , -a -A -- sleep 1 CPU0,1002.526168,task-clock-msecs CPU1,1002.528365,task-clock-msecs CPU2,1002.523360,task-clock-msecs CPU3,1002.519878,task-clock-msecs CPU0,1,context-switches CPU1,5,context-switches CPU2,5,context-switches CPU3,6,context-switches CPU0,0,CPU-migrations CPU1,1,CPU-migrations CPU2,0,CPU-migrations CPU3,1,CPU-migrations CPU0,2,page-faults CPU1,6,page-faults CPU2,9,page-faults CPU3,174,page-faults CPU0,2399439771,cycles CPU1,2380369063,cycles CPU2,2399142710,cycles CPU3,2373161192,cycles CPU0,872900618,instructions CPU1,873030960,instructions CPU2,872714525,instructions CPU3,874460580,instructions CPU0,221556839,branches CPU1,218134342,branches CPU2,218161730,branches CPU3,218284093,branches CPU0,18556,branch-misses CPU1,1449,branch-misses CPU2,3447,branch-misses CPU3,12714,branch-misses CPU0,8330,cache-references CPU1,313844,cache-references CPU2,47993728,cache-references CPU3,826481,cache-references CPU0,272,cache-misses CPU1,5360,cache-misses CPU2,1342193,cache-misses CPU3,13992,cache-misses This second version adds the ability to name a separator and uses field-separator as the long option to be consistent with perf report. Commiter note: Since we enabled --big-num by default in 201e0b0 and -x can't be used with it, we need to notice if the user explicitely enabled or disabled -B, add code to disable big_num if the user didn't explicitely set --big_num when -x is used. Cc: David S. Miller Cc: Frederik Weisbecker Cc: Ingo Molnar Cc: paulus@samba.org Cc: Peter Zijlstra Cc: Robert Richter LKML-Reference: <4cf68aa7.0fedd80a.5294.1203@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit 67d5288049f46f816181f63eaa8f1371877ad8ea Author: Jon Mason Date: Mon Nov 29 18:02:47 2010 +0000 vxge: update driver version Update vxge driver version Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit ead5d238146981f922e3848fac83825d87c518f0 Author: Jon Mason Date: Mon Nov 29 18:02:46 2010 +0000 vxge: use strcpy for strings Use strncpy instead of memcpy when working on strings Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1bacdbb341e8c92c58651f06727318c3d0c1c30e Author: Jon Mason Date: Mon Nov 29 18:02:45 2010 +0000 vxge: remove unnecessary printks Remove printks for ring blocks, fifo blocks, and rx doorbell mode as they clutter the dmesg output during modprobe and provide no useful information. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 8afe7c8acd33bc52c56546e73e46e9d546269e2c Author: stephen hemminger Date: Mon Nov 29 09:47:49 2010 +0000 ipip: add module alias for tunl0 tunnel device If ipip is built as a module the 'ip tunnel add' command would fail because the ipip module was not being autoloaded. Adding an alias for the tunl0 device name cause dev_load() to autoload it when needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 4da6a738ffdb99b88efbe5b4c4fe521ca453640d Author: stephen hemminger Date: Mon Nov 29 09:47:48 2010 +0000 gre: add module alias for gre0 tunnel device If gre is built as a module the 'ip tunnel add' command would fail because the ip_gre module was not being autoloaded. Adding an alias for the gre0 device name cause dev_load() to autoload it when needed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 407d6fcbfdd011bcc2dd9e6923c5cca00abbfc6f Author: stephen hemminger Date: Mon Nov 29 09:47:47 2010 +0000 gre: minor cleanups Use strcpy() rather the sprintf() for the case where name is getting generated. Fix indentation. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit f2cd2d3e9b3ef960612e362f0ad129d735452df2 Author: Eric Dumazet Date: Mon Nov 29 08:14:37 2010 +0000 net sched: use xps information for qdisc NUMA affinity Allocate qdisc memory according to NUMA properties of cpus included in xps map. To be effective, qdisc should be (re)setup after changes of /sys/class/net/eth/queues/tx-/xps_cpus I added a numa_node field in struct netdev_queue, containing NUMA node if all cpus included in xps_cpus share same node, else -1. Signed-off-by: Eric Dumazet Cc: Ben Hutchings Cc: Tom Herbert Signed-off-by: David S. Miller commit 0793f83f0ec2142d06abe53570417c8d95e0310a Author: Dmitry Kravkov Date: Wed Dec 1 12:39:28 2010 -0800 bnx2x: Add Nic partitioning mode (57712 devices) NIC partitioning is another flavor of multi function - having few PCI functions share the same physical port. Unlike the currently supported mode of multi-function which depends on the switch configuration and uses outer-VLAN, the NPAR mode is switch independent and uses the MAC addresses to distribute incoming packets to the different functions. This patch adds the specific HW setting of the NPAR mode and some distinctions between switch dependent (SD) and switch independent (SI) multi-function (MF) modes where the configuration is not the same. Advance driver version to 1.60.00-6 Signed-off-by: Dmitry Kravkov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 201e0b06efee80ce090579aa165c65c3d0836d95 Author: Arnaldo Carvalho de Melo Date: Wed Dec 1 17:53:27 2010 -0200 perf stat: Use --big-num format by default [acme@mica linux]$ perf stat ls > /dev/null Performance counter stats for 'ls': 1.512532 task-clock-msecs # 0.801 CPUs 2 context-switches # 0.001 M/sec 0 CPU-migrations # 0.000 M/sec 241 page-faults # 0.159 M/sec 2,973,331 cycles # 1965.797 M/sec 1,460,802 instructions # 0.491 IPC 314,642 branches # 208.023 M/sec 18,475 branch-misses # 5.872 % cache-references cache-misses 0.001887676 seconds time elapsed To get the previous behaviour just use --no-big-num: [acme@mica linux]$ perf stat --no-big-num ls > /dev/null Performance counter stats for 'ls': 1.468014 task-clock-msecs # 0.795 CPUs 1 context-switches # 0.001 M/sec 0 CPU-migrations # 0.000 M/sec 241 page-faults # 0.164 M/sec 2900254 cycles # 1975.631 M/sec 1437991 instructions # 0.496 IPC 310905 branches # 211.786 M/sec 17912 branch-misses # 5.761 % cache-references cache-misses 0.001845435 seconds time elapsed [acme@mica linux]$ Suggested-by: Ingo Molnar Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 8c207692fc8fa3ea1a5ff97ad698efb09a81975a Author: Shawn Bohrer Date: Tue Nov 30 19:57:19 2010 -0600 perf stat: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-12-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit f68d6bd451782b58c2b563dc86f0a81ba106c30c Author: Shawn Bohrer Date: Tue Nov 30 19:57:20 2010 -0600 perf test: Fix spelling mistake in documentation Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-13-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 646420f1bcf6ddf3e150f92a5f2a8bd7d6057ff8 Author: Shawn Bohrer Date: Tue Nov 30 19:57:22 2010 -0600 perf trace: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-15-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 2e7a988198b11877d844d147ec81c7caea82c314 Author: Shawn Bohrer Date: Tue Nov 30 19:57:21 2010 -0600 perf top: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-14-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 1eacc94a66ce347abbf75f223361b21461331383 Author: Shawn Bohrer Date: Tue Nov 30 19:57:18 2010 -0600 perf sched: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-11-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit e04fffc321aeebab4962cfc120952272f2d1df98 Author: Shawn Bohrer Date: Tue Nov 30 19:57:17 2010 -0600 perf report: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-10-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 08dbd7e3fa2398910713b21399cca7c6e4b43011 Author: Shawn Bohrer Date: Tue Nov 30 19:57:16 2010 -0600 perf record: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-9-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 9d5b7f5b2b2c1ceade1fbbaefb2bd9167436329d Author: Shawn Bohrer Date: Tue Nov 30 19:57:15 2010 -0600 perf probe: Fix spelling mistake in documentation Acked-by: Masami Hiramatsu Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-8-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 4aace251519745977f4b5ddf625b630b4807be3a Author: Shawn Bohrer Date: Tue Nov 30 19:57:14 2010 -0600 perf lock: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-7-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 5c0ef0ab077c8bdb224540fea60473439be1bdb4 Author: Shawn Bohrer Date: Tue Nov 30 19:57:13 2010 -0600 perf kvm: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-6-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 5ea4f857850450dc1442144a00547d6623d79d78 Author: Shawn Bohrer Date: Tue Nov 30 19:57:12 2010 -0600 perf diff: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-5-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 342955593af08f185279e074b3d77719d2f23b82 Author: Shawn Bohrer Date: Tue Nov 30 19:57:11 2010 -0600 perf diff: Fix displacement and modules options short flag The --displacement and --modules options to perf diff both use -m as a short flag. Change --displacement to use -M since other perf commands use -m, --modules. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-4-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit b6a535dbf615e168e796eec7318c77d1a3b7047f Author: Shawn Bohrer Date: Tue Nov 30 19:57:10 2010 -0600 perf buildid-list: Document missing options Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-3-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 1968ad911d0769e58a484bb721d275814baf9f2f Author: Shawn Bohrer Date: Tue Nov 30 19:57:09 2010 -0600 perf annotate: Document missing options. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1291168642-11402-2-git-send-email-shawn.bohrer@gmail.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit d0777f2c3eda180e3fc549e0efbe741014f17689 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:16 2010 -0800 spi/pxa2xx: Consider CE4100's FIFO depth For PXA the default threshold is FIFO_DEPTH / 2. Adjust this value for CE4100. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit d6ea3df0d470fb9260db93883f97764cf9f0e562 Author: Sebastian Andrzej Siewior Date: Wed Nov 24 10:17:14 2010 +0100 spi/pxa2xx: Add CE4100 support Sodaville's SPI controller is very much the same as in PXA25x. The difference: - The RX/TX FIFO is only 4 words deep instead of 16 - No DMA support - The SPI controller offers a CS functionality Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit cca67a3668392857641e9440ca6dc16a48b12e37 Author: Axel Lin Date: Wed Dec 1 17:22:34 2010 +0800 ASoC: ak4535: Improve readability for setting mute The mute/unmute is controled by SMUTE (Soft Mute Control bit): 0: Normal Operation (Default) 1: DAC outputs soft-muted I think this change improves readability. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 806bfedfb124b85d2e2b8ecdb8a451b23abed386 Author: Kuninori Morimoto Date: Wed Dec 1 15:50:52 2010 +0900 ASoC: sh: fsi-ak4642: midify card name Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 437f6a2b25becc0a2c2cfe02ce78d65a4957e5d8 Author: Kuninori Morimoto Date: Wed Dec 1 15:50:42 2010 +0900 ASoC: sh: fsi-ak4642: tidyup unnecessary variables Signed-off-by: Kuninori Morimoto Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 131d81061eba5ffd436b5d132530ac5205b16892 Author: Mark Brown Date: Tue Nov 30 17:03:39 2010 +0000 ASoC: Allow user-specified WM8958 multiband compressor configurations The paramters of the WM8958 multiband compressor can be tuned by the user for their system using a graphical configuration tool on the host. Allow the user to specify a set of such paramters in platform data and select between them at runtime. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit b2822a8c22d13bc8c441e1c0492baa40ae974b51 Author: Mark Brown Date: Tue Nov 30 16:59:29 2010 +0000 ASoC: Correct event flags for WM8958 AIF DACs We need a post notification as we need to shut down the MBC after the data stops flowing rather than before. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 97884b7a7867fa9926a0711035cefaa4d0aafda4 Merge: 06c6f4d 2062ea5 Author: Mark Brown Date: Wed Dec 1 11:34:27 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 06c6f4d34a23f7c9c783f1a875bb492b15fa23ac Author: Jarkko Nikula Date: Wed Dec 1 09:10:47 2010 +0200 ASoC: Fix build failure in soc-core.c Commit 2eea392 "ASoC: Add support for optional auxiliary dailess codecs" causes a build failure in soc-core.c: soc_probe_aux_dev since code tries to access non-existing struct snd_soc_dapm_context and struct snd_soc_card members. Root cause for this was a double accident. Author sent the RFC patch from top of another patch set and the RFC got committed. Fix the build failure by removing the code line that depends on that another patch set. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 8348c259dd6a6019a8fa01b0a3443409480f7b9d Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:15 2010 -0800 arm/pxa2xx: reorgazine SSP and SPI header files The PXA-SPI driver relies on some files / defines which are arm specific and are within the ARM tree. The CE4100 SoC which is x86 has also the SPI core. This patch moves the ssp and spi files from arm/mach-pxa and plat-pxa to include/linux where the CE4100 can access them. This move got 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 Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 4a25605fb71f02b4f80091df91f777225a0309c5 Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:15 2010 -0800 spi/pxa2xx: Use define for SSSR_TFL_MASK instead of plain numbers Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 49cbb1e0b6dcba9170e72fdf40c75fc24cadba4b Author: Sebastian Andrzej Siewior Date: Mon Nov 22 17:12:14 2010 -0800 spi/pxa2xx: add support for shared IRQ handler This is required in case the interrupt line is shared with other devices. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 28b26e15533e60970a014582d812d471ad63bcd0 Author: Florian Faber Date: Wed Dec 1 12:14:47 2010 +0100 ALSA: hdsp - Add support for RPM io box Add support for the RME HDSP RPM IO box. Changes have been made in the identification of the IO box and the neccessary controls have been added. Signed-off-by: Florian Faber Signed-off-by: Takashi Iwai commit 257e48f1474a1f5bfa6fcafb12f77a8479063293 Author: Chris Wilson Date: Mon Nov 29 16:19:24 2010 +0000 drm/i915/lvds: Disable panel-fitter on gen4 for 1:1 scale factors Signed-off-by: Chris Wilson commit 50005a8deb38e5e6456ebd94e57adb321d4589de Author: Russell King Date: Fri Nov 12 13:04:16 2010 +0000 ARM: module: ignore unwind for sections not marked SHF_ALLOC If a section is not marked with SHF_ALLOC, it will be discarded by the module code. Therefore, it is not correct to register the unwind tables. Signed-off-by: Russell King commit 8931360eb9c6ec8bd30efef579cef81917a2fcf3 Author: Russell King Date: Fri Nov 12 13:02:46 2010 +0000 ARM: module: clean up handling of ELF unwind tables There's no need to keep pointers to the ELF sections available while the module is loaded - we only need the section pointers while we're finding and registering the unwind tables, which can all be done during the finalize stage of loading. Signed-off-by: Russell King commit 0607f8622953541e95030ab011258d9f1f381357 Author: Felipe Balbi Date: Wed Dec 1 11:03:54 2010 +0200 usb: musb: gadget: prevent a NULL pointer dereference Case we can't allocate struct musb_request, prevent a NULL pointer dereference by returning early. Signed-off-by: Felipe Balbi commit fcf173e4511193b1efeccb0f22a8c641b464353b Author: Hema Kalliguddi Date: Wed Sep 29 11:26:39 2010 -0500 usb: musb: add names for IRQs in structure resource Soon resource data will get automatically populated from a set of autogenerated data from TI's hardware database for the OMAP platform. Such database, might not have resources at the expected order by the current drivers. While we could hack in some exceptions to that tool to generate resources in a specific order, it seems less fragile to use the resource name instead. That way, no matter what order the resources are generated, the driver still work. Modified the OMAP, Blackfin and Davinci architecture files to add the name of the IRQs in the resource structures and musb driver to use the platform_get_irq_byname() api to get the device and dma irq numbers instead of using the index. Cc: Tony Lindgren Acked-by: Kevin Hilman Acked-by: Mike Frysinger Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit ea65df57c2eea803535a071752efb030c46a11f5 Author: Hema Kalliguddi Date: Wed Sep 22 19:27:40 2010 -0500 usb: musb: remove board_data parameter from musb_platform_init() Removed the board_data parameter being passed to musb_platform_init function as board_data can be extracted from device structure which is already member of musb structure. Acked-by: Kevin Hilman Cc: Tony Lindgren Signed-off-by: Hema HK Signed-off-by: Felipe Balbi commit b3d006c0e745bfd2dab4984ffe3279d5cf4e926a Merge: 4c635a4 133dc4c Author: Ingo Molnar Date: Wed Dec 1 09:18:12 2010 +0100 Merge branch 'perf/rename' into perf/core Merge reason: This is an older commit under testing that was not pushed yet - merge it. Also fix up the merge in command-list.txt. Signed-off-by: Ingo Molnar Acked-by: Tom Zanussi commit da0c490115de026618a7fdcd886602da44392a50 Author: Joe Perches Date: Mon Nov 29 23:33:07 2010 -0800 Input: use pr_fmt and pr_ Signed-off-by: Joe Perches Signed-off-by: Dmitry Torokhov commit 4eb3c30b2e034b673df3e8f21b497e39f3911a02 Author: Joe Perches Date: Mon Nov 29 23:33:07 2010 -0800 Input: i8042 - use pr_, pr_fmt, fix dbg and __FILE__ use Standardized message logging prefixes. Removed \n from dbg macro, added \n to each dbg call site. Removed direct use of __FILE__ from dbg, converted to pr_fmt(fmt) Added non-debug printf argument verification of dbg calls Removed "i8042.c" from printks, converted to pr_ Signed-off-by: Joe Perches Signed-off-by: Dmitry Torokhov commit b029ffafe89cf4b97cf39e0225a5205cbbf9e02f Author: Hemanth V Date: Tue Nov 30 23:03:54 2010 -0800 Input: add CMA3000 accelerometer driver Add support for CMA3000 Tri-axis accelerometer, which supports Motion detect, Measurement and Free fall modes. CMA3000 supports both I2C/SPI bus for communication, currently the driver supports I2C based communication. Signed-off-by: Hemanth V Reviewed-by: Jonathan Cameron Reviewed-by: Sergio Aguirre Reviewed-by: Shubhrajyoti Signed-off-by: Dmitry Torokhov commit e3e9887ee9de36d8e2bef972ad74a42abd7a44c4 Author: Paul Mundt Date: Wed Dec 1 15:58:58 2010 +0900 sh: Convert to USB_ARCH_HAS_OHCI/EHCI selects. This switches over to selects for the subtypes to enable OHCI/EHCI support explicitly rather than littering the usb Kconfig with subtype dependencies. Suggested-by: David Daney Signed-off-by: Paul Mundt commit 1a44d72a4058f870c305a23aa5cbc4cacb6758ea Author: Kuninori Morimoto Date: Wed Dec 1 00:31:46 2010 +0000 ARM: mach-shmobile: mackerel: Add FSI-AK4643 support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit d44deb35c26c74d0f1ebea95a5fc386f72d210f7 Author: Kuninori Morimoto Date: Tue Nov 30 06:52:18 2010 +0000 ARM: mach-shmobile: mackerel: Add LEDs support you can control it by echo 0 > /sys/class/leds/led0/brightness echo 1 > /sys/class/leds/led0/brightness Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2 Author: Daniel Walker Date: Tue Nov 30 11:25:39 2010 -0800 drivers: char: hvc: add arm JTAG DCC console support This driver adds a basic console that uses the arm JTAG DCC to transfer data back and forth. It has support for ARMv6 and ARMv7. This console is created under the HVC driver, and should be named /dev/hvcX (or /dev/hvc0 for example). Cc: Tony Lindgren Acked-by: Arnd Bergmann Acked-by: Nicolas Pitre Cc: Mike Frysinger Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman commit de6f86ce51341559dc3c9c9f5c562da12fcfcb31 Author: Yegor Yefremov Date: Mon Nov 22 11:06:32 2010 +0100 RS485 documentation: add 16C950 UART description Add a notion about 16C950 UART, that is using DTR signal for RS485 mode. Signed-off-by: Yegor Yefremov Signed-off-by: Greg Kroah-Hartman commit a4fb0b228e284107b9bdf44769bbdc80efd660e1 Author: Vasiliy Kulikov Date: Fri Nov 19 21:41:45 2010 +0300 serial: ifx6x60: fix memory leak If tty_register_driver() failed then tty_driver is still alive. Free it with put_tty_driver(). Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit badb9533abbbba70df099765afe4ae432b442430 Author: Vasiliy Kulikov Date: Fri Nov 19 21:42:03 2010 +0300 serial: ifx6x60: free IRQ on error If second request_irq() failed then the first IRQ must be freed in error handling code. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 3c6a483275f47a2ef7119309ad3d791c10cf30da Author: Tomoya MORINAGA Date: Wed Nov 17 09:55:54 2010 +0900 Serial: EG20T: add PCH_UART driver UART driver of Intel EG20T(Topcliff) PCH Intel EG20T PCH is the platform controller hub that is going to be used in Intel's general embedded platform. All IO peripherals in Intel EG20T PCH are actually devices sitting on AMBA bus. Intel EG20T PCH has UART I/F. Using this I/F, it is able to access system devices connected to UART. Signed-off-by: Tomoya MORINAGA Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 095e24b0ea75b2bdc532b39b04530993442f237f Author: Dirk Brandewie Date: Wed Nov 17 07:35:20 2010 -0800 Serial: ce4100: Add PCI UART support for the ce4100 This patch adds support for the PCI UART on the ce4100. Signed-off-by: Dirk Brandewie Signed-off-by: Greg Kroah-Hartman commit 0ae86689d88bebba16c2db899f845446578d53b3 Merge: e7cddda 6aa85a5 Author: Greg Kroah-Hartman Date: Tue Nov 30 17:04:33 2010 -0800 Merge branch 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb into usb-next * 'omap4-ehci-for-greg' of git://dev.omapzoom.org/pub/scm/anand/linux-omap-usb: omap4: 4430sdp: enable the ehci port on 4430SDP arm: omap4: select USB_ARCH_HAS_EHCI arm: omap4: usb: add platform init code for EHCI arm: omap4: add USBHOST and related base addresses usb: ehci-omap: Add OMAP4 support omap: usb: ehci: introduce HSIC mode usb: ehci-omap: add helpers for checking port mode usb: ehci-omap: use clkdev aliases for functional clocks omap: clock: add clkdev aliases for EHCI clocks usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP usb: ehci-omap: don't hard-code TLL channel count usb: ehci-omap: update clock names to be more generic commit 4c635a4e04700a371ef7e4d4bb33ed88747e801e Author: Corey Ashford Date: Tue Nov 30 14:27:01 2010 -0800 perf tools: fix event parsing of comma-separated tracepoint events There are number of issues that prevent the use of multiple tracepoint events being specified in a -e/--event switch, separated by commas. For example, perf stat -e irq:irq_handler_entry,irq:irq_handler_exit ... fails because the tracepoint event parsing code doesn't recognize the comma separator properly. This patch corrects those issues. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Julia Lawall Cc: Paul Mackerras Cc: Peter Zijlstra Reported-by: Michael Ellerman LKML-Reference: <1291156021-17711-1-git-send-email-cjashfor@linux.vnet.ibm.com> Signed-off-by: Corey Ashford Signed-off-by: Arnaldo Carvalho de Melo commit 3e8e24f2fc66d32eb0e570e4117dfd05227047e6 Author: Don Zickus Date: Tue Nov 30 17:12:13 2010 -0500 perf packaging: add memcpy to perf MANIFEST There seems to be a new dependency on arch/*/lib/memcpy*.S when compiling the perf tool. Make sure that file is included in the MANIFEST when creating the tarball. Cc: Ingo Molnar LKML-Reference: <1291155133-3499-2-git-send-email-dzickus@redhat.com> Signed-off-by: Don Zickus Signed-off-by: Arnaldo Carvalho de Melo commit e7cddda48c7f892a3fb5c10a6f41a4395f46c0c2 Author: cxie4 Date: Tue Nov 30 13:35:15 2010 +0800 USB: pxa: Add USB client support for Marvell PXA9xx/PXA168 chips This patch add USB client support Marvell PXA9xx/PXA168 chips. The USB controller in PXA9xx/PXA168 is a High-Speed OTG controller. The available endpoints is different between PXA9xx and PXA168. NOTE: It is the first version of Marvell PXA9xx/PXA168 USB controller driver. The support for OTG mode will be added in later patch. PXA9xx and PXA168 has integrated UTMI PHY in the chips. The initialization for the PHY is a little different between PXA9xx and PXA168. Signed-off-by: Chao Xie Signed-off-by: Greg Kroah-Hartman commit b48d7f50e6f16478304170eaf5c2d1a540ba5e31 Author: Paul Mundt Date: Tue Nov 30 17:57:02 2010 +0900 usb: Add in missing EHCI helpers. Several of the EHCI glue drivers either predate or were merged in the same timeframe as API changes at the USB core level, resulting in some missing endpoint_reset and clear_tt_buffer_complete callbacks. This fixes up all of ehci-atmel, mxc, w90x900, and xilinx-of to tie in the new helpers, which brings them in line with everyone else. Reported-by: Alan Stern Signed-off-by: Paul Mundt Signed-off-by: Greg Kroah-Hartman commit 7fc56f0d9908fe140a01387d59954e3d0a2e7744 Author: Luo Andy Date: Tue Nov 23 10:41:21 2010 +0800 usb: gadget: langwell_udc: add usb test mode support This patch adds test mode support for Langwell gadget driver. Signed-off-by: Henry Yuan Signed-off-by: Andy Luo Signed-off-by: Greg Kroah-Hartman commit b23f2f94136884ebeb1b5e2196f4a53086444afa Author: Hao Wu Date: Mon Nov 29 15:17:03 2010 +0800 usb: composite gadget: set vbus_draw current limitation during suspend This patch modifies the composite gadget to set vbus_draw current limitation during suspend state. This current limitation in suspend state shouldn't be more than 2.5mA Signed-off-by: Hao Wu Signed-off-by: Greg Kroah-Hartman commit c3d6450e741da08c3bc2e2ba06d743c27540abac Author: Jarkko Nikula Date: Tue Nov 30 17:58:25 2010 +0200 usb: otg: twl4030-usb: Fix unbalanced regulator disables at module removal Function twl4030_usb_remove can cause unbalanced regulator disables in twl4030_phy_power if the cable is not connected. Regulator enable/disable calls are in balance only if the twl4030_phy_resume was called prior the twl4030_usb_remove, that is, the cable was connected. Fix this by checking the 'asleep' variable in twl4030_usb_remove since that variable is used to check state in other functions. Signed-off-by: Jarkko Nikula Cc: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 02303f73373aa1da19dbec510ec5a4e2576f9610 Author: Dan Williams Date: Fri Nov 19 16:04:00 2010 -0600 usb-wwan: implement TIOCGSERIAL and TIOCSSERIAL to avoid blocking close(2) Some devices (ex ZTE 2726) simply don't respond at all when data is sent to some of their USB interfaces. The data gets stuck in the TTYs queue and sits there until close(2), which them blocks because closing_wait defaults to 30 seconds (even though the fd is O_NONBLOCK). This is rarely desired. Implement the standard mechanism to adjust closing_wait and let applications handle it how they want to. Signed-off-by: Dan Williams commit 73f35c60d5c4a98061fc0f94505bf26fd4bb1a1c Author: Jesper Juhl Date: Tue Nov 9 00:10:52 2010 +0100 USB: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/usb/ Signed-off-by: Jesper Juhl commit b17ea167c5fb50dcd5dce5b874a467f04eec886d Author: Pete Zaitcev Date: Tue Nov 16 21:51:19 2010 -0700 usbmon: correct length for isochronous Usually the usbmon returns the amount of data specified in urb->transfer_buffer_length for output submissions and urb->actual_length for input callbacks. However, for Isochronous input transfers, this is not enough, since the returned data buffer may contain "holes". One easy way to fix this is to use urb->transfer_buffer_length, but this often transfers a whole lot of unused data, so we find how much was actually used instead. Original patch by Márton Németh. See also kernel bug 22182. Signed-off-by: Pete Zaitcev Signed-off-by: Márton Németh Signed-off-by: Greg Kroah-Hartman commit 33069739d1c2f03734d5b5b003593e9552d412c1 Author: Stepan Moskovchenko Date: Fri Nov 12 19:30:00 2010 -0800 msm: iommu: Miscellaneous code cleanup Remove some unneeded assignments and messages, restructure a failure path in iova_to_phys, and make __flush_iotlb return int in preparation for adding IOMMU clock control. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 100832c9b6adb3d63407416931caeba3f3b9a777 Author: Stepan Moskovchenko Date: Mon Nov 15 18:20:08 2010 -0800 msm: iommu: Support cache-coherent memory access Add support for allowing IOMMU memory transactions to be cache coherent, eliminating the need for software cache management in certain situations. This can lead to improvements in performance and power usage, assuming the multimedia core's access pattern exhibits spatial locality and that its working set fits into the cache. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 08bd6839783319085ee0db4c888534e626225774 Author: Stepan Moskovchenko Date: Mon Nov 15 18:19:35 2010 -0800 msm: iommu: Definitions for extended memory attributes Add the register field definitions and memory attribute definitions that will be needed to support IOMMU transactions with cache-coherent memory access. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 0ab84745ef65043a616b36b26bec58e1cb62a742 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:57 2010 -0800 msm: iommu: Kconfig dependency for the IOMMU API Make the IOMMU driver select the IOMMU API in the kernel configuration. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 00d4b2bb03b9ed27f28336b0a68f2bd7f67caa40 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:56 2010 -0800 msm: iommu: Check if device is already attached An IOMMU device can only be attached to one IOMMU domain at any given time. Check whether the device is already attached to a domain before allowing it to be attached to another domain. If so, return busy. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 2607b0a26094b2d2d174c3e27b2ecc9c49d86f40 Author: Stepan Moskovchenko Date: Mon Nov 15 17:46:10 2010 -0800 msm: iommu: Kconfig item for cacheable page tables Add a Kconfig item to allow the IOMMU page tables to be coherent in the L2 cache. This generally reduces IOTLB miss latencies and has been shown to improve multimedia performance. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 5b275ce27077d6463ca28c9671dce7c2c1f622e2 Author: Alan Cox Date: Thu Nov 11 15:27:29 2010 +0000 thermal: make ops constant And while touching that function definition do something about the disaster of formatting there. Signed-off-by: Alan Cox Acked-by: Zhang Rui Signed-off-by: Len Brown commit 5b1c144475a7f2d0ab34d0b9b8414ab18b02a283 Author: Arnaldo Carvalho de Melo Date: Tue Nov 30 17:48:53 2010 -0200 perf debug: Simplify trace_event No need to check that many times if debug_trace is on. Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 52aa8c539dad56728527de664f368915ff44badf Merge: 55a4e78 032a642 Author: Tony Lindgren Date: Tue Nov 30 14:46:36 2010 -0800 Merge branch 'ctrl-wip/mux-omap4-v4' of git://gitorious.org/omap-pm/linux into omap-for-linus commit 55a4e78952286d498d89a399d845e7cfaa8ddd56 Merge: 9c7bc45 27b1fec Author: Tony Lindgren Date: Tue Nov 30 14:45:49 2010 -0800 Merge branch 'pm-hwmod-i2c' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus commit 1d9bc6dc5b6b9cc9299739f0245ce4841f066b92 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 SELinux: merge policydb_index_classes and policydb_index_others We duplicate functionality in policydb_index_classes() and policydb_index_others(). This patch merges those functions just to make it clear there is nothing special happening here. Signed-off-by: Eric Paris commit ac76c05becb6beedbb458d0827d3deaa6f479a72 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 selinux: convert part of the sym_val_to_name array to use flex_array The sym_val_to_name type array can be quite large as it grows linearly with the number of types. With known policies having over 5k types these allocations are growing large enough that they are likely to fail. Convert those to flex_array so no allocation is larger than PAGE_SIZE Signed-off-by: Eric Paris commit 23bdecb000c806cf4ec52764499a600f7200d7a9 Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 selinux: convert type_val_to_struct to flex_array In rawhide type_val_to_struct will allocate 26848 bytes, an order 3 allocations. While this hasn't been seen to fail it isn't outside the realm of possibiliy on systems with severe memory fragmentation. Convert to flex_array so no allocation will ever be bigger than PAGE_SIZE. Signed-off-by: Eric Paris commit c41ab6a1b9028de33e74101cb0aae13098a56fdb Author: Eric Paris Date: Mon Nov 29 15:47:09 2010 -0500 flex_array: fix flex_array_put_ptr macro to be valid C Using flex_array_put_ptr() results in a compile error "error: lvalue required as unary ‘&’ operand" fix the casting order to fix this. Signed-off-by: Eric Paris commit c9e86a9b95f198d7df49b25fcd808ee39cba218f Author: Eric Paris Date: Mon Nov 29 15:46:39 2010 -0500 SELinux: do not set automatic i_ino in selinuxfs selinuxfs carefully uses i_ino to figure out what the inode refers to. The VFS used to generically set this value and we would reset it to something useable. After 85fe4025c616 each filesystem sets this value to a default if needed. Since selinuxfs doesn't use the default value and it can only lead to problems (I'd rather have 2 inodes with i_ino == 0 than one pointing to the wrong data) lets just stop setting a default. Signed-off-by: Eric Paris Acked-by: James Morris commit 7ae9f23cbd3ef9daff7f768da4bfd4c56b19300d Author: Eric Paris Date: Tue Nov 23 11:40:09 2010 -0500 selinux: rework security_netlbl_secattr_to_sid security_netlbl_secattr_to_sid is difficult to follow, especially the return codes. Try to make the function obvious. Signed-off-by: Eric Paris commit 4b02b524487622ce1cf472123899520b583f47dc Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in selinuxfs.c selinuxfs.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit b77a493b1dc8010245feeac001e5c7ed0988678f Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in selinuxfs.c selinuxfs.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit 9398c7f794078dc1768cc061b3da8cdd59f179a5 Author: Eric Paris Date: Tue Nov 23 11:40:08 2010 -0500 SELinux: standardize return code handling in policydb.c policydb.c has lots of different standards on how to handle return paths on error. For the most part transition to rc=errno if (failure) goto out; [...] out: cleanup() return rc; Instead of doing cleanup mid function, or having multiple returns or other options. This doesn't do that for every function, but most of the complex functions which have cleanup routines on error. Signed-off-by: Eric Paris commit 9c7bc451e41abf78b0fd856a9f916f7d39e26297 Merge: 2862945 662b083a 1cb125c Author: Tony Lindgren Date: Tue Nov 30 14:13:15 2010 -0800 Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus commit ad9c2b048b605fbc8d50526e330b88abdd631ab2 Author: Tetsuo Handa Date: Tue Nov 30 11:06:47 2010 +0900 security: Fix comment of security_key_permission Comment for return value of security_key_permission() has been wrong since it was added in 2.6.15. Signed-off-by: Tetsuo Handa Signed-off-by: James Morris commit 662b083a87a3489f3f19c6e0651c1b99b0de5df0 Author: Andrei Emeltchenko Date: Tue Nov 30 14:11:49 2010 -0800 omap: Serial: Define register access modes in LCR Access to some registers depends on register access mode Three different modes are available for OMAP (at least) • Operational mode LCR_REG[7] = 0x0 • Configuration mode A LCR_REG[7] = 0x1 and LCR_REG[7:0]! = 0xBF • Configuration mode B LCR_REG[7] = 0x1 and LCR_REG[7:0] = 0xBF Define access modes and remove redefinitions and magic numbers in serial drivers (and later in bluetooth driver). Signed-off-by: Andrei Emeltchenko Acked-by: Govindraj.R Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 498cb95175c29ed96bf32f30df2d11ec1c7f3879 Author: Andrei Emeltchenko Date: Tue Nov 30 14:11:49 2010 -0800 OMAP: Serial: Define OMAP uart MDR1 reg and remove magic numbers Define MDR1 register serial definitions used in serial and bluetooth drivers. Change magic number to ones defined in serial_reg for omap1/2 serial driver. Remove redefined MDR1 register definitions in omap-serial driver. Signed-off-by: Andrei Emeltchenko Acked-by: G, Manjunath Kondaiah Acked-by: Govindraj.R Acked-by: Greg Kroah-Hartman Signed-off-by: Tony Lindgren commit 5c891f3840a7a330c96d7203d4bb5be6fa033724 Author: Thomas Gleixner Date: Tue Nov 30 17:49:55 2010 +0000 perf session: Allocate chunks of sample objects The ordered sample code allocates singular reference objects struct sample_queue which have 48byte size on 64bit and 20 bytes on 32bit. That's silly. Allocate ~64k sized chunks and hand them out. Performance gain: ~ 15% Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.398713983@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit f6f41eb9ccc0e6fad0ccba4c5e0a97de935db734 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:54 2010 -0800 msm: iommu: Don't flush page tables if no devices attached Don't flush the page tables on an IOMMU domain if there are no IOMMU devices attached to the domain. The act of attaching to the domain will cause an implicit flush of those areas if the page tables are configured to not be L2 cacheable. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 020bb75a6deeca5ebeae531dc7378c157affc8fd Author: Thomas Gleixner Date: Tue Nov 30 17:49:53 2010 +0000 perf session: Cache sample objects When the sample queue is flushed we free the sample reference objects. Though we need to malloc new objects when we process further. Stop the malloc/free orgy and cache the already allocated object for resuage. Only allocate when the cache is empty. Performance gain: ~ 10% Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.338488630@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 516cbc793eb4be5123289d067b54dfcdabeddb25 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:53 2010 -0800 msm: iommu: Mark functions with the right section names Mark the init and exit functions as __init and __exit where appropriate. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit e8952e3b32701817705b216b492a9be4fa5cbefc Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:52 2010 -0800 msm: iommu: Support for the 2nd GFX core's IOMMU Add the platform data and resources needed for the second 2D graphics core's IOMMU. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit ff25ff842ea6afd58ccc2e3f386ee5ac540b6a63 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:51 2010 -0800 msm: iommu: Revise GFX2D0 IOMMU contexts and M2V mappings Based on recommendations from chip designers, optimize the Machine ID to translation context mappings for the first 2D core's IOMMU. Remove the "gfx2d0_texv3_smmu" context, as it is no longer needed under the new mapping scheme. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit fe17420784a6d3602e98f798731369fa05936cbe Author: Thomas Gleixner Date: Tue Nov 30 17:49:49 2010 +0000 perf session: Keep file mmaped instead of malloc/memcpy Profiling perf with perf revealed that a large part of the processing time is spent in malloc/memcpy/free in the sample ordering code. That code copies the data from the mmap into malloc'ed memory. That's silly. We can keep the mmap and just store the pointer in the queuing data structure. For 64 bit this is not a problem as we map the whole file anyway. On 32bit we keep 8 maps around and unmap the oldest before mmaping the next chunk of the file. Performance gain: 2.95s -> 1.23s (Faktor 2.4) Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.278787719@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 55b44629f599a2305265ae9c77f9d9bcfd6ddc17 Author: Thomas Gleixner Date: Tue Nov 30 17:49:46 2010 +0000 perf session: Use sensible mmap size On 64bit we can map the whole file in one go, on 32bit we can at least map 32MB and not map/unmap tiny chunks of the file. Base the progress bar on 1/16 of the data size. Preparatory patch to get rid of the malloc/memcpy/free of trace data. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.213687773@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit d6513281c5f728d138ba895d600b9788e51508b1 Author: Thomas Gleixner Date: Tue Nov 30 17:49:44 2010 +0000 perf session: Simplify termination checks No need to check twice. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.152886642@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 85b99952ccd3d84707661d8ae103c710daca1c8a Author: Thomas Gleixner Date: Tue Nov 30 17:49:41 2010 +0000 perf session: Move ui_progress_update in __perf_session__process_events() The progress bar is changed when the file offset changes. This happens only when the next mmap is done. No need to call ui_progress_update() for every event. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.094836523@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 0331ee0cf4187dcdc2b184cf701d8b58bf9ff637 Author: Thomas Gleixner Date: Tue Nov 30 17:49:38 2010 +0000 perf session: Cleanup __perf_session__process_events() Replace the pseudo C++ self argument with session and give the mmap related variables a sensible name. shift is a complete misnomer - it took me several rounds of cursing to figure out that it's not a shift value. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163820.029687218@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit a5fcd5f59a2658a579533d6774e871aea7ab5e92 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:50 2010 -0800 msm: iommu: Revise GFX3D IOMMU contexts and M2V mappings Based on recommendations from chip designers, optimize the Machine ID to translation context mappings for the 3D core's IOMMU. Remove the the "gfx3d_smmu" context device, as it is no longer needed under the new mapping scheme. Signed-off-by: Stepan Moskovchenko [dwalker@codeaurora.org: updated commit text] Signed-off-by: Daniel Walker commit 28990f75e66b36faf6ce56747890009d4e250243 Author: Thomas Gleixner Date: Tue Nov 30 17:49:35 2010 +0000 perf session: Use appropriate pointer type instead of silly typecasting There is no reason to use a struct sample_event pointer in struct sample_queue and type cast it when flushing the queue. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163819.969462809@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 12943325cda3be10819e047cd8b5032a4fef6080 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:49 2010 -0800 msm: iommu: Use more consistent naming in platform data Rename all the IOMMU platform devices so that the names are more consistent with the rest of the codebase. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit c4bd2eebee37b885b47ec48961923b671148703f Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:48 2010 -0800 msm: iomap: Addresses and IRQs for 2nd GFX core IOMMU Add register addresses and IRQ numbers for the IOMMU used for the second 2D graphics core. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit 23513c3b39207c569da2c8afdced62ec43b4a272 Author: Stepan Moskovchenko Date: Fri Nov 12 19:29:47 2010 -0800 msm: iommu: Increase maximum MID size to 5 bits On msm8x60, the MID field on the AXI connection to the IOMMU can be up to five bits wide. Thus, allow the IOMMU context platform data to map up to 32 MIDs. Signed-off-by: Stepan Moskovchenko Signed-off-by: Daniel Walker commit a1225decc43849a73f7e4c333c3fdbbb8a9c1e65 Author: Thomas Gleixner Date: Tue Nov 30 17:49:33 2010 +0000 perf session: Fix list sort algorithm The homebrewn sort algorithm fails to sort in time order. One of the problem spots is that it fails to deal with equal timestamps correctly. My first gut reaction was to replace the fancy list with an rbtree, but the performance is 3 times worse. Rewrite it so it works. Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Frederic Weisbecker LKML-Reference: <20101130163819.908482530@linutronix.de> Signed-off-by: Thomas Gleixner Signed-off-by: Arnaldo Carvalho de Melo commit 70cc2c00d7471f21120befeb7fc107c856e3985b Author: Gregory Bean Date: Wed Nov 24 11:53:52 2010 -0800 msm: gpio: Add irq support to v2 gpiolib. Complete the MSM v2 gpio subsystem by adding irq_chip. Signed-off-by: Gregory Bean Signed-off-by: Daniel Walker commit 0cc2fc1f2f5f1fcf6699b43d73ca3e753ef63582 Author: Gregory Bean Date: Wed Nov 24 11:53:51 2010 -0800 msm: gpio: Add v2 gpio support to MSM SoCs. Beginning with the MSM8x60, the hardware block responsible for gpio support changes. Provide gpiolib support for the new v2 architecture. Cc: Baruch Siach Cc: Pavan Kondeti Signed-off-by: Gregory Bean Signed-off-by: Daniel Walker commit 1cb125caf2e0fdece14f72efbb3516f5c5fe1de9 Author: Srinath Date: Tue Nov 16 14:26:58 2010 -0800 omap: AM3517/05: Add craneboard support Craneboard is a hardware development platform based on the Sitara AM3517 ARM Cortex - A8 microprocessor device. This is a low cost reference design. This patch adds basic board file. Detailed support will follow in subsequent patches. [1] http://www.ti.com/arm [2] http://www.mistralsolutions.com/products/craneboard.php Signed-off-by: Srinath Signed-off-by: Tony Lindgren commit 9632f9890e76aa7a78f719b0b3b572f65e3e968b Author: Janusz Krzysztofik Date: Tue Nov 16 14:26:57 2010 -0800 OMAP1: drop AMS_DELTA_FIQ config option This patches removes a config option that was used to select a FIQ handler to be build for Amstrad Delta, as required by the on-board serio interface driver. Not having any problem reports received since it was introduced in 2.6.35, the FIQ handler can now be built and initialized by default, thus reqiring no extra config option. Signed-off-by: Janusz Krzysztofik Signed-off-by: Tony Lindgren commit c6c4dea4011278f03ab8a3c8329fba9098d2a892 Author: Felipe Balbi Date: Mon Nov 8 06:56:15 2010 +0000 arm: omap: zoom: substitute gpio number with symbolic name It's easier to understand what that number means and also avoids problems if we ever have to change it. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 20826853853aa1e1ba219ea65f1e6ba3bd662495 Author: Felipe Balbi Date: Mon Nov 8 06:56:14 2010 +0000 arm: omap: combine zoom2 and zoom3 board-files They are extremely similar anyway, let's get rid of one file. While at that, also remove the empty zoom_config variable. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 235228ba21e34ba732b413c12259bac386f83283 Author: Enric Balletbo i Serra Date: Sat Oct 23 16:49:00 2010 +0000 omap3: IGEP v2: Improve igep2_flash_init() function The changes are: - Use 'for' loop instead 'while' loop. - No need to initialize ret to 0, we're assigning it right after. - No need to check for onenandcs < GPMC_CS_NUM here, it will always be true. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit ae3e033362430f2684bb3519456c88d14e182f01 Author: Enric Balletbo i Serra Date: Sat Oct 23 16:48:59 2010 +0000 omap3: IGEP v2: Remove igep2_config array omap_board_config_size is implicitly initialized to 0 in plat-omap/common.c, get_config() won't dereference omap_board_config, so we can remove the empty igep2_config array. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit c320c7b7d380e630f595de1236d9d085b035d5b4 Author: Arnaldo Carvalho de Melo Date: Wed Oct 20 12:50:11 2010 -0200 perf events: Precalculate the header space for PERF_SAMPLE_ fields PERF_SAMPLE_{CALLCHAIN,RAW} have variable lenghts per sample, but the others can be precalculated, reducing a bit the per sample cost. Acked-by: Peter Zijlstra Cc: Frédéric Weisbecker Cc: Ian Munsie Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 6aa85a5ae610106d89e50c7e1f760c56d12f9bc4 Author: Keshava Munegowda Date: Sun Nov 21 23:23:42 2010 +0530 omap4: 4430sdp: enable the ehci port on 4430SDP The OMAP4 SDP has an SMSC3320 PHY hooked up to EHCI on Port1. The PHY power is controlled by GPIO 157. Turn on the PHY power, and register the controller at init. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 56976b6ac4047ec456e2ba7e516ed2e9d96c3acf Author: Anand Gadiyar Date: Sun Nov 21 23:23:42 2010 +0530 arm: omap4: select USB_ARCH_HAS_EHCI The OMAP4 has an on-chip EHCI controller. Select USB_ARCH_HAS_EHCI to allow the EHCI driver to be built on OMAP4. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit becf0737cf25bd0084ed85ccb1ab6c902e600a3c Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 arm: omap4: usb: add platform init code for EHCI - Add platform init code for EHCI on OMAP4 - Add pad configuration for PHY and TLL modes Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 811406c2e69281b0e498d25a42902817299b6b3d Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 arm: omap4: add USBHOST and related base addresses Add base addresses for USBHOST, USBTLL, EHCI and OHCI to the header file. This will disappear when the drivers are converted to use the hwmod database, however this patch is needed until then. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit 4792a15bf0f388838c3e16636f961c99bc2f3572 Author: Anand Gadiyar Date: Sun Nov 21 23:23:42 2010 +0530 usb: ehci-omap: Add OMAP4 support Update the ehci-omap glue layer to support the controller in the OMAP4. Major differences from OMAP3 is that the OMAP4 has per-port clocking, and supports ULPI output clocking mode. The old input clocking mode is not supported. Also, there are only 2 externally available ports as against 3 in the OMAP3. The third port is internally tied off and should not be used. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 1ed85659a29287bda958a9429461f4a1b0a033be Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 omap: usb: ehci: introduce HSIC mode The EHCI controller in OMAP4 supports a new interface mode - HSIC. Add this to the list of modes supported on OMAP3. Signed-off-by: Anand Gadiyar Acked-by: Tony Lindgren commit a42ccdc14de388a35ad0e8057543369351395eb9 Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci-omap: add helpers for checking port mode Introduce helper functions to test port mode. These checks are performed in several places in the driver, and these helpers improve readability. Signed-off-by: Anand Gadiyar commit c5dff5545c97ab33bdb2a529a2375966ceb0700c Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci-omap: use clkdev aliases for functional clocks Use the recently updated aliases to get functional clocks needed by the driver. This allows the driver to acquire OMAP4-specific clocks without having to use different clock names for OMAP3 and OMAP4. Signed-off-by: Anand Gadiyar commit 5467e16d891090d54d036044e66f94b89b1c3683 Author: Anand Gadiyar Date: Sun Nov 21 23:23:41 2010 +0530 omap: clock: add clkdev aliases for EHCI clocks Add clkdev aliases for the USBHOST and USBTLL clocks on OMAP3 and OMAP4, so that the driver can refer to the clocks using a common alias. This will disappear when the driver is converted to use the hwmod database, but until then this patch is needed. Signed-off-by: Anand Gadiyar Acked-by: Paul Walmsley Acked-by: Tony Lindgren commit 7f124f4b353672bc150af959910cfc2a9778260a Author: Keshava Munegowda Date: Sun Nov 21 23:23:41 2010 +0530 usb: ehci: introduce CONFIG_USB_EHCI_HCD_OMAP Introduce the CONFIG_USB_EHCI_HCD_OMAP option to select EHCI support on OMAP3 and later chips. This scales better than having a long line of dependencies for each new OMAP with EHCI support. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit c072604115ab50d023eb5c33d4f3229400e441f4 Author: Keshava Munegowda Date: Sun Nov 21 23:23:40 2010 +0530 usb: ehci-omap: don't hard-code TLL channel count Make the TLL channel count a parameter instead of a hardcoded value. This allows us to be flexible with future OMAP revisions which could have a different number of channels. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 6dba39e278b81665a838f37a75fe37b89f3ce610 Author: Keshava Munegowda Date: Sun Nov 21 23:23:40 2010 +0530 usb: ehci-omap: update clock names to be more generic Rename usbhost2_120m_fck to usbhost_hs_fck and usbhost1_48m_fck to usbhost_fs_fck, to better reflect the clocks' functionalities. In OMAP4, the frequencies for the corresponding clocks are not necessarily the same as with OMAP3, however the functionalities are. Signed-off-by: Keshava Munegowda Signed-off-by: Anand Gadiyar commit 3f419d2d487821093ee46e898b5f8747f9edc9cd Author: David S. Miller Date: Mon Nov 29 13:37:14 2010 -0800 inet: Turn ->remember_stamp into ->get_peer in connection AF ops. Then we can make a completely generic tcp_remember_stamp() that uses ->get_peer() as a helper, minimizing the AF specific code and minimizing the eventual code duplication when we implement the ipv6 side of TW recycling. Signed-off-by: David S. Miller commit b3419363808f2481b24a817f491878e1795db4c7 Author: David S. Miller Date: Tue Nov 30 12:27:11 2010 -0800 ipv6: Add infrastructure to bind inet_peer objects to routes. They are only allowed on cached ipv6 routes. Signed-off-by: David S. Miller commit 672f007d65f50468a4a1e55825fe58e5b035324d Author: David S. Miller Date: Tue Nov 30 12:20:00 2010 -0800 inetpeer: Add inet_getpeer_v6() Now that all of the infrastructure is in place, we can add the ipv6 shorthand for peer creation. Signed-off-by: David S. Miller commit 021e9299113363cc1b713f86b2cba30b8e6cb5dd Author: David S. Miller Date: Tue Nov 30 12:12:23 2010 -0800 inetpeer: Add v6 peers tree, abstract root properly. Add the ipv6 peer tree instance, and adapt remaining direct references to 'v4_peers' as needed. Signed-off-by: David S. Miller commit 026630450244b8f8d1baf54548be0800aa1823ed Author: David S. Miller Date: Tue Nov 30 12:08:53 2010 -0800 inetpeer: Abstract address comparisons. Now v4 and v6 addresses will both work properly. Signed-off-by: David S. Miller commit b534ecf1cd26f094497da6ae28a6ab64cdbe1617 Author: David S. Miller Date: Tue Nov 30 11:54:19 2010 -0800 inetpeer: Make inet_getpeer() take an inet_peer_adress_t pointer. And make an inet_getpeer_v4() helper, update callers. Signed-off-by: David S. Miller commit 582a72da9a41be9227dc931d728ae2906880a589 Author: David S. Miller Date: Tue Nov 30 11:53:55 2010 -0800 inetpeer: Introduce inet_peer_address_t. Currently only the v4 aspect is used, but this will change. Signed-off-by: David S. Miller commit 760701bfe14faee8ea0608a9cab2046071d98a39 Author: Gui Jianfeng Date: Tue Nov 30 20:52:47 2010 +0100 cfq-iosched: Get rid of on_st flag It's able to check whether a CFQ group on a service tree by checking "cfqg->rb_node". There's no need to maintain an extra flag here. Signed-off-by: Gui Jianfeng Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit b54ce60eb7f61f8e314b8b241b0469eda3bb1d42 Author: Gui Jianfeng Date: Tue Nov 30 20:52:46 2010 +0100 cfq-iosched: Get rid of st->active When a cfq group is running, it won't be dequeued from service tree, so there's no need to store the active one in st->active. Just gid rid of it. Signed-off-by: Gui Jianfeng Acked-by: Vivek Goyal Signed-off-by: Jens Axboe commit 98158f5a853cafd33b254ae0eacc0dd69f90b93b Author: David S. Miller Date: Tue Nov 30 11:41:59 2010 -0800 inetpeer: Abstract out the tree root accesses. Instead of directly accessing "peer", change to code to operate using a "struct inet_peer_base *" pointer. This will facilitate the addition of a seperate tree for ipv6 peer entries. Signed-off-by: David S. Miller commit 61790c5f3c5f158821821a00797d94504531839f Author: Stanislaw Gruszka Date: Tue Nov 30 15:33:40 2010 +0100 iwlagn: fix microcode error on 4965 Commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 "iwlwifi: use antenna information in EEPROM" caused 4965 device breakage with "Microcode SW error detected. Restarting 0x82000000." message. This patch reverts 4965 part of that commit. Signed-off-by: Stanislaw Gruszka Acked-by: Johannes Berg Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 08ca944eb240b2299e743c76b43fbc7c2dd251de Author: Helmut Schaa Date: Tue Nov 30 12:19:34 2010 +0100 mac80211: Minor optimization in ieee80211_rx_h_data Remove a superfluous ieee80211_is_data check as that was checked a few lines before already and we wont't get here for non-data frames at all. Second, the frame was already converted to 802.3 header format and reading the fc and addr1 fields was only possible because the 802.3 header is short enough and didn't overwrite the relevant parts of the 802.11 header. Make the code more obvious by checking the ethernet header's h_dest field. Furthermore reorder the conditions to reduce the number of checks when dynamic powersave is not needed (AP mode for example). Signed-off-by: Helmut Schaa Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit 20ed3166c84d145589a89d8cde12aa32cf2d17f4 Author: Johannes Stezenbach Date: Tue Nov 30 16:49:23 2010 +0100 mac80211/rt2x00: add ieee80211_tx_status_ni() All rt2x00 drivers except rt2800pci call ieee80211_tx_status() from a workqueue, which causes "NOHZ: local_softirq_pending 08" messages. To fix it, add ieee80211_tx_status_ni() similar to ieee80211_rx_ni() which can be called from process context, and call it from rt2x00lib_txdone(). For the rt2800pci special case a driver flag is introduced. Signed-off-by: Johannes Stezenbach Signed-off-by: John W. Linville commit 4352fab5c2a1a602447d711c84d149bf2f0bc7ba Author: Nick Kossifidis Date: Tue Nov 23 21:53:28 2010 +0200 ath5k: Set turbo bit on rf bank 2 * A diff between rfbuffer settings of turbo and non-turbo modes indicates there is a bit on bank 2 related to turbo operation (it's set on turbo modes). This bit is present on all radios except RF5413 that seems to have a completely different bank 2. Also since 2317 has the same rf-registers locations with 2425 and since the bit exists on 2317 I assume it also exists on 2425/2417). So in case we use turbo mode (40MHz) enable it on bank modification. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8c2b418a07b4dc77d7efadb890ba9ad1a4161c3f Author: Nick Kossifidis Date: Tue Nov 23 21:51:38 2010 +0200 ath5k: Clean up turbo mode initvals/rfregs * Clean up what's left of turbo mode, since we handle all register modifications (rfbuffer comes next) on code there is no need to have duplicated arrays. * Rename change_channel to skip_pcu on initvals.c as we did on reset.c Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit acb091d67c5c9649cf5d25055ef6fd64239a6762 Author: Nick Kossifidis Date: Tue Nov 23 21:49:53 2010 +0200 ath5k: Cleanup turbo channel flags * Clean up CHANNEL_T(URBO), use AR5K_BWMODE_40MHZ instead Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 73a06a683455f472cc09ad249064c66a41e29e39 Author: Nick Kossifidis Date: Tue Nov 23 21:48:32 2010 +0200 ath5k: Use correct clock when setting ofdm timings * Use correct clock value when setting OFDM timings on non-default bwmodes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 3bb17654605965226e5b322dbc22ece5ff354ac5 Author: Nick Kossifidis Date: Tue Nov 23 21:45:21 2010 +0200 ath5k: Skip tx power setting on AR5210 for now * Don't return -EINVAL when trying to set tx power on RF5110 because AR5210 reset will fail. We need to add support for RF5110 and AR5210 eeprom in the future but for now just skip it. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b02f5d1a17c652a74098f2a04db7fb8e6220057e Author: Nick Kossifidis Date: Tue Nov 23 21:44:02 2010 +0200 ath5k: Tweak phy activate to rx start delay based on bwmode * Tweak phy activation -> rx delay for different bwmodes Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit c2b0ebef262e0a9b64f7ea8ec837cfc29605bef7 Author: Nick Kossifidis Date: Tue Nov 23 21:42:22 2010 +0200 ath5k: No need to save/restore staid flags on reset * Since we set antenna flags on phy init and ack bitrate mode on pcu init, there is no need to save/restore sta_id flags on ath5k_hw_reset. Also we don't need to re-set our mac address because it's not affected by resets. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8aec7af99b1e4594c4bb9e1c48005e6111f97e8e Author: Nick Kossifidis Date: Tue Nov 23 21:39:28 2010 +0200 ath5k: Support synth-only channel change for AR2413/AR5413 * Add synth-only channel change for AR2413/5413. When we call ath5k_reset with a channel ath5k_hw_reset will first try to set channel on PHY while PHY is running instead of doing a normal full reset. To do this phy_init has to change to implement this functionality. * Clean up change_channel flag, what it really did was skip PCU registers when setting initvals. This is done because on reset PCU registers are not affected (except the registers we set in pcu init and -due to hw problems- TSF). Use a new skip_pcu flag that's not misleading instead. In the future we might use that to also skip PCU reset and save us the TSF etc problems (needs testing because standard practice is to reset everything). * Use fast channel change only when setting channel, and set skip_pcu to false only on init. When we reset the card due to DMA or PHY problems skip pcu but never do a fast channel change. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 4c57581d939fd0f8f244b9730812069f4dac308a Author: Nick Kossifidis Date: Tue Nov 23 21:37:30 2010 +0200 ath5k: Skip powertable setting when we are on the same channel * Only set power table if we are changing channel/mode there is no need to recalculate and reset the power table all the time. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit f08fbf6cf4a31c8df52b21440c7a7e6fbe474b28 Author: Nick Kossifidis Date: Tue Nov 23 21:33:22 2010 +0200 ath5k: Update PLL programming for turbo/half/quarter * Set correct PLL settings for each bwmode Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit a2677fe4298c61f0e93c063e59815bf21c530c4a Author: Nick Kossifidis Date: Tue Nov 23 21:28:15 2010 +0200 ath5k: Update spur mitigation filter for turbo/half/quarter * Add spur mitigation filter support for half/quarter and turbo. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b2b4c69f682a2868411899a77842061dd745884f Author: Nick Kossifidis Date: Tue Nov 23 21:26:13 2010 +0200 ath5k: Tweak power detector delays on RF5111/RF5112 * Tweak power detector delays on AR5111/AR5112 when using half/quarter modes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 71ba1c30851575b43ba76b0f9c26ff5567e8136c Author: Nick Kossifidis Date: Tue Nov 23 21:24:54 2010 +0200 ath5k: Always set IFS intervals on reset * Make sure we always set IFS timings even if no coverage class is set. If we don't we'll miss the needed changes for different bwmodes. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 473cae27620c27377e278a6f92aaa483060e3c19 Author: Nick Kossifidis Date: Tue Nov 23 21:21:50 2010 +0200 ath5k: Use turbo flag on DCU * Set AR5K_DCU_GBL_IFS_MISC_TURBO_MODE flag on DCU when operating on 40MHz Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit eeb8832b3181d6ca8593051b68c466e5d2653bb3 Author: Nick Kossifidis Date: Tue Nov 23 21:19:45 2010 +0200 ath5k: Set all IFS intervals, not just slot time * Replace set_slot_time with set_ifs_intervals that also sets the various inter-frame space intervals based on current bwmode. * Clean up AR5210 mess from reset_tx_queue, AR5210 only has one data queue and we set IFS intervals for that queue on set_ifs_intervals so there is nothing left to do for 5210 on reset_tx_queue. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 61cde037234c4b8e6497a23f5f236c64cbf9d41d Author: Nick Kossifidis Date: Tue Nov 23 21:12:23 2010 +0200 ath5k: Extend rate_duration * Extend ieee80211_generic_frame_duration to support the various bwmodes. * Better document what's going on with ack bitrates and update write_rate_duration to support the standard ack bitrates (when we don't set the high bit). * Get rid of set_ack_bitrate_high and introduce a flag on ath5k_hw for this (we only called the function on init anyway so there is no difference). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 3017fcab416d8d1ee48ca16aa9a3062f600dab8e Author: Nick Kossifidis Date: Tue Nov 23 21:09:11 2010 +0200 ath5k: Extend get_default_sifs/slot_time * Extend get_default_sifs/slot_time to include timings for turbo half and quarter rate modes. * AR5210 code for now uses timings already on core clock units instead of usecs so rename them (we 'll clean it up later). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 25ddfa195735934256fda55bb4f2d749c19386ff Author: Nick Kossifidis Date: Tue Nov 23 21:07:04 2010 +0200 ath5k: Move tx retries setting outside reset_tx_queue * Move setting of tx retry limits on a separate function (we 'll clean up this AR5210 mess later) Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b405086ba47678a5b8f6e7cd835a3d27ebb6f744 Author: Nick Kossifidis Date: Tue Nov 23 21:04:43 2010 +0200 ath5k: Increase PHY settling parameters for turo mode * On turbo mode increase PHY settling times, note that we only increase switch settling time on AR5212 as indicated by initvals. * A few cleanups: Move frame control settings for AR5210 from reset_tx_queue to tweak_initvals and remove phy_scal settings from tweak_initvals (we tweak them alread on set_sleep_clock). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 325089ab5847f5c1e43f42bb90d32f981867c4c1 Author: Nick Kossifidis Date: Tue Nov 23 21:02:20 2010 +0200 ath5k: Small cleanup on tweak_initvals * Now that we properly set rx/tx latencies for AR5311 remove that old buggy part of code left inside ath5k_hw_tweak_initval_settings that was never executed (you can't have an RF5112 radio on a mac older than AR5212). Also use a magic value for 5311 PHY_SCAL value. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit c297560206adf0cda8ce38ef9b20b0a025754c4d Author: Nick Kossifidis Date: Tue Nov 23 21:00:37 2010 +0200 ath5k: Put core clock initialization on a new function * Handle all usec parameters in one function. It's much cleaner this way. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit fa3d2feeff4723cce8d4722902492d60b7f75fcc Author: Nick Kossifidis Date: Tue Nov 23 20:58:34 2010 +0200 ath5k: Add new field on ath5k_hw to track bandwidth modes * Prepare for half/quarter/turbo support, introduce a new ah_bwmode parameter and get rid of ah_turbo. Bwmode stands for "bandwidth mode" and can have 4 values, default (20MHz), turbo (40MHz), half rate (10MHz), and quarter rate (5MHz). Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 14fae2d4b61b890cea58d63091406b86ec9bafcd Author: Nick Kossifidis Date: Tue Nov 23 20:55:17 2010 +0200 ath5k: Use new function to stop beacon queue * Since we only use ath5k_hw_stop_tx_dma to stop the beacon queue, introduce a new function ath5k_hw_stop_beacon_queue so that we can use that instead and have better control. In the future we can add more beacon queue specific stuff there (maybe tweak beacon timers or something), for now just call ath5k_hw_stop_tx_dma. * Also since we don't call ath5k_hw_stop_rx/tx_dma from outside dma.c, make them static. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit e8325ed87457e07b9ceeb1e7a31df787dd7ee106 Author: Nick Kossifidis Date: Tue Nov 23 20:52:24 2010 +0200 ath5k: Check RXE when setting RXDP * Make sure we are not trying to set RXDP while RX is active, for now ignore the return value. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit f7317ba2d669c1b54fb31ed7834361a700a79217 Author: Nick Kossifidis Date: Tue Nov 23 20:50:16 2010 +0200 ath5k: Use DCU early termination correctly * DCU early termination should be used to quickly flush QCU according to docs so don't enable it for all queues, enable it only when stopping each queue and disable it when we are done. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit b3a28e68d5c8d788a4e538a119a5d326545add8a Author: Nick Kossifidis Date: Tue Nov 23 20:47:31 2010 +0200 ath5k: Debug DMA timeouts * Increase timeouts on ath5k_hw_stop_tx_dma and also wait for tx queue to stop before checking for pending frames * Add a new debug level to debug dma start/stop Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 80dac9eecbdb95f61b9b3c7081e02412155982b7 Author: Nick Kossifidis Date: Tue Nov 23 20:45:38 2010 +0200 ath5k: Use new dma_stop function on base.c * Since we stop rx/tx dma and pcu durring reset there is no need to call ath5k_hw_stop_rx/tx_dma before, also there is no need to call them durring stop_locked since we can use ath5k_hw_dma_stop for both. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit e088f23be166635b3938571c00c686094efa7cc4 Author: Nick Kossifidis Date: Tue Nov 23 20:43:18 2010 +0200 ath5k: Stop PCU on reset * Stop PCU receive logic (DRU) durring reset We need to be sure pcu is not active when trying to stop rx dma right now this is done on ath5k_reset (base.c) but later we are going to clean it up. Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit d41174fabdae348c6583cf05aeb329da232c342c Author: Nick Kossifidis Date: Tue Nov 23 20:41:15 2010 +0200 ath5k: Add new function to stop rx/tx DMA * Add a new function to stop rx/tx dma and use in when reset starts Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit 9320b5c4a7260d9593102f378201d17e3f030739 Author: Nick Kossifidis Date: Tue Nov 23 20:36:45 2010 +0200 ath5k: Reset cleanup and generic cleanup * No functional changes * Clean up reset: Introduce init functions for each unit and call them instead of having everything inside ath5k_hw_reset (it's just c/p for now so nothing changes except calling order -I tested it with various cards and it's ok-) * Further cleanups: ofdm_timings belongs to phy.c rate_duration belongs to pcu.c clock functions are general and belong to reset.c (more to follow) * Reorder functions for better organization: We start with helpers and other functions follow in categories, init functions are last Signed-off-by: Nick Kossifidis Signed-off-by: John W. Linville commit ea066d5a91f2610116dcd27054f749e4f07799d8 Author: Mohammed Shafi Shajakhan Date: Tue Nov 23 20:42:27 2010 +0530 ath9k: Add support for Adaptive Power Management This feature is to mitigate the problem of certain 3 stream chips that exceed the PCIe power requirements.An EEPROM flag controls which chips have APM enabled which is basically read from miscellaneous configuration element of the EEPROM header. This workaround will reduce power consumption by using 2 Tx chains for Single and Double stream rates (5 GHz only).All self generated frames (regardless of rate) are sent on 2 chains when this feature is enabled(Chip Limitation). Cc: Paul Shaw Signed-off-by: Mohammed Shafi Shajakhan Tested-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 47a25380e37f44db7202093ca92e4af569c34f55 Author: Steven Whitehouse Date: Tue Nov 30 15:49:31 2010 +0000 GFS2: Merge glock state fields into a bitfield We can only merge the fields into a bitfield if the locking rules for them are the same. In this case gl_spin covers all of the fields (write side) but a couple of them are used with GLF_LOCK as the read side lock, which should be ok since we know that the field in question won't be changing at the time. The gl_req setting has to be done earlier (in glock.c) in order to place it under gl_spin. The gl_reply setting also has to be brought under gl_spin in order to comply with the new rules. This saves 4*sizeof(unsigned int) per glock. Signed-off-by: Steven Whitehouse Cc: Bob Peterson commit e06dfc492870e1d380f02722cde084b724dc197b Author: Steven Whitehouse Date: Tue Nov 30 15:46:02 2010 +0000 GFS2: Fix uninitialised error value in previous patch Signed-off-by: Steven Whitehouse commit 086d8334cf73b3bb695b82dd864a7a8b00d96b7e Author: Benjamin Marzinski Date: Tue Nov 23 23:52:55 2010 -0600 GFS2: fix recursive locking during rindex truncates When you truncate the rindex file, you need to avoid calling gfs2_rindex_hold, since you already hold it. However, if you haven't already read in the resource groups, you need to do that. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit 1bb5ec6a6a0e094c84cc4fa2ba4a6d7cf8e9e8c6 Author: Peter Ujfalusi Date: Tue Nov 30 16:00:03 2010 +0200 ASoC: tpa6130a2: Add stereo DAPM path New DAPM widgets, and paths to enable both channels at the same time (for stereo output). With this path the switch time difference can be avoided between left and right channels. The original DAPM paths can be still used, if only one of TPA's output has been connected to a speaker, but for most of the cases, switching to the stereo path is better. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 8cc14e13d15ec558c880ce6eaaddf99c08f85ab6 Author: Peter Ujfalusi Date: Tue Nov 30 16:00:02 2010 +0200 ASoC: tpa6130a2: Use one event handler for PGA_E Reduce the amount of duplicated code by using single event handler for PGA_E to enable the needed channel. Use the w->shift to pass the channel information to the handler function. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d534bacd918fcf0909039b95db7c090702e739d5 Author: Peter Ujfalusi Date: Tue Nov 30 16:00:01 2010 +0200 ASoC: tpa6130a2: Defer SW enable from power enable Do not enable the amplifier right after the power has been restored to the amplifier. The DAPM_SUPPLY widget turns on the amp early in the DAPM power walk, and the unmuting of channel happens quite late. Keeping the amp in SW reset state ensures better muting. In this way the pop noise coming from other components (codec) can be filtered out. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit d5876ce1242b78987e6243ba3cb23bb61d44d4a9 Author: Peter Ujfalusi Date: Tue Nov 30 16:00:00 2010 +0200 ASoC: tpa6130a2: Simplify power state management Use simpler way to avoid setting the same power state for the amplifier. Simplifies the check introduced by patch: ASoC: tpa6130a2: Fix unbalanced regulator disables Signed-off-by: Peter Ujfalusi Cc: Jarkko Nikula Signed-off-by: Liam Girdwood commit 3e202345abc2cea09a3601df527629102f37e563 Author: Peter Ujfalusi Date: Tue Nov 30 14:31:46 2010 +0200 ASoC: tlv320dac33: Avoid multiple soft power up During playback start the codec has been already powered at BIAS_ON event time, so there's no need to enable the codec again. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 18f454047b3d009e347dc3aeacb1aec91a4c493f Author: Peter Ujfalusi Date: Tue Nov 30 14:31:45 2010 +0200 ASoC: tlv320dac33: Do not enable the codec in init_chip No need to enable the codec at this time. The codec will be enabled later by other events Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 0489b3f5eba735413ccedd425651cf41d6b1f7c5 Author: Benjamin Marzinski Date: Tue Nov 30 09:38:35 2010 -0600 GFS2: reread rindex when necessary to grow rindex When GFS2 grew the filesystem, it was never rereading the rindex file during the grow. This is necessary for large grows when the filesystem is almost full, and GFS2 needs to use some of the space allocated earlier in the grow to complete it. Now, if GFS2 fails to reserve the necessary space and the rindex file is not uptodate, it rereads it. Also, the only difference between gfs2_ri_update() and gfs2_ri_update_special() was that gfs2_ri_update_special() didn't clear out the existing resource groups, since you knew that it was only called when there were no resource groups. Attempting to clear out the resource groups when there are none takes almost no time, and rarely happens, so I simply removed gfs2_ri_update_special(). Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit 0b1246e6776c79719ff4a3afd9c38fba99b99d5a Author: Steven Whitehouse Date: Tue Nov 30 15:33:04 2010 +0000 GFS2: Remove duplicate #defines from glock.h There are a number of duplicated #defines in glock.h plus one which is unused. This removes the extra definitions. Signed-off-by: Steven Whitehouse commit 5091faa449ee0b7d73bc296a93bca9540fc51d0a Author: Mike Galbraith Date: Tue Nov 30 14:18:03 2010 +0100 sched: Add 'autogroup' scheduling feature: automated per session task groups A recurring complaint from CFS users is that parallel kbuild has a negative impact on desktop interactivity. This patch implements an idea from Linus, to automatically create task groups. Currently, only per session autogroups are implemented, but the patch leaves the way open for enhancement. Implementation: each task's signal struct contains an inherited pointer to a refcounted autogroup struct containing a task group pointer, the default for all tasks pointing to the init_task_group. When a task calls setsid(), a new task group is created, the process is moved into the new task group, and a reference to the preveious task group is dropped. Child processes inherit this task group thereafter, and increase it's refcount. When the last thread of a process exits, the process's reference is dropped, such that when the last process referencing an autogroup exits, the autogroup is destroyed. At runqueue selection time, IFF a task has no cgroup assignment, its current autogroup is used. Autogroup bandwidth is controllable via setting it's nice level through the proc filesystem: cat /proc//autogroup Displays the task's group and the group's nice level. echo > /proc//autogroup Sets the task group's shares to the weight of nice task. Setting nice level is rate limited for !admin users due to the abuse risk of task group locking. The feature is enabled from boot by default if CONFIG_SCHED_AUTOGROUP=y is selected, but can be disabled via the boot option noautogroup, and can also be turned on/off on the fly via: echo [01] > /proc/sys/kernel/sched_autogroup_enabled ... which will automatically move tasks to/from the root task group. Signed-off-by: Mike Galbraith Acked-by: Linus Torvalds Acked-by: Peter Zijlstra Cc: Markus Trippelsdorf Cc: Mathieu Desnoyers Cc: Paul Turner Cc: Oleg Nesterov [ Removed the task_group_path() debug code, and fixed !EVENTFD build failure. ] Signed-off-by: Ingo Molnar LKML-Reference: <1290281700.28711.9.camel@maggy.simson.net> Signed-off-by: Ingo Molnar commit 2eea392d0a28a0a07d36a9da544eb40f81bf4cb6 Author: Jarkko Nikula Date: Thu Nov 25 17:47:38 2010 +0200 ASoC: Add support for optional auxiliary dailess codecs This makes possible to register auxiliary dailess codecs in a machine driver. Term dailess is used here for amplifiers and codecs without DAI or DAI being unused. Dailess auxiliary codecs are kept in struct snd_soc_aux_dev and those codecs are probed after initializing the DAI links. There are no major differences between DAI link codecs and dailess codecs in ASoC core point of view. DAPM handles them equally and sysfs and debugfs directories for dailess codecs are similar except the pmdown_time node is not created. Only suspend and resume functions are modified to traverse all probed codecs instead of DAI link codecs. Example below shows a dailess codec registration. struct snd_soc_aux_dev foo_aux_dev[] = { { .name = "Amp", .codec_name = "codec.2", .init = foo_init2, }, }; static struct snd_soc_card card = { ... .aux_dev = foo_aux_dev, .num_aux_devs = ARRAY_SIZE(foo_aux_dev), }; Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit c4e7a4146798ce22c229dd21ed31f59f07c4119e Author: Chris Wilson Date: Tue Nov 30 14:10:25 2010 +0000 drm/i915/ringbuffer: Handle cliprects in the caller This makes the various rings more consistent by removing the anomalous handing of the rendering ring execbuffer dispatch. Signed-off-by: Chris Wilson commit 70eac33e7ac370dc137cabff7a4ba3094ca25a8c Author: Chris Wilson Date: Tue Nov 30 14:07:47 2010 +0000 drm/i915: Move instruction state invalidation from execbuffer to flush Signed-off-by: Chris Wilson commit cb5d39b3a1440eca79c742d95f1d78180c272286 Author: Mika Westerberg Date: Thu Nov 18 19:14:52 2010 +0100 ARM: 6487/1: add CONFIG_CRASH_DUMP to Kconfig Add CONFIG_CRASH_DUMP configuration option which is used by dump capture kernels. Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 4b3bf7aef94fc337610d78fce0d960e2ee1d5a8f Author: Mika Westerberg Date: Thu Nov 18 19:13:19 2010 +0100 ARM: 6486/1: provide zero vmcore_elf64_check_arch() Since we don't support 64-bit ELF vmcores. This also prevents the following warning: fs/proc/vmcore.c: In function 'parse_crash_elf64_headers': fs/proc/vmcore.c:502: warning: passing argument 1 of 'elf_check_arch' from incompatible pointer type Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 9833c39400c3e6ee19daeded6910df648741611e Author: Mika Westerberg Date: Fri Nov 19 09:29:24 2010 +0100 ARM: 6485/5: proc/vmcore - allow archs to override vmcore_elf_check_arch() Allow architectures to redefine this macro if needed. This is useful for example in architectures where 64-bit ELF vmcores are not supported. Specifying zero vmcore_elf64_check_arch() allows compiler to optimize away unnecessary parts of parse_crash_elf64_headers(). We also rename the macro to vmcore_elf64_check_arch() to reflect that it is used for 64-bit vmcores only. Signed-off-by: Mika Westerberg Signed-off-by: Russell King commit 09c74a9d0b0bedff16d0881db8cc0054a5e34f47 Author: Dimitris Papastamos Date: Mon Nov 29 11:43:33 2010 +0000 ASoC: soc-cache: Fix memory overflow in LZO initialization The bitmap_zero() nbits argument was improperly set to reg_size but the underlying buffer was bmp_size long. This caused the memset to zero past the end of the allocated buffer and into the kernel heap causing strange kernel crashes sometimes by overwriting critical kernel structures. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dfa7c70b04bb20df7936018c737014655bf92d09 Merge: 5511027 b76fb39 Author: Mark Brown Date: Tue Nov 30 11:35:43 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 551102762ebe8bc0aa867d28960d9be97bbe17c1 Author: Axel Lin Date: Tue Nov 30 15:34:11 2010 +0800 ASoC: Simplify pm860x_probe error handling Simplify pm860x_probe error handling and return actual error code we got. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c8d6bf9a7b282255cd155b676ff91b08266b8529 Author: Kuninori Morimoto Date: Tue Nov 30 11:32:04 2010 +0900 ASoC: sh: fsi-ak4642: Add FSI port and ak464x selection Current FSI-Ak4642 device had niche settings which were FSI2-A-AK4643 and FSI-A-AK4642. This patch add platform_device_id which can control FSI/FSI2, PortA/PortB, AK4642/AK4643 from platform data. Signed-off-by: Kuninori Morimoto Acked-by: Paul Mundt Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 921169ca2f7c8a0a2ccda2ce33c465dfe3ae30ef Author: Steven Whitehouse Date: Mon Nov 29 12:50:38 2010 +0000 GFS2: Clean up of gdlm_lock function The DLM never returns -EAGAIN in response to dlm_lock(), and even if it did, the test in gdlm_lock() was wrong anyway. Once that test is removed, it is possible to greatly simplify this code by simply using a "normal" error return code (0 for success). We then no longer need the LM_OUT_ASYNC return code which can be removed. Signed-off-by: Steven Whitehouse commit 802ec9b6682349d9d9c92a9e55f44324d2954f41 Author: Abhijith Das Date: Thu Nov 18 11:26:46 2010 -0500 GFS2: Allow gfs2 to update quota usage values through the quotactl interface With this patch the gfs2_set_dqblk() function will be able to update the quota usage block count (FS_DQ_BCOUNT) in addition to the already supported FS_DQ_BHARD (limit) and FS_DQ_BSOFT (warn) fields of the dquot structure. Signed-off-by: Abhi Das Signed-off-by: Steven Whitehouse commit edc221d00bd5c6da0e5c67701f3782b72796619f Author: Joe Perches Date: Wed Nov 10 13:19:06 2010 -0800 GFS2: fs/gfs2/glock.h: Add __attribute__((format(printf,2,3)) to gfs2_print_dbg Functions that use printf formatting, especially those that use %pV, should have their uses of printf format and arguments checked by the compiler. Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit 5e69069c1afb655b5f1a154856ccdb4bb7327b81 Author: Joe Perches Date: Tue Nov 9 16:35:20 2010 -0800 GFS2: fs/gfs2/glock.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit 2ae51ed7b548c1d943d080da617515e801ea5c3e Author: Steven Whitehouse Date: Wed Nov 10 15:14:57 2010 +0000 GFS2: Clean up duplicated setattr code While preparing the last patch I noticed that the gfs2_setattr_simple code had been duplicated into two other places. This patch updates those to call gfs2_setattr_simple rather than open coding it. Signed-off-by: Steven Whitehouse commit 9e55cd53728719ac3a3234a6618259ab8e203a10 Author: Steven Whitehouse Date: Tue Nov 9 14:09:53 2010 +0000 GFS2: Remove unreachable calls to vmtruncate Suggested-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit cc18152eb7c27653199546bd14e991a451ab8d1b Author: Joe Perches Date: Fri Nov 5 16:12:36 2010 -0700 GFS2: fs/gfs2/glock.c: Convert sprintf_symbol to %pS Signed-off-by: Joe Perches Signed-off-by: Steven Whitehouse commit d2115778c7ea0df2201f1ad9aab948c49ffa1078 Author: Steven Whitehouse Date: Wed Nov 3 19:58:53 2010 +0000 GFS2: Change two WQ_RESCUERs into WQ_MEM_RECLAIM The WQ_RESCUER flag should only be used internally to the workqueue implementation. Signed-off-by: Steven Whitehouse Acked-by: Tejun Heo commit 822bc180a7f7a7bc5fcaaea195f41b487cc8cae8 Author: Paul Turner Date: Mon Nov 29 16:55:40 2010 -0800 sched: Fix unregister_fair_sched_group() In the flipping and flopping between calling unregister_fair_sched_group() on a per-cpu versus per-group basis we ended up in a bad state. Remove from the list for the passed cpu as opposed to some arbitrary index. ( This fixes explosions w/ autogroup as well as a group creation/destruction stress test. ) Reported-by: Stephen Rothwell Signed-off-by: Paul Turner Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20101130005740.080828123@google.com> Signed-off-by: Ingo Molnar commit bc97e57eb21f8db55bf0e1f182d384e75b2e3c99 Author: Herbert Xu Date: Tue Nov 30 17:04:31 2010 +0800 crypto: algif_skcipher - Handle unaligned receive buffer As it is if user-space passes through a receive buffer that's not aligned to to the cipher block size, we'll end up encrypting or decrypting a partial block which causes a spurious EINVAL to be returned. This patch fixes this by moving the partial block test after the af_alg_make_sg call. Signed-off-by: Herbert Xu commit 0f6bb83cb12e4617e696ffa566f3fc6c092686e2 Author: Herbert Xu Date: Tue Nov 30 16:49:02 2010 +0800 crypto: algif_skcipher - Fixed overflow when sndbuf is page aligned When sk_sndbuf is not a multiple of PAGE_SIZE, the limit tests in sendmsg fail as the limit variable becomes negative and we're using an unsigned comparison. The same thing can happen if sk_sndbuf is lowered after a sendmsg call. This patch fixes this by always taking the signed maximum of limit and 0 before we perform the comparison. It also rounds the value of sk_sndbuf down to a multiple of PAGE_SIZE so that we don't end up allocating a page only to use a small number of bytes in it because we're bound by sk_sndbuf. Signed-off-by: Herbert Xu commit ff57ab21995a8636cfc72efeebb09cc6034d756f Author: Dave Chinner Date: Tue Nov 30 17:27:57 2010 +1100 xfs: convert xfsbud shrinker to a per-buftarg shrinker. Before we introduce per-buftarg LRU lists, split the shrinker implementation into per-buftarg shrinker callbacks. At the moment we wake all the xfsbufds to run the delayed write queues to free the dirty buffers and make their pages available for reclaim. However, with an LRU, we want to be able to free clean, unused buffers as well, so we need to separate the xfsbufd from the shrinker callbacks. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Reviewed-by: Alex Elder commit 1a427ab0c1b205d1bda8da0b77ea9d295ac23c57 Author: Dave Chinner Date: Thu Dec 16 17:08:41 2010 +1100 xfs: convert pag_ici_lock to a spin lock now that we are using RCU protection for the inode cache lookups, the lock is only needed on the modification side. Hence it is not necessary for the lock to be a rwlock as there are no read side holders anymore. Convert it to a spin lock to reflect it's exclusive nature. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder Reviewed-by: Christoph Hellwig commit 1a3e8f3da09c7082d25b512a0ffe569391e4c09a Author: Dave Chinner Date: Fri Dec 17 17:29:43 2010 +1100 xfs: convert inode cache lookups to use RCU locking With delayed logging greatly increasing the sustained parallelism of inode operations, the inode cache locking is showing significant read vs write contention when inode reclaim runs at the same time as lookups. There is also a lot more write lock acquistions than there are read locks (4:1 ratio) so the read locking is not really buying us much in the way of parallelism. To avoid the read vs write contention, change the cache to use RCU locking on the read side. To avoid needing to RCU free every single inode, use the built in slab RCU freeing mechanism. This requires us to be able to detect lookups of freed inodes, so enѕure that ever freed inode has an inode number of zero and the XFS_IRECLAIM flag set. We already check the XFS_IRECLAIM flag in cache hit lookup path, but also add a check for a zero inode number as well. We canthen convert all the read locking lockups to use RCU read side locking and hence remove all read side locking. Signed-off-by: Dave Chinner Reviewed-by: Alex Elder commit d95b7aaf9ab6738bef1ebcc52ab66563085e44ac Author: Dave Chinner Date: Thu Dec 16 16:41:39 2010 +1100 xfs: rcu free inodes Introduce RCU freeing of XFS inodes so that we can convert lookup traversals to use rcu_read_lock() protection. This patch only introduces the RCU freeing to minimise the potential conflicts with mainline if this is merged into mainline via a VFS patchset. It abuses the i_dentry list for the RCU callback structure because the VFS patches make this a union so it is safe to use like this and simplifies and merge issues. This patch uses basic RCU freeing rather than SLAB_DESTROY_BY_RCU. The later lookup patches need the same "found free inode" protection regardless of the RCU freeing method used, so once again the RCU freeing method can be dealt with apprpriately at merge time without affecting any other code. Signed-off-by: Dave Chinner Reviewed-by: Paul E. McKenney commit 6e857567dbbfe14dd6cc3f7414671b047b1ff5c7 Author: Dave Chinner Date: Thu Dec 23 12:02:31 2010 +1100 xfs: don't truncate prealloc from frequently accessed inodes A long standing problem for streaming writeѕ through the NFS server has been that the NFS server opens and closes file descriptors on an inode for every write. The result of this behaviour is that the ->release() function is called on every close and that results in XFS truncating speculative preallocation beyond the EOF. This has an adverse effect on file layout when multiple files are being written at the same time - they interleave their extents and can result in severe fragmentation. To avoid this problem, keep track of ->release calls made on a dirty inode. For most cases, an inode is only going to be opened once for writing and then closed again during it's lifetime in cache. Hence if there are multiple ->release calls when the inode is dirty, there is a good chance that the inode is being accessed by the NFS server. Hence set a flag the first time ->release is called while there are delalloc blocks still outstanding on the inode. If this flag is set when ->release is next called, then do no truncate away the speculative preallocation - leave it there so that subsequent writes do not need to reallocate the delalloc space. This will prevent interleaving of extents of different inodes written concurrently to the same AG. If we get this wrong, it is not a big deal as we truncate speculative allocation beyond EOF anyway in xfs_inactive() when the inode is thrown out of the cache. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 055388a3188f56676c21e92962fc366ac8b5cb72 Author: Dave Chinner Date: Tue Jan 4 11:35:03 2011 +1100 xfs: dynamic speculative EOF preallocation Currently the size of the speculative preallocation during delayed allocation is fixed by either the allocsize mount option of a default size. We are seeing a lot of cases where we need to recommend using the allocsize mount option to prevent fragmentation when buffered writes land in the same AG. Rather than using a fixed preallocation size by default (up to 64k), make it dynamic by basing it on the current inode size. That way the EOF preallocation will increase as the file size increases. Hence for streaming writes we are much more likely to get large preallocations exactly when we need it to reduce fragementation. For default settings, the size of the initial extents is determined by the number of parallel writers and the amount of memory in the machine. For 4GB RAM and 4 concurrent 32GB file writes: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL 0: [0..1048575]: 1048672..2097247 0 (1048672..2097247) 1048576 1: [1048576..2097151]: 5242976..6291551 0 (5242976..6291551) 1048576 2: [2097152..4194303]: 12583008..14680159 0 (12583008..14680159) 2097152 3: [4194304..8388607]: 25165920..29360223 0 (25165920..29360223) 4194304 4: [8388608..16777215]: 58720352..67108959 0 (58720352..67108959) 8388608 5: [16777216..33554423]: 117440584..134217791 0 (117440584..134217791) 16777208 6: [33554424..50331511]: 184549056..201326143 0 (184549056..201326143) 16777088 7: [50331512..67108599]: 251657408..268434495 0 (251657408..268434495) 16777088 and for 16 concurrent 16GB file writes: EXT: FILE-OFFSET BLOCK-RANGE AG AG-OFFSET TOTAL 0: [0..262143]: 2490472..2752615 0 (2490472..2752615) 262144 1: [262144..524287]: 6291560..6553703 0 (6291560..6553703) 262144 2: [524288..1048575]: 13631592..14155879 0 (13631592..14155879) 524288 3: [1048576..2097151]: 30408808..31457383 0 (30408808..31457383) 1048576 4: [2097152..4194303]: 52428904..54526055 0 (52428904..54526055) 2097152 5: [4194304..8388607]: 104857704..109052007 0 (104857704..109052007) 4194304 6: [8388608..16777215]: 209715304..218103911 0 (209715304..218103911) 8388608 7: [16777216..33554423]: 452984848..469762055 0 (452984848..469762055) 16777208 Because it is hard to take back specualtive preallocation, cases where there are large slow growing log files on a nearly full filesystem may cause premature ENOSPC. Hence as the filesystem nears full, the maximum dynamic prealloc size іs reduced according to this table (based on 4k block size): freespace max prealloc size >5% full extent (8GB) 4-5% 2GB (8GB >> 2) 3-4% 1GB (8GB >> 3) 2-3% 512MB (8GB >> 4) 1-2% 256MB (8GB >> 5) <1% 128MB (8GB >> 6) This should reduce the amount of space held in speculative preallocation for such cases. The allocsize mount option turns off the dynamic behaviour and fixes the prealloc size to whatever the mount option specifies. i.e. the behaviour is unchanged. Signed-off-by: Dave Chinner commit 622d81494fa32343a4b97b607619656c7a4a6d1a Author: Dave Chinner Date: Thu Dec 23 11:57:37 2010 +1100 xfs: use KM_NOFS for allocations during attribute list operations When listing attributes, we are doiing memory allocations under the inode ilock using only KM_SLEEP. This allows memory allocation to recurse back into the filesystem and do writeback, which may the ilock we already hold on the current inode. THis will deadlock. Hence use KM_NOFS for such allocations outside of transaction context to ensure that reclaim recursion does not occur. Reported-by: Nick Piggin Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit dcfcf20512cb517ac18b9433b676183fa1257911 Author: Dave Chinner Date: Thu Dec 23 11:57:13 2010 +1100 xfs: provide a inode iolock lockdep class The XFS iolock needs to be re-initialised to a new lock class before it enters reclaim to prevent lockdep false positives. Unfortunately, this is not sufficient protection as inodes in the XFS_IRECLAIMABLE state can be recycled and not re-initialised before being reused. We need to re-initialise the lock state when transfering out of XFS_IRECLAIMABLE state to XFS_INEW, but we need to keep the same class as if the inode was just allocated. Hence we need a specific lockdep class variable for the iolock so that both initialisations use the same class. While there, add a specific class for inodes in the reclaim state so that it is easy to tell from lockdep reports what state the inode was in that generated the report. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 489a150f6454e2cd93d9e0ee6d7c5a361844f62a Author: Christoph Hellwig Date: Fri Dec 10 15:04:11 2010 +0000 xfs: factor duplicate code in xfs_alloc_ag_vextent_near into a helper Add a new xfs_alloc_find_best_extent that does a forward/backward search in the allocation btree. That code previously was existed two times in xfs_alloc_ag_vextent_near, once for each search direction. Based on an earlier patch from Dave Chinner. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 9f9baab38dacd11fe6095a1e59f3783a305f7020 Author: Christoph Hellwig Date: Fri Dec 10 15:03:57 2010 +0000 xfs: clean up xfs_alloc_ag_vextent_exact Use a goto label to consolidate all block not found cases, and add a tracepoint for them. Also clean up a few whitespace issues. Based on an earlier patch from Dave Chinner. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit ecff71e677c6d469f525dcf31ada709d5858307c Author: Christoph Hellwig Date: Fri Dec 10 08:42:25 2010 +0000 xfs: simplify xfs_map_at_offset Move the buffer locking into the callers as they need to do it wether they call xfs_map_at_offset or not. Remove the b_bdev assignment, which is already done by get_blocks. Remove the duplicate extent type asserts in xfs_convert_page just before calling xfs_map_at_offset. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit aeea1b1f81800e362a3aca86d769d02e137a8fa7 Author: Christoph Hellwig Date: Fri Dec 10 08:42:24 2010 +0000 xfs: refactor xfs_vm_writepage After the last patches the code for overwrites is the same as for delayed and unwritten extents except that it doesn't need to call xfs_map_at_offset. Take care of that fact to simplify xfs_vm_writepage. The buffer loop now first checks the type of buffer and checks/sets the ioend type, or continues to the next buffer if it's not interesting to us. Only after that we validate the iomap and perform the block mapping if needed, all in common code for the cases where we have to do work. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 2fa24f92530edaf86c3b5f662464e0d2e3b3e517 Author: Christoph Hellwig Date: Fri Dec 10 08:42:23 2010 +0000 xfs: remove the all_bh flag from xfs_convert_page The all_bh flag is always set when entering the page clustering machinery with a regular written extent, which means the check for it is superflous. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit ed1e7b7e484dfb64168755613d499f32a97409bd Author: Christoph Hellwig Date: Fri Dec 10 08:42:22 2010 +0000 xfs: remove xfs_probe_cluster xfs_map_blocks always calls xfs_bmapi with the XFS_BMAPI_ENTIRE entire flag, which tells it to not cap the extent at the passed in size, but just treat the size as an minimum to map. This means xfs_probe_cluster is entirely useless as we'll always get the whole extent back anyway. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 8ff2957d581582890693affc09920108a67cb05d Author: Christoph Hellwig Date: Fri Dec 10 08:42:21 2010 +0000 xfs: simplify xfs_map_blocks No need to lock the extent map exclusive when performing an overwrite, we know the extent map must already have been loaded by get_blocks. Apply the non-blocking inode semantics to all mapping types instead of just delayed allocations. Remove the handling of not yet allocated blocks for the IO_UNWRITTEN case - if an extent is marked as unwritten allocated in the buffer it must already have an extent on disk. Add asserts to verify all the assumptions above in debug builds. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit a206c817c864583c44e2f418db8e6c7a000fbc38 Author: Christoph Hellwig Date: Fri Dec 10 08:42:20 2010 +0000 xfs: kill xfs_iomap Opencode the xfs_iomap code in it's two callers. The overlap of passed flags already was minimal and will be further reduced in the next patch. As a side effect the BMAPI_* flags for xfs_bmapi and the IO_* flags for I/O end processing are merged into a single set of flags, which should be a bit more descriptive of the operation we perform. Also improve the tracing by giving each caller it's own type set of tracepoints. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 405f80429436d38ab4e6b4c0d99861a1f00648fd Author: Christoph Hellwig Date: Fri Dec 10 08:42:19 2010 +0000 xfs: cleanup the xfs_iomap_write_* helpers Remove passing the BMAPI_* flags to these helpers, in xfs_iomap_write_direct the check BMAPI_DIRECT was always true, and in the xfs_iomap_write_delay path is was never checked at all. Remove the nmap return value as we never make use of it. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 6ac7248ec5f20cb44a063d7c7191b8e0068b5a28 Author: Christoph Hellwig Date: Fri Dec 10 08:42:18 2010 +0000 xfs: a few small tweaks for overwrites in xfs_vm_writepage Don't trylock the buffer. We are the only one ever locking it for a regular file address space, and trylock was only copied from the generic code which did it due to the old buffer based writeout in jbd. Also make sure to only write out the buffer if the iomap actually is valid, because we wouldn't have a proper mapping otherwise. In practice we will never get an invalid mapping here as the page lock guarantees truncate doesn't race with us, but better be safe than sorry. Also make sure we allocate a new ioend when crossing boundaries between mappings, just like we do for delalloc and unwritten extents. Again this currently doesn't matter as the I/O end handler only cares for the boundaries for unwritten extents, but this makes the code fully correct and the same as for delalloc/unwritten extents. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 221cb2517e8fc9a1d67c7a8a9c19fc5a916b583f Author: Christoph Hellwig Date: Fri Dec 10 08:42:17 2010 +0000 xfs: remove some dead bio handling code We'll never have BIO_EOPNOTSUPP set after calling submit_bio as this can only happen for discards, and used to happen for barriers, none of which is every submitted by xfs_submit_ioend_bio. Also remove the loop around bio_alloc as it will never fail due to it's mempool backing. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit 85da94c6b4666582c38579ccdcd90a5d9b5697ef Author: Christoph Hellwig Date: Fri Dec 10 08:42:16 2010 +0000 xfs: improve mapping type check in xfs_vm_writepage Currently we only refuse a "read-only" mapping for writing out unwritten and delayed buffers, and refuse any other for overwrites. Improve the checks to require delalloc mappings for delayed buffers, and unwritten extent mappings for unwritten extents. Signed-off-by: Christoph Hellwig Reviewed-by: Dave Chinner Signed-off-by: Alex Elder commit c9f71f5fc4390ea3a8087c00d53a799e7e0f0f8e Author: Christoph Hellwig Date: Wed Dec 1 22:06:24 2010 +0000 xfs: untangle phase1 vs phase2 recovery helpers Dispatch to a different helper for phase1 vs phase2 in xlog_recover_commit_trans instead of doing it in all the low-level functions. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit d0450948641b2090b5d467ba638bbebd40b20b21 Author: Christoph Hellwig Date: Wed Dec 1 22:06:23 2010 +0000 xfs: refactor xlog_recover_commit_trans Merge the call to xlog_recover_reorder_trans and the loop over the recovery items from xlog_recover_do_trans into xlog_recover_commit_trans, and keep the switch statement over the log item types as a separate helper. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit d5689eaa0ac5588cf459ee32f86d5700dd7d6403 Author: Christoph Hellwig Date: Wed Dec 1 22:06:22 2010 +0000 xfs: use struct list_head for the buf cancel table Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit e2714bf8d5c8e131a6df6b0ea2269433e9a03a9b Author: Christoph Hellwig Date: Wed Dec 1 22:06:21 2010 +0000 xfs: remove leftovers of old buffer log items in recovery code XFS used to support different types of buffer log items long time ago. Remove the switch statements checking the log item type in various buffer recovery helpers that were left over from those days and the rather useless xlog_recover_do_buffer_pass2 wrapper. Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 576ecb8e2b725726471cc62b12c01e28d33127ba Author: Samuel Kvasnica Date: Fri Nov 19 13:38:49 2010 +0000 xfs: fix exporting with left over 64-bit inodes We now support mounting and using filesystems with 64-bit inodes even when not mounted with the inode64 option (which now only controls if we allocate new inodes in that space or not). Make sure we always use large NFS file handles when exporting a filesystem that may contain 64-bit inodes. Note that this only affects newly generated file handles, any outstanding 32-bit file handle is still accepted. [hch: the comment and commit log are mine, the rest is from a patch snipplet from Samuel] Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 46fdb0937f26124700fc9fc80da4776330cc00d3 Author: Paul E. McKenney Date: Tue Oct 26 02:11:40 2010 -0700 rcu: Make synchronize_srcu_expedited() fast if running readers The synchronize_srcu_expedited() function is currently quick if there are no active readers, but will delay a full jiffy if there are any. If these readers leave their SRCU read-side critical sections quickly, this is way too long to wait. So this commit first waits ten microseconds, and only then falls back to jiffy-at-a-time waiting. Reported-by: Avi Kivity Reported-by: Marcelo Tosatti Tested-by: Takuya Yoshikawa Signed-off-by: Paul E. McKenney commit db3a8920995484e5e9a0abaf3bad2c7311b163db Author: Paul E. McKenney Date: Mon Oct 25 07:39:22 2010 -0700 rcu: fix race condition in synchronize_sched_expedited() The new (early 2010) implementation of synchronize_sched_expedited() uses try_stop_cpu() to force a context switch on every CPU. It also permits concurrent calls to synchronize_sched_expedited() to share a single call to try_stop_cpu() through use of an atomically incremented synchronize_sched_expedited_count variable. Unfortunately, this is subject to failure as follows: o Task A invokes synchronize_sched_expedited(), try_stop_cpus() succeeds, but Task A is preempted before getting to the atomic increment of synchronize_sched_expedited_count. o Task B also invokes synchronize_sched_expedited(), with exactly the same outcome as Task A. o Task C also invokes synchronize_sched_expedited(), again with exactly the same outcome as Tasks A and B. o Task D also invokes synchronize_sched_expedited(), but only gets as far as acquiring the mutex within try_stop_cpus() before being preempted, interrupted, or otherwise delayed. o Task E also invokes synchronize_sched_expedited(), but only gets to the snapshotting of synchronize_sched_expedited_count. o Tasks A, B, and C all increment synchronize_sched_expedited_count. o Task E fails to get the mutex, so checks the new value of synchronize_sched_expedited_count. It finds that the value has increased, so (wrongly) assumes that its work has been done, returning despite there having been no expedited grace period since it began. The solution is to have the lowest-numbered CPU atomically increment the synchronize_sched_expedited_count variable within the synchronize_sched_expedited_cpu_stop() function, which is under the protection of the mutex acquired by try_stop_cpus(). However, this also requires that piggybacking tasks wait for three rather than two instances of try_stop_cpu(), because we cannot control the order in which the per-CPU callback function occur. Cc: Tejun Heo Cc: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 2d999e03b7c8305b4385dd20992e4ed3e827177b Author: Paul E. McKenney Date: Wed Oct 20 12:06:18 2010 -0700 rcu: update documentation/comments for Lai's adoption patch Lai's RCU-callback immediate-adoption patch changes the RCU tracing output, so update tracing.txt. Also update a few comments to clarify the synchronization design. Signed-off-by: Paul E. McKenney commit 29494be71afe2a16ad04e344306a620d7cc22d06 Author: Lai Jiangshan Date: Wed Oct 20 14:13:06 2010 +0800 rcu,cleanup: simplify the code when cpu is dying When we handle the CPU_DYING notifier, the whole system is stopped except for the current CPU. We therefore need no synchronization with the other CPUs. This allows us to move any orphaned RCU callbacks directly to the list of any online CPU without needing to run them through the global orphan lists. These global orphan lists can therefore be dispensed with. This commit makes thes changes, though currently victimizes CPU 0 @@@. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit 7b27d5475f86186914e54e4a6bb994e9a985337b Author: Lai Jiangshan Date: Thu Oct 21 11:29:05 2010 +0800 rcu,cleanup: move synchronize_sched_expedited() out of sched.c The first version of synchronize_sched_expedited() used the migration code in the scheduler, and was therefore implemented in kernel/sched.c. However, the more recent version of this code no longer uses the migration code, so this commit moves it to the main RCU source files. Signed-off-by: Lai Jiangshan Signed-off-by: Paul E. McKenney commit deb7a41815a8a32d4f9ea2af7a48ed1175222cec Author: Paul E. McKenney Date: Thu Sep 30 21:33:32 2010 -0700 rcu: get rid of obsolete "classic" names in TREE_RCU tracing The TREE_RCU tracing had obsolete rcuclassic_trace_init() and rcuclassic_trace_cleanup() function names. This commit brings them up to date: rcutree_trace_init() and rcutree_trace_cleanup(), respectively. Signed-off-by: Paul E. McKenney commit e940cc804ec212e483f91167b93d1740c2fd3415 Author: Paul E. McKenney Date: Thu Nov 4 14:55:26 2010 -0700 rcu: Distinguish between boosting and boosted RCU priority boosting's tracing did not distinguish between ongoing boosting and completion of boosting. This commit therefore adds this capability. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 8e79e1f9615b83d1e1d26b328d1b776111ca0cf7 Author: Paul E. McKenney Date: Thu Nov 4 14:31:19 2010 -0700 rcu: document TINY_RCU and TINY_PREEMPT_RCU tracing. Add the required verbiage to Documentation/RCU/trace.txt. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 9e571a82f0cb205a65a0ea41657f19f22b7fabb8 Author: Paul E. McKenney Date: Thu Sep 30 21:26:52 2010 -0700 rcu: add tracing for TINY_RCU and TINY_PREEMPT_RCU Add tracing for the tiny RCU implementations, including statistics on boosting in the case of TINY_PREEMPT_RCU and RCU_BOOST. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 24278d148316d2180be6df40e06db013d8b232b8 Author: Paul E. McKenney Date: Mon Sep 27 17:25:23 2010 -0700 rcu: priority boosting for TINY_PREEMPT_RCU Add priority boosting, but only for TINY_PREEMPT_RCU. This is enabled by the default-off RCU_BOOST kernel parameter. The priority to which to boost preempted RCU readers is controlled by the RCU_BOOST_PRIO kernel parameter (defaulting to real-time priority 1) and the time to wait before boosting the readers blocking a given grace period is controlled by the RCU_BOOST_DELAY kernel parameter (defaulting to 500 milliseconds). Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e Merge: 5c4986b 193006f Author: Paul Mundt Date: Tue Nov 30 14:55:11 2010 +0900 Merge branch 'sh/urgent' into sh-latest commit 2818b19102fdc414248f772c46af176d36520ae7 Merge: 0ae26c8 25338f2 Author: Paul Mundt Date: Tue Nov 30 14:53:45 2010 +0900 Merge branch 'rmobile/mackerel' into rmobile-latest Conflicts: arch/arm/mach-shmobile/Kconfig arch/arm/mach-shmobile/Makefile Signed-off-by: Paul Mundt commit 0ae26c8cf71f3c65b69a40d45c48e6c6195ac617 Merge: 1ad2096 208c7dc d8e7943 Author: Paul Mundt Date: Tue Nov 30 14:50:10 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/mmcif' into rmobile-latest commit d8e7943d821d8ee7f48ff38f6f7c509297c88402 Merge: df73af8 22efa0f Author: Paul Mundt Date: Tue Nov 30 14:42:55 2010 +0900 Merge branch 'common/mmcif' into rmobile/mmcif commit 25338f2e09fcbaa0470841c928bf0e718ca13382 Author: Kuninori Morimoto Date: Tue Nov 30 04:37:33 2010 +0000 ARM: mach-shmobile: mackerel: Add USB1(Host) support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6024ede9ba84aa1b891c2d6bc98eda07801235e5 Author: Jim Keniston Date: Thu Nov 11 18:54:27 2010 +0000 powerpc/nvram: Handle partition names >= 12 chars The name field in the nvram_header can be < 12 chars, null-terminated, or 12 chars without the null. Handle this safely. Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit 690d1a9bd14bd861328ca66473a223f60cf1ad31 Author: Jim Keniston Date: Thu Nov 11 18:54:22 2010 +0000 powerpc/nvram: Fix NVRAM partition list setup Simplify creation and use of the NVRAM partition list. Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit 9a866b870880065364c894823257e6982103d4e4 Author: Benjamin Herrenschmidt Date: Mon Aug 2 10:51:25 2010 +1000 powerpc/nvram: Rename ppc64,linux partition to ibm,rtas-log I'm not aware of any userspace tool accessing it by its name anyways, it's read back by the kernel itself on the next boot to get back older log entries Signed-off-by: Benjamin Herrenschmidt commit edc79a2f3ee1c74d915f6a0ce3cb22bf468f5ad5 Author: Benjamin Herrenschmidt Date: Mon Aug 2 11:18:09 2010 +1000 powerpc/nvram: Move the log partition stuff to pseries The nvram log partition stuff currently in nvram_64.c is really pseries specific. It isn't actually used on anything else (despite the fact that we ran the code to setup the partition on anything except powermac) and the log format is specific to pseries RTAS implementation. So move it where it belongs Signed-off-by: Benjamin Herrenschmidt commit d9626947f20b3dc0992e4ac28b477f7601f8f16e Author: Benjamin Herrenschmidt Date: Mon Aug 2 10:13:56 2010 +1000 powerpc/nvram: Change nvram_setup_partition() to use new helper This changes the function to use nvram_find_partition() instead of doing the lookup "by hand". It also makes some of the logic clearer and prints out more useful diagnostic information. Signed-off-by: Benjamin Herrenschmidt commit cf5cbf9f8085eb45316d6e3c888a77cc50696701 Author: Benjamin Herrenschmidt Date: Mon Aug 2 10:01:58 2010 +1000 powerpc/nvram: Add nvram_find_partition() Signed-off-by: Benjamin Herrenschmidt commit fa2b4e54d41f3c9f1bee6a7d63ecd4f0ab161e89 Author: Benjamin Herrenschmidt Date: Thu Jul 29 18:19:59 2010 +1000 powerpc/nvram: Improve partition removal Existing code is nasty, has bugs etc... rewrite the function more simply, and make it take the signature and optional name of the partitions to remove as arguments, thus making it a more generic utility. We also try to remove a log partition that we find and is too small rather than creating a duplicate. Signed-off-by: Benjamin Herrenschmidt commit e49e2e87235518c21b1f5228809209831e6169e7 Author: Benjamin Herrenschmidt Date: Thu Jul 29 17:38:55 2010 +1000 powerpc/nvram: Shuffle code around in nvram_create_partition() This error log stuff is really pseries specific. As a first step we move the initialization of these variables to the caller of nvram_create_partition(), which is also slightly reorganized so we setup the free partition before we clear the new partition, so the chance of an error during clear leaving us with invalid headers is lessened. Signed-off-by: Benjamin Herrenschmidt commit cef0d5ad62ec6e0c8456b8f58e898aa3219311a5 Author: Benjamin Herrenschmidt Date: Thu Jul 29 17:22:34 2010 +1000 powerpc/nvram: Completely clear a new partition When creating a partition, we clear it entirely rather than just the first two words since the previous code was rather specific to the pseries log partition format. Signed-off-by: Benjamin Herrenschmidt commit 578914cffc283b907777796420148d582072cbae Author: Benjamin Herrenschmidt Date: Thu Jul 29 17:21:17 2010 +1000 powerpc/nvram: Ensure that the partition header/block size is right Use BUILD_BUG_ON to ensure the structure representing a partition header have the right size. Signed-off-by: Benjamin Herrenschmidt commit 36673307aee535f951f4eede81049c6962bc4ba9 Author: Benjamin Herrenschmidt Date: Thu Jul 29 18:18:44 2010 +1000 powerpc/nvram: nvram_create_partitions() now uses bytes This converts nvram_create_partition() to use a size in bytes rather than blocks. It does the appropriate alignment internally The size passed is also the data size (ie. doesn't include the header anymore). Signed-off-by: Benjamin Herrenschmidt commit 4e7c77a385efac81d6677a4a761b1b66cd2cb59e Author: Benjamin Herrenschmidt Date: Thu Jul 29 15:28:20 2010 +1000 powerpc/nvram: More flexible nvram_create_partition() Replace nvram_create_os_partition() with a variant that takes the partition name, signature and size as arguments. Signed-off-by: Benjamin Herrenschmidt commit 74d51d029818eca9d1aec22dd2895e269c0044b1 Author: Benjamin Herrenschmidt Date: Thu Jul 29 14:45:24 2010 +1000 powerpc/nvram: Move things out of asm/nvram.h This moves a bunch of definitions out of asm/nvram.h to the files that use them or just outright remove completely unused stuff. We leave the partition signatures definitions, they will be useful Signed-off-by: Benjamin Herrenschmidt commit 93ae86e759299718c611bc543b9b1633bf32905a Author: Mimi Zohar Date: Mon Nov 29 16:20:04 2010 -0500 keys: add missing include file for trusted and encrypted keys This patch fixes the linux-next powerpc build errors as reported by Stephen Rothwell. Reported-by: Stephen Rothwell Signed-off-by: Mimi Zohar Tested-by: Rajiv Andrade Signed-off-by: James Morris commit c6c0ac664c86ff6408fadbed4913938c8a732e26 Author: Michael Ellerman Date: Thu Nov 25 09:44:07 2010 +1100 driver core: Document that device_rename() is only for networking Document that device_rename() is not to be used by anything other than the network core. Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman commit dd318575ff0aae91ac4cbcc5b60c184e59267212 Author: Johannes Berg Date: Mon Nov 29 11:09:16 2010 +0100 mac80211: fix RX aggregation locking The RX aggregation locking documentation was wrong, which led Christian to also code the timer timeout handling for it somewhat wrongly. Fix the documentation, the two places that need to hold the reorder lock across accesses to the structure, and the debugfs code that should just use RCU. Also, remove acquiring the sta->lock across reorder timeouts since it isn't necessary, and change a few places to GFP_KERNEL because the code path here doesn't need atomic allocations as I noticed when reviewing all this. Signed-off-by: Johannes Berg Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit 8b7f8532d15631776ce8bec2bbbc58f6aad738d1 Author: Felix Fietkau Date: Sun Nov 28 19:37:48 2010 +0100 ath9k: fix software retry counter tracking The recent tx path cleanups moved the software retry count tracking from the ath_buf to the skb cb, however the actual counter update referred to the wrong location, confusing block-ack window tracking. Fix this by using the retries counter in the struct ath_frame_info. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 81fc2a332045dc1dae24f24d3e2dc4656f2cc498 Author: Rajkumar Manoharan Date: Fri Nov 26 23:24:33 2010 +0530 Revert "ath9k_htc: Handle monitor mode properly for HTC devices" This reverts commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb. The change had broken the packet injection on monitoring mode. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 8c5e9c830a04ece8f0c35db2c1e0f6d87bd64894 Author: Vasanthakumar Thiagarajan Date: Fri Nov 26 06:10:07 2010 -0800 ath9k: Remove code which enables btcoex based on subsys id Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 8f5dcb1cfb71ce832f53a4723deba72e6695078b Author: Vasanthakumar Thiagarajan Date: Fri Nov 26 06:10:06 2010 -0800 ath9k: Reintroduce modparam to enable btcoex It is not ideal to enable btcoex based on subsys id as it is not unique, they are so random. It is also a pain keeping all of them in a table to enable btcoex for a particular hw. Going back to the old idea. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f30221e4ec62d905b56d5e8f7ccab6b406a97cf5 Author: Johannes Berg Date: Thu Nov 25 10:02:30 2010 +0100 mac80211: implement off-channel mgmt TX This implements the new off-channel TX API in mac80211 with a new work item type. The operation doesn't add a new work item when we're on the right channel and there's no wait time so that for example p2p probe responses will be transmitted without delay. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit f7ca38dfe58c20cb1aa2ed9643187e8b194b5bae Author: Johannes Berg Date: Thu Nov 25 10:02:29 2010 +0100 nl80211/cfg80211: extend mgmt-tx API for off-channel With p2p, it is sometimes necessary to transmit a frame (typically an action frame) on another channel than the current channel. Enable this through the CMD_FRAME API, and allow it to wait for a response. A new command allows that wait to be aborted. However, allow userspace to specify whether or not it wants to allow off-channel TX, it may actually want to use the same channel only. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit e030d58e8860f1c87b17631dbdd70747cbe1fb5b Author: Alan Stern Date: Mon Nov 15 15:46:07 2010 -0500 sysfs: remove useless test from sysfs_merge_group Dan Carpenter pointed out that the new sysfs_merge_group() and sysfs_unmerge_group() routines requires their grp argument to be non-NULL, because they dereference grp to obtain the list of attributes. Hence it's pointless for the routines to include a test and special-case handling for when grp is NULL. This patch (as1433) removes the unneeded tests. Signed-off-by: Alan Stern CC: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 4960b8fe1b0602195e2170bb94d50edc47d36d73 Author: Marek Belisko Date: Wed Nov 24 10:42:39 2010 +0100 staging: ft1000: Fix goto error logic. Fix goto error logic which could lead to kernel panics because kthread_stop() is called in not correct error conditions. Seen it sometimes when dsp_reload() fails then I got kernel panic. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c20ec76157747434652e721cdd4dccd8654ad370 Author: Joe Perches Date: Mon Nov 29 07:42:02 2010 +0000 forcedeth: Use netdev_dbg for printk(KERN_DEBUG Use the normal debugging functions. Print mac address when using random_ether_addr. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ef46ffbc2841dddebe521764c06673474ca5d041 Author: Joe Perches Date: Mon Nov 29 07:42:01 2010 +0000 forcedeth: Remove netdev_dbg uses These were probably just for initial driver debugging and have not been enabled in builds in git history. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b2ba08e606dfd106a394c3ac7a56c497b4c8f230 Author: Joe Perches Date: Mon Nov 29 07:42:00 2010 +0000 forcedeth: Convert dev_printk( to dev_( Use vsprintf extension %pM for a mac address in one instance. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit cd66328bdab782ee40d17b573a3067a591cb7b4f Author: Joe Perches Date: Mon Nov 29 07:41:59 2010 +0000 forcedeth: Separate vendor specific initializations into functions Neaten the phy_init function by adding and calling vendor specific functions. object size is reduced by ~1kb: $ size drivers/net/forcedeth.o.* text data bss dec hex filename 83475 1848 19304 104627 198b3 drivers/net/forcedeth.o.new 84459 1848 19544 105851 19d7b drivers/net/forcedeth.o.old Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c41d41e1687dcf344f55dd15c7121532e5c195d4 Author: Joe Perches Date: Mon Nov 29 07:41:58 2010 +0000 forcedeth: Add function init_realtek_8211b Deduplicate the code use for the init/reset of this device. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1d397f3698ec438c3c14abf45bfac88cca1882d9 Author: Joe Perches Date: Mon Nov 29 07:41:57 2010 +0000 forcedeth: Convert pr_ to netdev_ Use netdev_ when a struct net_device * is available. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 294a554e274f961ac33c7d739d5b912bd0005f5b Author: Joe Perches Date: Mon Nov 29 07:41:56 2010 +0000 forcedeth: Use pr_fmt and pr_ Convert printks to pr_. Remove "forcedeth: " from some calls as it's now added by pr_fmt. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f52dafc1a67c98baa9b6fa1866a4caa4be4831fb Author: Joe Perches Date: Mon Nov 29 07:41:55 2010 +0000 forcedeth: Convert remaining dprintk to netdev_dbg The remaining dprintk uses are emitted as KERN_INFO. Change these dprintk uses to netdev_dbg. Remove the now unused dprintk macros. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e649985b4ab1e86b3a389cf0d7c48f9cb1e27ae6 Author: Joe Perches Date: Mon Nov 29 07:41:54 2010 +0000 forcedeth: Use print_hex_dump Use the standard code to emit hex dumps. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6b80858d2c0a378894b9df35d3703d62b0b12dbc Author: Joe Perches Date: Mon Nov 29 07:41:53 2010 +0000 forcedeth: convert dprintk(KERN_DEBUG to netdev_dbg Use the more standard macro to preface netdev->name. Fix casting on resource use. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 344d0dce5164d0bf2d73cf10510fe08ed8cf8248 Author: Joe Perches Date: Mon Nov 29 07:41:52 2010 +0000 forcedeth: Change reg_delay arguments and use Move the printk out of reg_delay and make the callers emit a message on error. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e999fb057436c2167d5ee3f5c82753e953981525 Author: Marek Belisko Date: Tue Nov 23 13:29:28 2010 +0100 staging: ft1000: Remove functions which create devices in kernel space. Remove exec_mknod() and rm_mknod() helpers which was used for device nodes creating/removing in kernel space. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 6efe04ee4109a9d3fc0d419667f54861628b0d45 Author: Al Cho Date: Fri Nov 26 19:07:27 2010 +0800 staging: keucr: fix keucr init other coding style fix keucr init.c other coding style but not from checkpatch.pl. replace ternary conditional "?:" with if/else. Signed-off-by: Al Cho Signed-off-by: Greg Kroah-Hartman commit e93192acff4eaf7024c2450d91f3de69258f1f12 Author: Al Cho Date: Fri Nov 26 19:06:39 2010 +0800 staging: keucr: fix keucr init coding style fix keucr init.c init.h coding style. only fix coding style check by checkpatch.pl. Signed-off-by: Al Cho Signed-off-by: Greg Kroah-Hartman commit 280740a9016db986758db811bbc998acc79e5551 Author: Vasiliy Kulikov Date: Fri Nov 26 20:06:53 2010 +0300 staging: msm: tvenc: fix error handling Driver init() function should return error code. Also fix tvenc_clk leak. Signed-off-by: Vasiliy Kulikov Signed-off-by: Greg Kroah-Hartman commit 8956110dbbb75773d851854e6e11cd8428fce71a Author: Randy Dunlap Date: Wed Nov 24 11:46:09 2010 -0800 staging: fix intel_sst/intelmid sound build SND_INTELMID selects 3 SND_* kconfig symbols, but that is useless if the SOUND & SND symbols in their hierarchy are not enabled, so make this symbol depend on SOUND & SND. ERROR: "snd_pcm_period_elapsed" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_card_create" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_hw_constraint_integer" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_device_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_set_ops" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_jack_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_lib_free_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_lib_ioctl" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_lib_malloc_pages" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_ctl_new1" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_lib_preallocate_pages_for_all" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_card_free" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_card_register" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_jack_report" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_pcm_new" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! ERROR: "snd_ctl_add" [drivers/staging/intel_sst/snd-intelmid.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit fa7a1db200ecb7a5912722a563646935700765a8 Author: Brett Rudley Date: Tue Nov 23 15:30:02 2010 -0800 staging: brcm80211: Remove BUSTYPE macro BUSTYPE isn't used in this configuration. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit c95e66e1fae810110410b59f411110ca671ffb28 Author: Arend van Spriel Date: Tue Nov 23 22:20:31 2010 +0100 staging: brcm80211: remove unused dhd_ops_virt variable definition The variable dhd_ops_virt was used before although its use was rather limited as can be found in previous commit: | commit 4fd68ae1a558043a2cc4ea2faf7235e71c3241aa | Author: Julia Lawall | Date: Tue Oct 26 12:25:33 2010 +0200 | | drivers/staging/brcm80211/brcmfmac/dhd_linux.c: delete double assignment | Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 3be727c8f076cafaf26a1ceda4cad85f5166c8a3 Author: Arend van Spriel Date: Tue Nov 23 22:20:30 2010 +0100 staging: brcm80211: remove some more packet related macros macros PKTHEADROOM and PKTTAILROOM have been replaced by native skbuff functions and macros PKTALLOCED and PKTUNALLOC have been removed. Reviewed-by: Roland Vossen Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 54991ad6d05186bd0324dbdc9c64c5b7952e74c4 Author: Arend van Spriel Date: Tue Nov 23 14:06:24 2010 +0100 staging: brcm80211: removed packet macros for accessing sk_buff fields With the packet storage type changed from void pointer to struct sk_buff pointer there is no need for macros for accessing these fields through casting. These can now be accessed directly. Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c26b1378a71de617fb5ba7da8b6fdc882caed0e8 Author: Arend van Spriel Date: Tue Nov 23 14:06:23 2010 +0100 staging: brcm80211: change packet buffer type to native struct sk_buff The packet queues now store struct sk_buff pointer and subsequently all driver code handling packets now use struct sk_buff as package storage type. Next step will be getting rid of packet macros. Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit b6eb5c0f71af22f7b44353a01241fff9a02997af Author: Arend van Spriel Date: Tue Nov 23 14:06:22 2010 +0100 staging: brcm80211: remove unneccessary packets funtion prototype The prototype for function pktsegcnt in bmcutils.h is not defined nor used anywhere in the driver so it can be removed. Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 7c8bc0147f54ecb43f48d9e898ad7f85cb934db7 Author: Arend van Spriel Date: Tue Nov 23 08:04:29 2010 +0100 staging: brcm80211: add include file for using semaphore related definitions Source wl_iw.c uses semaphore definitions and as such should include . Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 57d8cd23c2a0d261bdc959201dd4a33a2080bdfb Author: Brett Rudley Date: Mon Nov 22 16:58:52 2010 -0800 staging: brcm80211: OSL shrink: Remove OSL_PCI_READ/WRITE_CONFIG Replace OSL layer PCI READ/WRITE macros with native calls. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit b99bca8bba85aad229d711522442e8bc30a07068 Merge: 3b93ff0 857cf1d Author: Greg Kroah-Hartman Date: Mon Nov 29 11:21:25 2010 -0800 Merge branch 'work' into staging-next commit 857cf1d1e623467622eff3a6b0edc720dcafdd52 Author: Greg Kroah-Hartman Date: Mon Nov 29 11:18:08 2010 -0800 Staging: sep: do not select the driver by default The Kconfig file should not have 'y' as the default, especially as the driver will crash a machine if it is loaded and the hardware is not present. Reported-by: Stephen Rothwell Cc: Mark Allyn Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 77148625e10d0fda50d05e92d199c0df17b66e9a Merge: a417786 51cce8a Author: David S. Miller Date: Mon Nov 29 11:19:09 2010 -0800 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 3b93ff030204ca36fb1e9917743bbf22a423e527 Author: Greg Kroah-Hartman Date: Mon Nov 29 11:18:08 2010 -0800 Staging: sep: do not select the driver by default The Kconfig file should not have 'y' as the default, especially as the driver will crash a machine if it is loaded and the hardware is not present. Cc: Mark Allyn Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit da3f825bc71b420e129b6344be0e3e863ebf8a42 Author: Alan Cox Date: Wed Nov 24 19:39:20 2010 +0000 Staging: sep: Fix crash if a device is not found The existing code works mostly by luck. The PCI probe is done by the register and completes before the register returns thus allowing the other init code to run in time. Without a SEP or if unlucky this doesn't occur and you get an OOPS which for some reason causes grumpiness. As the season of good b^Hcheer is supposed to be approaching we should probably fix it. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6f89be93ce6e718a51215336845c70ada06627ba Author: Alan Cox Date: Wed Nov 24 19:39:07 2010 +0000 Staging: sep: clean up a couple of spots missed in pass one Another copy_user case and some formatting of dbg Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2bb3af58d0f712c728cf1230539044d94c9a3be0 Author: Alan Cox Date: Wed Nov 24 19:38:54 2010 +0000 Staging: sep: cant is an angular inclination So use can't instead. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6eb44c531763ff50325822bac749e92938782795 Author: Alan Cox Date: Wed Nov 24 19:38:39 2010 +0000 Staging: sep: Make SEP consistent SEP is initials so make it consistent in the driver, ditto DMA and DCB Consistent capitalisation of comment leads Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7c9eb69123a634c8551e8887bda03c2e549da233 Author: Alan Cox Date: Wed Nov 24 19:38:21 2010 +0000 Staging: sep: Use kzalloc when needed Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit da14e55130785db243a98523b57ddf56d6c6320a Author: Alan Cox Date: Wed Nov 24 19:38:02 2010 +0000 Staging: sep: clean up some of the obvious sillies Various assignments are done but not used dev_dbg formatting is a bit weird and wraps when not needed Take out some of the blank lines and reformat a bit to reduce view size Remove some comments that are obvious Fix else formatting Remove some user triggerable dev_warns Fix copy_from_user error return cases (-EFAULT not bytes copied) Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit d1bb83213d5b7b3a4e3db59179917a433f82762c Author: Alan Cox Date: Wed Nov 24 19:34:52 2010 +0000 Staging: sep: Fix the kernel-doc in SEP The long blurb goes at the end Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4c8e2a1f3d5e6b63ebfd26f324a2b24194af37fa Author: Alan Cox Date: Wed Nov 24 19:34:25 2010 +0000 Staging: sep: clean up caller_id function This is called on a kmalloc/memset object. Remove everything that isn't a set to zero Oh look 8) Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8d80e4e2da31be71b8c1a5def986e10831d2aada Author: Alan Cox Date: Wed Nov 24 19:34:08 2010 +0000 Staging: sep: netlink - what netlink Kill unused stuff Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 266aa856f2c3aeddadd2fcf186d119af10539c3e Author: Alan Cox Date: Wed Nov 24 19:33:55 2010 +0000 Staging: sep: handle the memrar stuff in the headers Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 62a8c3a32e4143812ed8e0f3783ef1ea40dc87e4 Author: Alan Cox Date: Wed Nov 24 19:33:43 2010 +0000 Staging: sep: handle the rar definition stuff in the header SEP isn't the only driver that may need to handle both cases easily Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit de92e3a3b25dd0cda00a07b30c325785b5c2d939 Author: Alan Cox Date: Wed Nov 24 19:33:26 2010 +0000 Staging: sep: minimal fix for wrong include Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 62877913ba55b3f2e5ac34dbc1a2975868ea8d25 Author: Vinod Koul Date: Mon Nov 22 10:33:51 2010 +0000 Staging: sst: add ioctls for post processing algorithm interface This patch adds two new ioctls to intel_sst_ctrl device. This i/f can be used by application to send algorithm parameters Signed-off-by: Vinod Koul [This will need further discussion in the context of the final ALSA interface but is fine for staging, ie anyone who relies on it should expect changes Also fixed a missing kmalloc fail check] Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 79a35ad57300f78c7250eeeca57b602e06ff402a Author: Vinod Koul Date: Mon Nov 22 10:33:40 2010 +0000 Staging: sst: Construct fw string name runtime The firmware name for each platform is appended by PCI id of device. This patch makes use of pci id to construct the string rather than hardcode the string. Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 964c6975e8a4314c451d420f1cb54880ab535433 Author: Vinod Koul Date: Mon Nov 22 10:33:28 2010 +0000 Staging: sst: Add runtime PM support This adds runtime PM support for audio driver. This also fixes LPA audio mode for moorestown platform Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 951c44e0dbfaa580d5b4fb13427ab93ee252636a Author: Sven Eckelmann Date: Mon Nov 22 00:56:07 2010 +0100 Staging: batman-adv: Use kernel functions to identify broadcasts linux/etherdevice.h already provides functions to classify different ethernet addresses. These inlineable functions should be used instead of custom functions. The check for multicast together with multicast can also be replaced with a single test for multicast because for every ethernet address x following is always true: is_broadcast_ether_addr(x) => is_multicast_ether_addr(x) or when looking more at the implementation: (FF:FF:FF:FF:FF:FF == x) => [(01:00:00:00:00:00 & x) != 00:00:00:00:00:00] Reported-by: Tobias Klauser Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 8cab2fbe6dacfdd3b122c450d2fffde6ac06a8b6 Author: Sven Eckelmann Date: Mon Nov 22 00:56:06 2010 +0100 Staging: batman-adv: Use kernel version min macro The kernel headers already provide different versions of a min/max macro which should be used by all modules according to Documentation/CodingStyle. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 003db3b2ad61c2964d624b0786cf8202e9a92c8e Author: Marek Lindner Date: Mon Nov 22 00:56:05 2010 +0100 Staging: batman-adv: add gateway IPv6 support by filtering DHCPv6 messages Some additional checks will be needed in case of extension headers like the fragmentation or hop-by-hop (for jumbo frames for example) headers or ipsec stuff. But this patch should do for most people for now, the rest can be added with a later one. Signed-off-by: Marek Lindner Acked-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit c9c556b63b19c8b52de5c5ea6f47ab16fc540e47 Author: Marek Lindner Date: Mon Nov 22 00:56:04 2010 +0100 Staging: batman-adv: best gw DHCP filter 802.1Q support The DHCP filter inspects packets to determine whether or not to send them via ethernet unicast. This patch adds 802.1Q (vlan) support for this check. Signed-off-by: Marek Lindner [sven.eckelmann@gmx.de: Rework on top of current version] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 6c3a42db6ca46204b35f0cdb8abfa9e4771641ef Author: Marek Lindner Date: Mon Nov 22 00:56:03 2010 +0100 Staging: batman-adv: send DHCP requests directly to the chosen gw If the gateway client mode is active batman-adv will send the broadcasted DHCP requests via unicast to the currently selected best gateway. Therefore attached clients can profit from batman's knowledge about the network topology. Signed-off-by: Marek Lindner [sven.eckelmann@gmx.de: Rework on top of current version] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit dfaf9dd3459cac02411cebf418e8469aa0d8ca5d Author: Marek Lindner Date: Mon Nov 22 00:56:02 2010 +0100 Staging: batman-adv: adding gateway functionality Via the /sys filesystem you can change the gateway mode of a node using gw_mode. Adjustments to it can be done using gw_bandwidth for server mode and gw_sel_class for client mode. Signed-off-by: Marek Lindner [sven.eckelmann@gmx.de: Rework on top of current version] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 7a18deb7b03e4112af5add8498889f9b2b36d59f Author: Sven Eckelmann Date: Mon Nov 22 00:56:01 2010 +0100 Staging: batman-adv: Limit spin_locks to spin_lock_bh spin_lock_irqsave disables the IRQs and stores them inside the flags provided by the caller. This is needed to protect a bottom half handler or a user context critical section from being interrupted by an interrupt handler which also tries to acquire the spinlock and locks forever. The linux device drivers will receive the packets inside an interrupt handler and the network infrastructure will process them inside bottom half. Thus batman-adv will only run in user context and bottom half handlers. We can conclude that batman-adv doesn't share its own spinlocks with real interrupt handlers. This makes it possible to exchange the quite complex spin_lock_irqsave with spin_lock_bh which only stops bottom halves from running on the current cpu, but allows interrupt handlers to take over to keep the interrupt latency low. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit bd204952cf161404eae0aa6478fb1b4c586ac678 Author: Sven Eckelmann Date: Mon Nov 22 00:56:00 2010 +0100 Staging: batman-adv: Rewrite hash using hlist_* The hash implementation is a complete implementation of a hash using buckets as hash entries and overflow buckets attached to them. The kernel already provides datastructures hlist_head and hlist_node which can be used to implement an hash using lists as hash buckets. So it is better to implement heavily used functionality on top of those instead of providing a full hash implementation. The rewrite changes the behavior of some functions slightly: * hash_add add elements to the front instead of the tail * hash_iterate doesn't provide pointer to access bucket->data directly, but it can be accessed using hlist_entry Reported-by: David S. Miller Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit a3238c3b379146a2d480dfee4c7f76c4692d7466 Author: Sven Eckelmann Date: Mon Nov 22 00:55:59 2010 +0100 Staging: batman-adv: Make hash_iterate inlineable hash_iterate is next to the function pointers the most called function related to hashes which benefits from inlining as it is uses in loops. Reported-by: David S. Miller Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 60eb502436910fb8118639e2ce4d7a4f732b6754 Author: Sven Eckelmann Date: Mon Nov 22 00:55:58 2010 +0100 Staging: batman-adv: Move hash callback related function to header To enable inlining of the function pointers hashdata_choose_cb, hashdata_choose_cb and hashdata_free_cb, also the hash functions which uses them must be inlined by the called function. This should increase the performance, but also increases the size of the generated machine code slightly. Reported-by: David S. Miller Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 6d5e654240dc14ded3d74aa5df6857572ba9f5e3 Author: Sven Eckelmann Date: Mon Nov 22 00:55:57 2010 +0100 Staging: batman-adv: Remove hashdata_choose_cb from hash Function pointers cannot be inlined by a compiler and thus always has the overhead of an call. hashdata_choose_cb's are one of the most often called function pointers and its overhead must kept relative low. As first step, every function which uses this function pointer takes it as parameter instead of storing it inside the hash abstraction structure. This not generate any performance gain right now. The called functions must also be able to be inlined by the calling functions to enable inlining of the function pointer. Reported-by: David S. Miller Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 51f3d8a27c1a1ac6aced25ea93fc5c0520e9256c Author: Sven Eckelmann Date: Mon Nov 22 00:55:56 2010 +0100 Staging: batman-adv: Remove hashdata_compare_cb from hash Function pointers cannot be inlined by a compiler and thus always has the overhead of an call. hashdata_compare_cb's are one of the most often called function pointers and its overhead must kept relative low. As first step, every function which uses this function pointer takes it as parameter instead of storing it inside the hash abstraction structure. This not generate any performance gain right now. The called functions must also be able to be inlined by the calling functions to enable inlining of the function pointer. Reported-by: David S. Miller Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 1341a00ad356dfb21978ce4e5e979024558042d2 Author: Linus Lüssing Date: Mon Nov 22 00:55:55 2010 +0100 Staging: batman-adv: Make hop_penalty configurable via sysfs When having a mixed topology of both very mobile and rather static nodes, you are usually best advised to set the originator interval on all nodes to a level best suited for the most mobile node. However, if most of the nodes are rather static, this can create a lot of undesired overhead as a trade-off then. If setting the interval too low on the static nodes, a mobile node might be chosen as a router for too long, not switching away from it fast enough because of its mobility and the low frequency of ogms of static nodes. Exposing the hop_penalty is especially useful for the stated scenario: A static node can keep the default originator interval, a mobile node can select a quicker one resulting in faster route updates towards this mobile node. Additionally, such a mobile node could select a higher hop penalty (or even set it to 255 to disable acting as a router for other nodes) to make it less desirable, letting other nodes avoid selecting this mobile node as a router. Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 1623948f879069b33d07986aa95e3b9969322ff4 Author: Linus Lüssing Date: Mon Nov 22 00:55:54 2010 +0100 Staging: batman-adv: Ommit storing struct device in sysfs functions We actually do not need an extra struct device variable, therefore replacing them with defines that directly get the bat_priv or net_device. This further reduces the code size in bat_sysfs.c and especially shortens some macros. Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit add9e1722755072f40d79104db04e350b25624d9 Author: Linus Lüssing Date: Mon Nov 22 00:55:53 2010 +0100 Staging: batman-adv: Wrapper functions for sysfs storing Sysfs configuration options that just took a boolean value (enable(d)/disable(d)/0/1) and integer setting basically all had the same structure. To avoid even more copy and pasting in the future and to make introducing new configuration parameters for batman-adv simpler, more generic wrapper functions are being introduced with this commit. They can deal with boolean and unsigned integer parameters, storing them in the specified atomic_t variables. Signed-off-by: Linus Lüssing Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 641ee3f8f4375bde4e216aacd26d286a34efed61 Author: Linus Lüssing Date: Mon Nov 22 00:55:52 2010 +0100 Staging: batman-adv: Unify sysfs file names with their bat_priv atomics Both sysfs entries and variable names shall be as descriptive as possible while not exceeding a certain length. This patch renames bat_priv atomics to be equally descriptive with their according sysfs entries. Unifying sysfs and bat_priv atomic names also makes it easier to find each others pendant. The reduced ("type"-)information which was previously indicated with a _enabled for booleans got substituted by a comment in bat_priv. This patch has also been done in regards for the future BAT_ATTR_* macros (they only need one name argument instead of a file and variable name). Signed-off-by: Linus Lüssing Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 420193573f1191b22e08f85ead41c090d283dd05 Author: Marek Lindner Date: Mon Nov 22 00:55:51 2010 +0100 Staging: batman-adv: softif bridge loop avoidance By connecting multiple batman-adv mesh nodes to the same ethernet segment a loop can be created when the soft-interface is bridged into that ethernet segment. A simple visualization of the loop involving the most common case - a LAN as ethernet segment: node1 <-- LAN --> node2 | | wifi <-- mesh --> wifi Packets from the LAN (e.g. ARP broadcasts) will circle forever from node1 or node2 over the mesh back into the LAN. This patch adds the functionality to detect other batman-adv nodes connected to the LAN and select a 'gateway' to talk to the non-batman-adv devices on this LAN. All traffic from and to the mesh will be handled by this gateway to avoid the loop. OGMs received via the soft-interface are interpreted as 'port announcements' to locate potential batman-adv nodes. The patch can also deal with vlans on top of batX and offers a list of LAN neighbors via debugfs. Signed-off-by: Marek Lindner [sven.eckelmann@gmx.de: Rework on top of current version] Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 225f7b0b950d141819a8d9694141571b349e563d Author: Andreas Langer Date: Mon Nov 22 00:55:50 2010 +0100 Staging: batman-adv: reassemble fragmented skb if mtu allows it Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 9061109ab18352c73b5dda426043dbb6d5e2dae7 Author: Andreas Langer Date: Mon Nov 22 00:55:49 2010 +0100 Staging: batman-adv: fragment forwarded packets If a packet is too big to be forwarded over an interface it will be fragmented on-the-fly (if fragmentation is enabled). Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit b8cd75445e842b11a0a8ff1e763303a575c21c77 Author: Andreas Langer Date: Mon Nov 22 00:55:48 2010 +0100 Staging: batman-adv: remove redundant is_my_mac() check in route_unicast_packet Callers should check the if the received packet is for us before it calls route_unicast_packet. Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit f3cc7595d242a22a9ffba91979d2cd4e4e815424 Author: Andreas Langer Date: Mon Nov 22 00:55:47 2010 +0100 Staging: batman-adv: move skb reassembly of fragmented packets into dedicated function Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 8bbde32cf5bd9dbe2f53d562f563b465c0829b23 Author: Andreas Langer Date: Mon Nov 22 00:55:46 2010 +0100 Staging: batman-adv: add frag_ prefix to all fragmentation related functions Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 49b588e79f7c85aec05008a945fdf17d281e83f9 Author: Andreas Langer Date: Mon Nov 22 00:55:45 2010 +0100 Staging: batman-adv: restructure fragmentation to handle batman unicast packets The unicast_frag_send_skb() function expected 'raw' packets (without any batman-adv header) to fragment them. This needs to be changed, so that this function is able to fragment packets that already traveled inside the mesh but need to be fragmented now. Signed-off-by: Andreas Langer Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 3f427604d669031343af8e6ecd8d1cc7a6408ab2 Author: Marek Lindner Date: Mon Nov 22 00:55:44 2010 +0100 Staging: batman-adv: use rcu callbacks when freeing batman_if Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit b4abfcd4c79ec12340b4c68e3a211badd3c90e20 Author: Marek Lindner Date: Mon Nov 22 00:55:43 2010 +0100 Staging: batman-adv: convert batman_if custom refcounting to kref functions Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit bd27509f49ab841bc10fd604ccd9e7f9914b7120 Author: Sven Eckelmann Date: Mon Nov 22 00:55:42 2010 +0100 Staging: batman-adv: Don't remove interface with spinlock held We call a lot of the netdevice code when holding if_list_lock which will spin the whole time. This is not necessary because we only want to protect the access to the list to be serialized. An extra queue can be used which hold all interfaces which should be removed and then use that queue without any locks for netdevice cleanup. Reported-by: Rafal Lesniak Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 43fc987224a45dc53ccc302df5889230d9587921 Author: Sven Eckelmann Date: Mon Nov 22 00:55:41 2010 +0100 Staging: batman-adv: Add new sysfs files to README Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 2f1646788f4d3cd2ce5cb24d13096afbd8782665 Author: Marek Lindner Date: Mon Nov 22 00:55:40 2010 +0100 Staging: batman-adv: ensure that eth_type_trans gets linear memory eth_type_trans tries to pull data with the length of the ethernet header from the skb. We only ensured that enough data for the first ethernet header and the batman header is available in non-paged memory of the skb and not for the ethernet after the batman header. eth_type_trans would fail sometimes with drivers which don't ensure that all there data is perfectly linearised. Reported-by: Rafal Lesniak Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 4f26559156eae1b616ef2d0d168bd25f493e02f4 Author: Sven Eckelmann Date: Mon Nov 22 00:55:39 2010 +0100 Staging: batman-adv: Replace Andrew Lunn as Staging maintainer Andrew Lunn didn't submit patches to staging since a while and may not be the right person for new patches. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 4f76548299196e0fd880469a39552ccde797474b Author: Michael Hennerich Date: Tue Nov 23 11:40:13 2010 +0100 staging: iio: dac: ad5446: Remove unused sign member from chip specific information structure Remove unused sign member from chip specific information structure Fix typos Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit d846263da4c6032b7a9440d335794ef8d3e76dfb Author: Michael Hennerich Date: Tue Nov 23 11:14:16 2010 +0100 staging: iio: dac: ad5446: Enable driver support for AD5620/AD5640/AD5660 DA converters Initial support for single channel, 12-/14-/16-Bit nanoDAC with On-Chip Reference staging: iio: dac: ad5446: Fix according to review feedback Review feedback by Jonathan Cameron: Use kernel doc style to document headers. Turn data into a union Add some comments for clarity Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit f386caa3cd74231cd86c813fe4453e3d6e39876c Author: Jonathan Cameron Date: Mon Nov 22 23:31:16 2010 +0000 staging: iio: documentation rewrite and cleanup of sysfs documetation Change to capital syntax for documetation e.g. 'inX-inY_raw' Use multiple 'What:' entries rather than wild cards or options so as to make the documentation clearer and easier to search. Some trivial spelling fixes. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit fe34604844c151668579cb6ad52f75a5c651bed9 Author: Jonathan Cameron Date: Mon Nov 22 23:09:48 2010 +0000 staging: iio: adis16260 add suppport for adis16255 and adis16250. Unusual element is addition of 'negate' and 'axis' platform data to ensure we support all the functionality of the adis16255 driver currently in staging. Signed-off-by: Jonathan Cameron Acked-by: Matthias Brugger Signed-off-by: Greg Kroah-Hartman commit a9672951a5c4e57e048895d868a2172962ef7ffd Author: Jonathan Cameron Date: Mon Nov 22 23:09:47 2010 +0000 staging: iio: adis16260 add id table support Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 2b4756aa36909a94596752db341a0a2c8bb8c6ea Author: Michael Hennerich Date: Mon Nov 22 14:35:32 2010 +0100 staging: iio: adc: Enable driver support for ad7887 AD converter Enable support for AD7887: SPI Micropower, 2-Channel, 125 kSPS, 12-Bit ADC staging: iio: adc: Fix according to review feedback Review feedback by Jonathan Cameron: Combine statements. Document struct members. Remove redundant variable initialization. Simplify multichannel scan from ring logic. Fix coding style. [v2] staging: iio: adc: ad7887: Fix typos Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit b5a49481754a5cbfdc47bd701208f77c5c9010c6 Author: Michael Hennerich Date: Mon Nov 22 11:15:23 2010 +0100 staging: iio: dac: Enable driver support for AD5444 and AD5446 DA converters Enable support for AD5444 and AD5446: 12-/14-Bit High Bandwidth Multiplying DACs with Serial Interface. staging: iio: dac: Add support for AD5541A, AD5512A digital to analog convertors staging: iio: dac: Fix according to review feedback Review feedback by Jonathan Cameron: Remove spurious new line. Document struct members. Remove redundant variable initialization. Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 95bd48578bbe66fa5d16029c59dfbe95749a5f0b Author: Huang Weiyi Date: Sat Nov 20 20:06:18 2010 +0800 staging: brcm80211: remove duplicated #include Remove duplicated #include('s) in drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 649e5fb033bbadbfa78aba5e2711f1faf2affaf0 Merge: df0701b 39a5455 Author: Mark Brown Date: Mon Nov 29 18:33:47 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit a41778694806ac1ccd4b1dafed1abef8d5ba98ac Author: Eric Dumazet Date: Sun Nov 28 21:43:02 2010 +0000 xps: add __rcu annotations Avoid sparse warnings : add __rcu annotations and use rcu_dereference_protected() where necessary. Signed-off-by: Eric Dumazet Cc: Tom Herbert Signed-off-by: David S. Miller commit b02038a17b271e0f70616c54e4eccb5cc33d1b74 Author: Eric Dumazet Date: Sun Nov 28 05:43:24 2010 +0000 xps: NUMA allocations for per cpu data store_xps_map() allocates maps that are used by single cpu, it makes sense to use NUMA allocations. Signed-off-by: Eric Dumazet Cc: Tom Herbert Signed-off-by: David S. Miller commit 49b4a6546fac02f58784f0744e0f99a6562ccc03 Author: Shan Wei Date: Mon Nov 29 00:14:58 2010 +0000 sctp: kill unused macros in head file 1. SCTP_CMD_NUM_VERBS,SCTP_CMD_MAX These two macros have never been used for several years since v2.6.12-rc2. 2.sctp_port_rover,sctp_port_alloc_lock The commit 063930 abandoned global variables of port_rover and port_alloc_lock, but still keep two macros to refer to them. So, remove them now. commit 06393009000779b00a558fd2f280882cc7dc2008 Author: Stephen Hemminger Date: Wed Oct 10 17:30:18 2007 -0700 [SCTP]: port randomization Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 7f51439a3c078393e7618a636fea403afa35948c Author: Konstantin Sinyuk Date: Tue Nov 16 08:55:03 2010 +0200 [ARM] Dove: add support for CM-A510 machine. This patch adds support for CM-A510 machine Signed-off-by: Konstantin Sinyuk Signed-off-by: Mike Rapoport Reviewed-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit 1ccb53a4f3d0bfd65889fcfe988d829633641f49 Author: Evgeniy Dushistov Date: Tue Nov 9 22:46:17 2010 +0300 [ARM] mv78xx: wrong cpu1 window base register address The constant DDR_WINDOW_CPU1_BASE has wrong value. Because of that mv78xx0_mbus_dram_info is not filled properly on start, and in its turn drivers, that used mv78xx0_mbus_dram_info, in my case mv643xx_eth.c, not work on second core. According to MV76100, MV78100, and MV78200 DiscoveryTM Innovation Series CPU Family Functional Specifications address should be 0x1570. Signed-off-by: Evgeniy Dushistov Acked-by: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit 760efe6910d5743084b586d3d0a3b65aea96fb2f Author: Mac Lin Date: Thu Nov 25 23:58:00 2010 +0800 USB: cns3xxx: Add EHCI and OHCI bus glue for cns3xxx SOCs The CNS3XXX SOC has include USB EHCI and OHCI compatible controllers. This patch adds the necessary glue logic to allow ehci-hcd and ohci-hcd drivers to work on CNS3XXX The EHCI and OHCI controllers share a common clock control and reset bit, therefore additional check for the timming of enabling and disabling is required. The USB bit of PLL Power Down Control is also shared by OTG, 24MHzUART clock, Crypto clock, PCIe reference clock, and Clock Scale Generator. Therefore we only ensure it is enabled, while not disabling it. Signed-off-by: Mac Lin Acked-by: Alan Stern Acked-by: Greg Kroah-Hartman Signed-off-by: Anton Vorontsov commit ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 Author: Victor Gallardo Date: Fri Oct 8 10:25:44 2010 +0000 powerpc/4xx: Add Canyonlands suspend and idle support - Add Clock Power Management (CPM) node to dts tree - Add idle-doze entry in CPM node - Add standby entry in CPM node - Add PM and SUSPEND support by default in defconfig - Remove UART2 and UART3 as they are unused, this will allow CPM to put unused-units (UART2 and UART3) to sleep. Signed-off-by: Victor Gallardo Signed-off-by: Josh Boyer commit 05ed60874e7fc958707183b71ea47260c1dab358 Author: Victor Gallardo Date: Fri Oct 8 10:26:13 2010 +0000 powerpc/4xx: Add Kilauea suspend and idle support - Add Clock Power Management (CPM) node to dts tree - Add idle-doze entry in CPM node - Add standby entry in CPM node - Add PM and SUSPEND support by default in defconfig - Add NO_HZ and CONFIG_HIGH_RES_TIMERS support by default in defconfig Signed-off-by: Victor Gallardo Signed-off-by: Josh Boyer commit d164f6d4f9108126f69ba2963cf6fb7ef4ba9232 Author: Victor Gallardo Date: Fri Oct 8 10:25:27 2010 +0000 powerpc/4xx: Add suspend and idle support Add suspend/resume support for 4xx compatible CPUs. See /sys/power/state for available power states configured in. Add two different idle states (idle-wait and idle-doze) controlled via sysfs. Default is idle-wait. cat /sys/devices/system/cpu/cpu0/idle [wait] doze To save additional power, use idle-doze. echo doze > /sys/devices/system/cpu/cpu0/idle cat /sys/devices/system/cpu/cpu0/idle wait [doze] Signed-off-by: Victor Gallardo Signed-off-by: Josh Boyer commit 7451708f39db19a8303bb7fb95f00aca9f673cb5 Author: Herbert Xu Date: Mon Nov 29 22:56:03 2010 +0800 crypto: af_alg - Add dependency on NET Add missing dependency on NET since we require sockets for our interface. Should really be a select but kconfig doesn't like that: net/Kconfig:6:error: found recursive dependency: NET -> NETWORK_FILESYSTEMS -> AFS_FS -> AF_RXRPC -> CRYPTO -> CRYPTO_USER_API_HASH -> CRYPTO_USER_API -> NET Reported-by: Zimny Lech Signed-off-by: Herbert Xu commit df0701bb8660107e811bddba6e4933385f697a21 Author: Dimitris Papastamos Date: Mon Nov 29 10:54:28 2010 +0000 ASoC: soc-cache: Ensure consistent cache naming Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7a33d4ce8231f789548ce6e25f75894a6c8508a5 Author: Dimitris Papastamos Date: Mon Nov 29 10:24:54 2010 +0000 ASoC: soc-cache: Add error checking in the *_cache_sync functions Ensure that we report any errors encountered during reads/writes in the cache syncing functions. Remove redundant newline in the source code. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d482337eaba627348ffb8b7c0752d65e16667cd9 Author: Axel Lin Date: Fri Nov 26 14:54:42 2010 +0800 ASoC: Fix resource leak in smdk_spdif.c Properly free allocated resources in smdk_init() error path. Add missing platform_device_unregister() in smdk_exit(). Signed-off-by: Axel Lin Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3790f205465f5c47a3629129af875c94f61f1fd3 Author: Axel Lin Date: Fri Nov 26 14:53:38 2010 +0800 ASoC: Add missing gpio_free(S3C64XX_GPK(12)) in smartq_exit() Signed-off-by: Axel Lin Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b6a11f497369fff39e8eb91c83b531d41a73986d Author: Axel Lin Date: Fri Nov 26 14:52:47 2010 +0800 ASoC: Fix resource leak in neo1973_gta02_init() error path Properly free allocated resources in neo1973_gta02_init() error path. Signed-off-by: Axel Lin Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 853dc30274878d14b7abef8313c801f5559b4c47 Author: Axel Lin Date: Fri Nov 26 14:51:56 2010 +0800 ASoC: Fix resource leak in goni_wm8994.c Properly free allocated resources in goni_init() error path. Add missing snd_soc_unregister_dai() in goni_exit(). Signed-off-by: Axel Lin Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit dc427170750f7be9ddedf16ca049b5cb827bd880 Author: Takashi Iwai Date: Mon Nov 29 07:42:59 2010 +0100 ALSA: hda - Remove dead md2 quirk code Signed-off-by: Takashi Iwai commit ca19e77e44985b5500f5461f7d2f4ce799cb60ce Merge: 9d57883 ac70eb1 Author: Takashi Iwai Date: Mon Nov 29 07:44:01 2010 +0100 Merge branch 'fix/hda' into topic/hda commit eb87e6770a9b1ad54b13fcfe80a1346d0c257536 Author: Kuninori Morimoto Date: Mon Nov 29 06:19:52 2010 +0000 ARM: mach-shmobile: mackerel: Add lost GPIO_FN_LCDD 18 - 23 RGB24 bus needs 18-23 pin Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 46f5221049bb46b0188aad6b6dfab5dbc778be22 Author: Stephen Rothwell Date: Thu Nov 18 15:06:17 2010 +0000 powerpc: Remove second definition of STACK_FRAME_OVERHEAD Since STACK_FRAME_OVERHEAD is defined in asm/ptrace.h and that is ASSEMBER safe, we can just include that instead of going via asm-offsets.h. Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 0b97fee0ef9b0a0445520f90980410f905c6f9da Author: Michael Neuling Date: Wed Nov 17 18:52:45 2010 +0000 powerpc/mm: Avoid avoidable void* pointer Change pgdir from a void to real type. Having this as a void is stupid and has already caused 1 bug. Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit 6f08cb3be6345bc354e48131f7466766db4d355a Author: Michael Neuling Date: Wed Nov 17 18:52:44 2010 +0000 powerpc: Add POWER7+ cputable entry This adds the POWER7+ cputable entry for the PVR 0x004a0000. Rest is the same as vanilla POWER7. Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit 1d32bb1827da3ebb413f6cb492990a42ab030559 Author: Michael Neuling Date: Wed Nov 17 18:52:43 2010 +0000 powerpc: Remove POWER6 oprofile workarounds for POWER7 These are not needed on POWER7 so remove them. Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit 93fe56e99fb946fcd4244741bfc7af6638f1cac7 Author: Michael Neuling Date: Wed Nov 17 18:52:42 2010 +0000 powerpc: Remove unneeded cpu_setup/restore from POWER7 cputable entry These are not needed so just remove them Signed-off-by: Michael Neuling Signed-off-by: Benjamin Herrenschmidt commit 36f567b42932a81866bf723779703ecc84cf714b Author: Jesse Larrew Date: Tue Nov 9 13:24:48 2010 +0000 powerpc: Add VPHN firmware feature This simple patch adds the firmware feature for VPHN to the firmware features bitmask. Signed-off-by: Jesse Larrew Signed-off-by: Benjamin Herrenschmidt commit 698193d85aa8aba003bacd09e40bbd78474fb00f Author: Michael Ellerman Date: Mon Nov 8 17:31:36 2010 +0000 powerpc: Consolidate obj-y assignments No need to have three of them. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit f7dec88781dd3ad62ebd4acc515c8938c15353ac Author: Jesper Juhl Date: Thu Nov 4 13:29:40 2010 +0000 powerpc/iseries: Remove unused mf_getSrcHistory function and caller. On Tue, 2 Nov 2010, Michael Ellerman wrote: > On Mon, 2010-11-01 at 22:20 +0100, Jesper Juhl wrote: > > Hi Stephen, > > > > On Tue, 2 Nov 2010, Stephen Rothwell wrote: > > > > > On Mon, 1 Nov 2010 21:06:23 +0100 (CET) Jesper Juhl wrote: > > > > > > > > Remove unused function 'mf_getSrcHistory' (that will never be used ever > > > > according to Stephen Rothwell). > > > > > > > > Signed-off-by: Jesper Juhl > > > > > > Acked-by: Stephen Rothwell > > > > > > > Ok, so if you are the (unofficial) iSeries maintainer and you don't merge > > the patch somewhere that'll eventually go up-stream, but just ACK it > > (thank you for that btw), then where do I send it to get it merged? > > Here. ie. linuxppc-dev. > > But, while you're removing it you should remove the #if 0'ed callsite as > well, see mf_src_proc_show() in that file. :) > Done. See patch below. Remove unused function 'mf_getSrcHistory' (that will never be used ever according to Stephen Rothwell) and also remove most of (under 'if 0') code from mf_src_proc_show() where the function was called. Signed-off-by: Jesper Juhl Signed-off-by: Benjamin Herrenschmidt commit 467d93a7ee64a5c8f675589d658ce3b8b502d288 Author: Jesper Juhl Date: Sat Oct 30 08:10:41 2010 +0000 powerpc/cell: Use vzalloc rather than vmalloc and memset in spu_alloc_lscsa_std Hi, We can get rid of a memset in arch/powerpc/platforms/cell/spufs/lscsa_alloc.c::spu_alloc_lscsa_std() by using vzalloc() rather than vmalloc()+memset(). Completely untested patch below since I have no hardware nor tools to compile this. Signed-off-by: Jesper Juhl Signed-off-by: Benjamin Herrenschmidt commit cd34206e949b66d3c5fa3e4d2905aa4af29d1b85 Author: Nishanth Aravamudan Date: Tue Oct 26 17:35:12 2010 +0000 powerpc: Add memory_hotplug_max() Add a function to get the maximum address that can be hotplug added. This is needed to calculate the size of the tce table needed to cover all memory in 1:1 mode. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit f6aedd8606ae673f8e1f4d972fc86c451fbc8ba7 Author: Nishanth Aravamudan Date: Tue Oct 26 17:35:11 2010 +0000 powerpc/macio: Ensure all dma routines get copied over Also add a comment to dev_archdata, indicating that changes there need to be verified against the driver code. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit a8daac8a517dacfea951424f67c1f07e1f76b2ad Author: Nishanth Aravamudan Date: Mon Oct 18 07:27:03 2010 +0000 powerpc/pseries: iommu cleanup No need to initialize per-cpu pointer to NULL, it is the default. Direct dma ops and no setup are the defaults, no need to set for iommu-off. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Reviewed-by: Grant Likely Signed-off-by: Benjamin Herrenschmidt commit 34c4d012554ed8c99b3fb25baea9bab3507e9f76 Author: Nishanth Aravamudan Date: Mon Oct 18 07:27:02 2010 +0000 powerpc/dart: iommu table cleanup No need to set the device tree device_node pci node iommu pointer, its only used for dlpar remove. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 741d204cee6d62bbe0f74ab57ef31702b7d90f62 Author: Nishanth Aravamudan Date: Mon Oct 18 07:27:01 2010 +0000 powerpc/cell: Beat dma ops cleanup direct_dma_ops is the default pci dma ops. No need to call a function to get the pci dma ops, we know they are the dma_direct_ops. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Acked-by: Arnd Bergmann Signed-off-by: Benjamin Herrenschmidt commit 2f9c9be2ff31670c942572cf96eb6c696362b584 Author: Nishanth Aravamudan Date: Mon Oct 18 07:27:00 2010 +0000 powerpc/pasemi: Clean up pasemi iommu table initializations No need for empty helpers with iommu off, the ppc_md hooks are optional. The direct_dma_ops are the default pci_dma_ops, so no need to set in the them iommu off case. No need to set the device tree device_node pci node iommu pointer, its only used for dlpar remove. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Acked-by: Olof Johansson Signed-off-by: Benjamin Herrenschmidt commit 6d283d782f9fbafee5c672bfdaff4c10f6fdc788 Author: Nishanth Aravamudan Date: Mon Oct 18 07:26:59 2010 +0000 powerpc/vio: Use dma ops helpers Use the set_dma_ops helper. Instead of modifying vio_dma_mapping_ops, just create a trivial wrapper for dma_supported. Signed-off-by: Milton Miller Signed-off-by: Nishanth Aravamudan Signed-off-by: Benjamin Herrenschmidt commit 72b962d3bba19657abaa6cc8806661ecbde5ee92 Author: Tracey Dent Date: Fri Oct 15 17:30:48 2010 +0000 powerpc/ps3: Replace the use of -objs with -y Changed -objs to -y in Makefile. Signed-off-by: Tracey Dent Signed-off-by: Benjamin Herrenschmidt commit 8cb7c71bda16e2d67a332642661e0b4219641a23 Author: Srikanth Krishnakar Date: Thu Oct 14 04:03:35 2010 +0000 rtc-cmos.c : Fix warning on PowerPC The following warning is seen while compilation of PowerPC kernel: CC drivers/rtc/rtc-cmos.o drivers/rtc/rtc-cmos.c:697:2: warning: #warning Assuming 128 bytes of RTC+NVRAM address space, not 64 bytes. Fix it by adding defined(__powerpc__). Signed-off-by: Srikanth Krishnakar Signed-off-by: Benjamin Herrenschmidt commit 5742bd859524793b857110a13db349d95070d2dc Author: Vaidyanathan Srinivasan Date: Wed Oct 6 08:37:09 2010 +0000 powerpc: Add support for new hcall H_BEST_ENERGY Create sysfs interface to export data from H_BEST_ENERGY hcall that can be used by administrative tools on supported pseries platforms for energy management optimizations. sys/device/system/cpu/pseries_(de)activate_hint_list and sys/device/system/cpu/cpuN/pseries_(de)activate_hint will provide hints for activation and deactivation of cpus respectively. These hints are abstract number given by the hypervisor based on the extended knowledge the hypervisor has regarding the system topology and resource mappings. The activate and the deactivate sysfs entry is for the two distinct operations that we could do for energy savings. When we have more capacity than required, we could deactivate few core to save energy. The choice of the core to deactivate will be based on /sys/devices/system/cpu/deactivate_hint_list. The comma separated list of cpus (cores) will be the preferred choice. If we have to activate some of the deactivated cores, then /sys/devices/system/cpu/activate_hint_list will be used. The per-cpu file /sys/device/system/cpu/cpuN/pseries_(de)activate_hint further provide more fine grain information by exporting the value of the hint itself. Added new driver module arch/powerpc/platforms/pseries/pseries_energy.c under new config option CONFIG_PSERIES_ENERGY Signed-off-by: Vaidyanathan Srinivasan Signed-off-by: Benjamin Herrenschmidt commit 99d86705253dcf728dbbec4d694a6764b6edb70c Author: Vaidyanathan Srinivasan Date: Wed Oct 6 08:36:59 2010 +0000 powerpc: Cleanup APIs for cpu/thread/core mappings These APIs take logical cpu number as input Change cpu_first_thread_in_core() to cpu_first_thread_sibling() Change cpu_last_thread_in_core() to cpu_last_thread_sibling() These APIs convert core number (index) to logical cpu/thread numbers Add cpu_first_thread_of_core(int core) Changed cpu_thread_to_core() to cpu_core_index_of_thread(int cpu) The goal is to make 'threads_per_core' accessible to the pseries_energy module. Instead of making an API to read threads_per_core, this is a higher level wrapper function to convert from logical cpu number to core number. The current APIs cpu_first_thread_in_core() and cpu_last_thread_in_core() returns logical CPU number while cpu_thread_to_core() returns core number or index which is not a logical CPU number. The new APIs are now clearly named to distinguish 'core number' versus first and last 'logical cpu number' in that core. The new APIs cpu_{first,last}_thread_sibling() work on logical cpu numbers. While cpu_first_thread_of_core() and cpu_core_index_of_thread() work on core index. Example usage: (4 threads per core system) cpu_first_thread_sibling(5) = 4 cpu_last_thread_sibling(5) = 7 cpu_core_index_of_thread(5) = 1 cpu_first_thread_of_core(1) = 4 cpu_core_index_of_thread() is used in cpu_to_drc_index() in the module and cpu_first_thread_of_core() is used in drc_index_to_cpu() in the module. Make API changes to few callers. Export symbols for use in modules. Signed-off-by: Vaidyanathan Srinivasan Signed-off-by: Benjamin Herrenschmidt commit 787d44caa5bca249d8781d21b626c417f1e3cfc4 Author: FUJITA Tomonori Date: Fri Oct 1 11:12:54 2010 +0000 powerpc: enable ARCH_DMA_ADDR_T_64BIT with ARCH_PHYS_ADDR_T_64BIT Signed-off-by: FUJITA Tomonori Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Benjamin Herrenschmidt commit 4e89a2d8e2d5ab33d73b76f16c10fdf515faabef Author: Will Schmidt Date: Tue Sep 28 15:33:12 2010 +0000 powerpc/pseries: Add kernel parameter to disable batched hcalls This introduces a pair of kernel parameters that can be used to disable the MULTITCE and BULK_REMOVE h-calls. By default, those hcalls are enabled, active, and good for throughput and performance. The ability to disable them will be useful for some of the PREEMPT_RT related investigation and work occurring on Power. Signed-off-by: Will Schmidt cc: Olof Johansson cc: Anton Blanchard cc: Benjamin Herrenschmidt Signed-off-by: Benjamin Herrenschmidt commit 475fc7c011ace79258c07d981d348a15614e0573 Author: Lennert Buytenhek Date: Tue Sep 21 23:22:40 2010 +0000 powerpc: Fix two typos in Documentation/powerpc/booting-without-of.txt Signed-off-by: Lennert Buytenhek Signed-off-by: Benjamin Herrenschmidt commit 5a71c61b7724ad0acedff254e07dc1a7dd05ee76 Author: Joe Perches Date: Mon Sep 13 09:47:42 2010 +0000 drivers/char/hvc_vio: Use static const char arrays Signed-off-by: Joe Perches Reviewed-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 56e640de12c4d9902493cd819c63cacf66515686 Author: Christian Dietrich Date: Mon Sep 6 04:36:12 2010 +0000 powerpc: Removing undead ifdef __KERNEL__ The __KERNEL__ ifdef isn't necessary at this point, because it is checked in an outer ifdef level already and has no effect here. Signed-off-by: Christian Dietrich Signed-off-by: Benjamin Herrenschmidt commit d72e063bb32c06c6c1cec14f6857b7c37ba62d7a Author: Anton Blanchard Date: Tue Aug 24 14:23:44 2010 +0000 powerpc/kdump: Override crash_free_reserved_phys_range to avoid freeing RTAS The crashkernel region will almost always overlap RTAS. If we free the crashkernel region via "echo 0 > /sys/kernel/kexec_crash_size" then we will free RTAS and the machine will crash in confusing and exciting ways. Override crash_free_reserved_phys_range and check for overlap with RTAS. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 64ff31287693c1f325cb9cb049569c1611438ef1 Author: Anton Blanchard Date: Thu Aug 12 16:28:09 2010 +0000 powerpc: Add support for popcnt instructions POWER5 added popcntb, and POWER7 added popcntw and popcntd. As a first step this patch does all the work out of line, but it would be nice to implement them as inlines with an out of line fallback. The performance issue with hweight was noticed when disabling SMT on a large (192 thread) POWER7 box. The patch improves that testcase by about 8%. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit f4f0c135de9d359e22172adfb1d30ddcb38c00a7 Author: Kuninori Morimoto Date: Mon Nov 29 13:25:22 2010 +0900 ARM: mach-shmobile: mackerel: Add mackerel defconfig Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 4b82b68925d19ab32159ba94b30768f705812e0f Author: Kuninori Morimoto Date: Mon Nov 29 02:21:48 2010 +0000 ARM: mach-shmobile: mackerel: document switch and pin modes. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 11fee467a119afac02d336bf41dcd9c4db2b6106 Author: Kuninori Morimoto Date: Mon Nov 29 02:21:43 2010 +0000 ARM: mach-shmobile: mackerel: Add LCDC support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 2264c151efa632fa8aab7377d13d9aa1476547bf Author: Kuninori Morimoto Date: Mon Nov 29 02:21:37 2010 +0000 ARM: mach-shmobile: mackerel: Add SMSC support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 920adc75d51d23fe3e8a7ce2c946b2b24e6f7742 Author: Kuninori Morimoto Date: Mon Nov 29 02:21:21 2010 +0000 ARM: mach-shmobile: Add mackerel board support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 208c7dc2727ec0fbc678da5e749bcc178c08463d Author: Kuninori Morimoto Date: Mon Nov 29 02:10:08 2010 +0000 ARM: mach-shmobile: ag5evm: Add FSI resources Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 22efa0fee32d9e7f6f6fbc396a872b5708d86048 Author: Simon Horman Date: Sat Nov 27 00:11:55 2010 +0000 sh, mmc: Use defines when setting CE_CLK_CTRL The 16-19th bits of CE_CLK_CTRL set the MMC clock frequency. Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 1ae0affedce1d3e401991fbe7f2674753f0a7641 Author: Simon Horman Date: Fri Nov 26 23:02:58 2010 +0000 mmc, sh: Correct value for reset This resolves a regression that I introduced in "mmc, sh: Move constants to sh_mmcif.h". Having examined the manual and tested the code on an AP4EVB board it seems that the correct sequence is. 1) Write 1 to bit 31 and zeros to all other bits 2) Write zero to all bits Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 7211a1bae6eac26539eb2d77a26fcd1bccef8137 Author: Simon Horman Date: Fri Nov 26 23:02:57 2010 +0000 sh, mmc: Make mmcif_update_progress static inline extern inline doesn't make much sense Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit e9248fbd6b6f7ef1917bfffe998654e40dfb4cfd Author: Scott J. Goldman Date: Sat Nov 27 10:33:55 2010 +0000 vmxnet3: fix compilation when RSS is disabled If RSS is disabled, we can ifdef out some RSS specific code. This fixes the compile error found by Randy Dunlap. Signed-off-by: Scott J. Goldman Reviewed-by: Bhavesh Davda Signed-off-by: David S. Miller commit bf26414510103448ad3dc069c7422462f03ea3d7 Author: Tom Herbert Date: Fri Nov 26 08:36:09 2010 +0000 xps: Add CONFIG_XPS This patch adds XPS_CONFIG option to enable and disable XPS. This is done in the same manner as RPS_CONFIG. This is also fixes build failure in XPS code when SMP is not enabled. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 8fa9208e305e24978b897d6ea057604444ce77e1 Author: Frank Blaschka Date: Fri Nov 26 02:41:20 2010 +0000 qeth: l3 fix len in tso hdr The tso hdr is longer then the regular l3 hdr. Fix the calculation of the total len by accounting the size of the tso hdr. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 2b6203bb7d85e6a2ca2088b8684f30be70246ddf Author: Ursula Braun Date: Fri Nov 26 02:41:19 2010 +0000 qeth: enable interface setup if LAN is offline Device initialization of a qeth device contains a STARTLAN step. This step may fail, if cable is not yet plugged in. The qeth device stays in state HARDSETUP until cable is plugged in. This prevents further preparational initialization steps of the qeth device and its network interface. This patch makes sure initialization of qeth device continues, even though cable is not yet plugged in. Once carrier is available, qeth is notified, triggers a recovery which results in a working network interface. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit cdac082e051136a021f28d0f63c56e916b541253 Author: Joe Perches Date: Fri Nov 26 02:41:18 2010 +0000 drivers/s390/net: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit f3aa3136d9c15ff693198eb34701a74bb0b6b969 Author: Sachin Sant Date: Fri Nov 26 02:41:17 2010 +0000 qeth lcs: convert mc rwlock to RCU Commit 1d7138de878d1d4210727c1200193e69596f93b3 igmp: RCU conversion of in_dev->mc_list converted rwlock to RCU. Update the s390 network drivers(qeth & lcs) code to adapt to this change. V2 : Changes based on suggestions given by Eric Dumazet Signed-off-by: Sachin Sant Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5 Author: Giuseppe Cavallaro Date: Sun Nov 28 18:10:53 2010 -0800 stmmac: fix stmmac_resume removing not yet used shutdown flag The commit to convert to use the dev_pm_ops struct introduces a bug. The shutdown flag is not yet used because the hibernation on memory is done by using the freeze callback. Thanks to Vlad for having reported it. Reported-by: Vlad Lungu Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit de855b992d75e49816eb09231764e7a63a4f555d Author: Szymon Janc Date: Sat Nov 27 08:39:48 2010 +0000 forcedeth: use usleep_range not msleep for small sleeps Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 34cf97eb255b09751f1eb1b5573813e9ea3fe21f Author: Szymon Janc Date: Sat Nov 27 08:39:46 2010 +0000 forcedeth: do not use assignment in if conditions Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 5504e1397cc860e61fbb68c56e7a10db613275fd Author: Szymon Janc Date: Sat Nov 27 08:39:45 2010 +0000 forcedeth: include and instead of and as suggested by checkpatch Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 9b03b06b65856f70564c53654d44053f3072379e Author: Szymon Janc Date: Sat Nov 27 08:39:44 2010 +0000 forcedeth: remove unnecessary checks before kfree Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 78aea4fc67a7534d5f5bbb0419a2bcb50b0547c9 Author: Szymon Janc Date: Sat Nov 27 08:39:43 2010 +0000 forcedeth: fix multiple code style issues Signed-off-by: Szymon Janc Signed-off-by: David S. Miller commit 47c05314328d9c40f6006783dc4c1e3080bd2914 Author: Joe Perches Date: Sun Nov 28 00:02:59 2010 +0000 zd1211rw: document need for kmalloc cast Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e80be0b0ee307a2801e57cf36333d3d659e4bcc6 Author: Joe Perches Date: Sat Nov 27 23:05:45 2010 +0000 vxge: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit f3167460144cd2c24b964a32d40d32f851b5d5f4 Author: Joe Perches Date: Sat Nov 27 23:05:44 2010 +0000 qlcnic: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 0acdf68f495793143802dd4f3e47918dddcceed7 Author: Joe Perches Date: Sat Nov 27 23:05:43 2010 +0000 netxen: remove unnecessary [kv][mcz]alloc casts Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 559ad0ff1368baea14dbc3207d55b02bd69bda4b Author: Mathias Krause Date: Mon Nov 29 08:35:39 2010 +0800 crypto: aesni-intel - Fixed build error on x86-32 Exclude AES-GCM code for x86-32 due to heavy usage of 64-bit registers not available on x86-32. While at it, fixed unregister order in aesni_exit(). Signed-off-by: Mathias Krause Signed-off-by: Herbert Xu commit fa9f90be745d3b600a9d97a063be404c5e5d9071 Author: Jesper Juhl Date: Sun Nov 28 21:39:34 2010 +0100 Kill off a bunch of warning: ‘inline’ is not at beginning of declaration These warnings are spewed during a build of a 'allnoconfig' kernel (especially the ones from u64_stats_sync.h show up a lot) when building with -Wextra (which I often do).. They are a) annoying b) easy to get rid of. This patch kills them off. include/linux/u64_stats_sync.h:70:1: warning: ‘inline’ is not at beginning of declaration include/linux/u64_stats_sync.h:77:1: warning: ‘inline’ is not at beginning of declaration include/linux/u64_stats_sync.h:84:1: warning: ‘inline’ is not at beginning of declaration include/linux/u64_stats_sync.h:96:1: warning: ‘inline’ is not at beginning of declaration include/linux/u64_stats_sync.h:115:1: warning: ‘inline’ is not at beginning of declaration include/linux/u64_stats_sync.h:127:1: warning: ‘inline’ is not at beginning of declaration kernel/time.c:241:1: warning: ‘inline’ is not at beginning of declaration kernel/time.c:257:1: warning: ‘inline’ is not at beginning of declaration kernel/perf_event.c:4513:1: warning: ‘inline’ is not at beginning of declaration mm/page_alloc.c:4012:1: warning: ‘inline’ is not at beginning of declaration Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit b4e0d5f0791bd6dd12a1c1edea0340969c7c1f90 Author: Casey Schaufler Date: Wed Nov 24 17:12:10 2010 -0800 Smack: UDS revision This patch addresses a number of long standing issues with the way Smack treats UNIX domain sockets. All access control was being done based on the label of the file system object. This is inconsistant with the internet domain, in which access is done based on the IPIN and IPOUT attributes of the socket. As a result of the inode label policy it was not possible to use a UDS socket for label cognizant services, including dbus and the X11 server. Support for SCM_PEERSEC on UDS sockets is also provided. Signed-off-by: Casey Schaufler Signed-off-by: James Morris commit 7e70cb4978507cf31d76b90e4cfb4c28cad87f0c Author: Mimi Zohar Date: Tue Nov 23 18:55:35 2010 -0500 keys: add new key-type encrypted Define a new kernel key-type called 'encrypted'. Encrypted keys are kernel generated random numbers, which are encrypted/decrypted with a 'trusted' symmetric key. Encrypted keys are created/encrypted/decrypted in the kernel. Userspace only ever sees/stores encrypted blobs. Changelog: - bug fix: replaced master-key rcu based locking with semaphore (reported by David Howells) - Removed memset of crypto_shash_digest() digest output - Replaced verification of 'key-type:key-desc' using strcspn(), with one based on string constants. - Moved documentation to Documentation/keys-trusted-encrypted.txt - Replace hash with shash (based on comments by David Howells) - Make lengths/counts size_t where possible (based on comments by David Howells) Could not convert most lengths, as crypto expects 'unsigned int' (size_t: on 32 bit is defined as unsigned int, but on 64 bit is unsigned long) - Add 'const' where possible (based on comments by David Howells) - allocate derived_buf dynamically to support arbitrary length master key (fixed by Roberto Sassu) - wait until late_initcall for crypto libraries to be registered - cleanup security/Kconfig - Add missing 'update' keyword (reported/fixed by Roberto Sassu) - Free epayload on failure to create key (reported/fixed by Roberto Sassu) - Increase the data size limit (requested by Roberto Sassu) - Crypto return codes are always 0 on success and negative on failure, remove unnecessary tests. - Replaced kzalloc() with kmalloc() Signed-off-by: Mimi Zohar Signed-off-by: David Safford Reviewed-by: Roberto Sassu Signed-off-by: James Morris commit d00a1c72f7f4661212299e6cb132dfa58030bcdb Author: Mimi Zohar Date: Tue Nov 23 17:50:34 2010 -0500 keys: add new trusted key-type Define a new kernel key-type called 'trusted'. Trusted keys are random number symmetric keys, generated and RSA-sealed by the TPM. The TPM only unseals the keys, if the boot PCRs and other criteria match. Userspace can only ever see encrypted blobs. Based on suggestions by Jason Gunthorpe, several new options have been added to support additional usages. The new options are: migratable= designates that the key may/may not ever be updated (resealed under a new key, new pcrinfo or new auth.) pcrlock=n extends the designated PCR 'n' with a random value, so that a key sealed to that PCR may not be unsealed again until after a reboot. keyhandle= specifies the sealing/unsealing key handle. keyauth= specifies the sealing/unsealing key auth. blobauth= specifies the sealed data auth. Implementation of a kernel reserved locality for trusted keys will be investigated for a possible future extension. Changelog: - Updated and added examples to Documentation/keys-trusted-encrypted.txt - Moved generic TPM constants to include/linux/tpm_command.h (David Howell's suggestion.) - trusted_defined.c: replaced kzalloc with kmalloc, added pcrlock failure error handling, added const qualifiers where appropriate. - moved to late_initcall - updated from hash to shash (suggestion by David Howells) - reduced worst stack usage (tpm_seal) from 530 to 312 bytes - moved documentation to Documentation directory (suggestion by David Howells) - all the other code cleanups suggested by David Howells - Add pcrlock CAP_SYS_ADMIN dependency (based on comment by Jason Gunthorpe) - New options: migratable, pcrlock, keyhandle, keyauth, blobauth (based on discussions with Jason Gunthorpe) - Free payload on failure to create key(reported/fixed by Roberto Sassu) - Updated Kconfig and other descriptions (based on Serge Hallyn's suggestion) - Replaced kzalloc() with kmalloc() (reported by Serge Hallyn) Signed-off-by: David Safford Signed-off-by: Mimi Zohar Signed-off-by: James Morris commit c749ba912e87ccebd674ae24b97462176c63732e Author: Mimi Zohar Date: Tue Nov 23 18:54:16 2010 -0500 key: add tpm_send command Add internal kernel tpm_send() command used to seal/unseal keys. Changelog: - replaced module_put in tpm_send() with new tpm_chip_put() wrapper (suggested by David Howells) - Make tpm_send() cmd argument a 'void *' (suggested by David Howells) Signed-off-by: David Safford Signed-off-by: Mimi Zohar Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit a0e39349d80d8b5deeb264fb190bd064f7063252 Author: Mimi Zohar Date: Tue Nov 23 17:50:32 2010 -0500 tpm: add module_put wrapper For readability, define a tpm_chip_put() wrapper to call module_put(). Replace existing module_put() calls with the wrapper. (Change based on trusted/encrypted patchset review by David Howells.) Signed-off-by: Mimi Zohar Signed-off-by: David Safford Acked-by: David Howells Acked-by: Serge E. Hallyn Signed-off-by: James Morris commit dc88e46029486ed475c71fe1bb696d39511ac8fe Author: Mimi Zohar Date: Tue Nov 23 17:50:31 2010 -0500 lib: hex2bin converts ascii hexadecimal string to binary Similar to the kgdb_hex2mem() code, hex2bin converts a string to binary using the hex_to_bin() library call. Changelog: - Replace parameter names with src/dst (based on David Howell's comment) - Add 'const' where needed (based on David Howell's comment) - Replace int with size_t (based on David Howell's comment) Signed-off-by: Mimi Zohar Acked-by: Serge E. Hallyn Acked-by: David Howells Signed-off-by: James Morris commit ce6ada35bdf710d16582cc4869c26722547e6f11 Author: Serge E. Hallyn Date: Thu Nov 25 17:11:32 2010 +0000 security: Define CAP_SYSLOG Privileged syslog operations currently require CAP_SYS_ADMIN. Split this off into a new CAP_SYSLOG privilege which we can sanely take away from a container through the capability bounding set. With this patch, an lxc container can be prevented from messing with the host's syslog (i.e. dmesg -c). Changelog: mar 12 2010: add selinux capability2:cap_syslog perm Changelog: nov 22 2010: . port to new kernel . add a WARN_ONCE if userspace isn't using CAP_SYSLOG Signed-off-by: Serge Hallyn Acked-by: Andrew G. Morgan Acked-By: Kees Cook Cc: James Morris Cc: Michael Kerrisk Cc: Stephen Smalley Cc: "Christopher J. PeBenito" Cc: Eric Paris Signed-off-by: James Morris commit 1d6d75684d869406e5bb2ac5d3ed9454f52d0cab Merge: 074e61e 0f639a3 Author: James Morris Date: Mon Nov 29 08:27:07 2010 +1100 Merge branch 'master' into next commit c661c4a2b0d64c33afc9018a406162b1f8ac5617 Author: Breno Leitao Date: Thu Nov 25 07:53:55 2010 +0000 cxgb3: Removing unused return variable Currently the ret variable is not used for anything other than receive the value of the t3_adapter_error(), which will always be 0, because the reset parameter is 0. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit 82a39eb6b3829a02e235656feddb4542517fcabc Author: Jozsef Kadlecsik Date: Thu Nov 25 03:15:07 2010 +0000 ipv6: Prepare the tree for un-inlined jhash. jhash is widely used in the kernel and because the functions are inlined, the cost in size is significant. Also, the new jhash functions are slightly larger than the previous ones so better un-inline. As a preparation step, the calls to the internal macros are replaced with the plain jhash function calls. Signed-off-by: Jozsef Kadlecsik Signed-off-by: David S. Miller commit aa285b1740f5b13e5a2606a927f3129954583d78 Author: Timo Teräs Date: Tue Nov 23 04:03:45 2010 +0000 xfrm: fix gre key endianess fl->fl_gre_key is network byte order contrary to fl->fl_icmp_*. Make xfrm_flowi_{s|d}port return network byte order values for gre key too. Signed-off-by: Timo Teräs Signed-off-by: David S. Miller commit 6a632625c7da7594d059b88dae0e9c591af147ba Author: Jonas Bonn Date: Thu Nov 25 02:30:32 2010 +0000 ethoc: remove division from loops Calculating the BD entry using a modulus operation isn't optimal, especially inside the loop. This patch removes the modulus operations in favour of: i) simply checking for wrapping in the case of cur_rx ii) forcing num_tx to be a power of two and using it to mask out the entry from cur_tx The also prevents possible issues related overflow of the cur_rx and cur_tx counters. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 4f64bcb2fc093a3a9d7d41220004491ce88e4dd3 Author: Jonas Bonn Date: Thu Nov 25 02:30:31 2010 +0000 ethoc: fix function return type update_ethoc_tx_stats doesn't need to return anything so make its return type void in order to avoid an unnecessary cast when the function is called. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 8dac428ae9ae54d8e8540ac157d92925dd7ebed8 Author: Jonas Bonn Date: Thu Nov 25 02:30:30 2010 +0000 ethoc: rework mdio read/write MDIO read and write were checking whether a timeout had expired to determine whether to recheck the result of the MDIO operation. Under heavy CPU usage, however, it was possible for the timeout to expire before the routine got around to be able to check a second time even, thus erroneousy returning an -EBUSY. This patch changes the the MDIO IO routines to try up to five times to complete the operation before giving up, thus lessening the dependency on CPU load. This resolves a problem whereby a ping flood would keep the CPU so busy that the above problem would manifest itself; the MDIO command to check link status would fail and the interface would erroneously be shut down. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit fa98eb0e867c6c16e239545d4deb7ad8f40631b3 Author: Jonas Bonn Date: Thu Nov 25 02:30:29 2010 +0000 ethoc: rework interrupt handling The old interrupt handling was incorrect in that it did not account for the fact that the interrupt source bits get set irregardless of whether or not their corresponding mask is set. This patch fixes that by masking off the source bits for masked interrupts. Furthermore, the handling of transmission events is moved to the NAPI polling handler alongside the reception handler, thus preventing a whole bunch of interrupts during heavy traffic. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 20f70ddd6558a39a89dba4af675686c5a8dbd7b3 Author: Jonas Bonn Date: Thu Nov 25 02:30:28 2010 +0000 ethoc: Double check pending RX packet An interrupt may occur between checking bd.stat and clearing the interrupt source register which would result in the packet going totally unnoticed as the interrupt will be missed. Double check bd.stat after clearing the interrupt source register to guard against such an occurrence. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 7438a5455734d109fdf18d97147dc57a6dbe5a44 Author: Adam Edvardsson Date: Thu Nov 25 02:30:27 2010 +0000 ethoc: enable interrupts after napi_complete Occasionally, it seems that some race is causing the interrupts to not be reenabled otherwise with the end result that networking just stops working. Enabling interrupts after calling napi_complete is more in line with what other drivers do. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit eac0d3ff5a92de410964fdf0d072314821ca39fc Author: Jonas Bonn Date: Thu Nov 25 02:30:26 2010 +0000 ethoc: remove unused spinlock Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit e0f4258be2515afce8ef1e6fb22312525c281798 Author: Jonas Bonn Date: Thu Nov 25 02:30:25 2010 +0000 ethoc: Add device tree configuration This patch adds the ability to describe ethernet devices via a flattened device tree. As device tree remains an optional feature, these bits all need to be guarded by CONFIG_OF ifdefs. MAC address is settable via the device tree parameter "local-mac-address"; however, the selection of the phy id is limited to probing, for now. Signed-off-by: Jonas Bonn Signed-off-by: David S. Miller commit 85beb5869a4f6abb52a7cf8e01de6fa57e9ee47d Author: Steven Rostedt Date: Wed Nov 24 16:23:34 2010 -0500 tracing/slab: Move kmalloc tracepoint out of inline code The tracepoint for kmalloc is in the slab inlined code which causes every instance of kmalloc to have the tracepoint. This patch moves the tracepoint out of the inline code to the slab C file, which removes a large number of inlined trace points. objdump -dr vmlinux.slab| grep 'jmpq.* Signed-off-by: Pekka Enberg commit 3f0a069a1d5c0ccace735e3a62c1bcef53e4c354 Author: andrew hendry Date: Thu Nov 25 02:18:45 2010 +0000 X25 remove bkl in call user data length ioctl Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 74a7e440807d34e586e9feb8e14851b5c80fbfe5 Author: andrew hendry Date: Thu Nov 25 02:18:43 2010 +0000 X25 remove bkl from causediag ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5b7958dfa5db758e36e92e1790075b470b4947f8 Author: andrew hendry Date: Thu Nov 25 02:18:40 2010 +0000 X25 remove bkl from calluserdata ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit f90de660678cf553f63c387945830a2e4d26dd3e Author: andrew hendry Date: Thu Nov 25 02:18:35 2010 +0000 X25 remove bkl in facility ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5595a1a5997953dbd8c5df7c2f7d4b3a2eb2be4b Author: andrew hendry Date: Thu Nov 25 02:18:15 2010 +0000 X25 remove bkl in subscription ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 5892b9e9ebdde50fbd524570d61ceb74f8be33f3 Author: Vladislav Zolotarov Date: Sun Nov 28 00:23:35 2010 +0000 bnx2x: Use helpers instead of direct access to the shinfo(skb) fields Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 9ab4650f718a0e1cb8792bab4ef97efca4ac75c2 Author: Dinh Nguyen Date: Mon Nov 15 11:30:01 2010 -0600 ARM: imx: Get the silicon version from the IIM module Instead of reading the silicon version from ROM, we should read the SREV register from the IIM. Freescale has dropped all support for MX51 REV1.0, only MX51 REV 2.0 and 3.0 are valid. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit be7ff1afec25f2700ca85e3956a2cb3a7b74acd5 Author: Michael Chan Date: Wed Nov 24 13:48:55 2010 +0000 bnx2: Remove config access to non-standard registers In KVM passthrough mode, the driver may not have config access to non-standard registers. The BNX2_PCICFG_MISC_CONFIG config register access to setup mailbox swapping can be done using MMIO. Update version to 2.0.20. Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit a5dac108d57072eec4d6745f32c162524509f2cb Author: Eddie Wai Date: Wed Nov 24 13:48:54 2010 +0000 bnx2: Fix reset bug on 5709 The 5709 chip requires the BNX2_MISC_NEW_CORE_CTL_DMA_ENABLE bit to be cleared and polling for pending DMAs to complete before chip reset. Without this step, we've seen NMIs during repeated resets of the chip. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan Signed-off-by: David S. Miller commit 19eb5cc559f716dc98ce03a5bad6030fdc71e897 Author: John Fastabend Date: Wed Nov 24 13:14:50 2010 +0000 8021q: vlan device is lockless do not transfer real_num_{tx|rx}_queues Now that the vlan device is lockless and single queue do not transfer the real num queues. This is causing a BUG_ON to occur. kernel BUG at net/8021q/vlan.c:345! Call Trace: [] ? fib_rules_event+0x28/0x1b0 [] notifier_call_chain+0x55/0x80 [] raw_notifier_call_chain+0x16/0x20 [] call_netdevice_notifiers+0x37/0x70 [] netdev_features_change+0x16/0x20 [] ixgbe_fcoe_enable+0xae/0x100 [ixgbe] [] vlan_dev_fcoe_enable+0x2a/0x30 [8021q] [] fcoe_create+0x163/0x630 [fcoe] [] ? mmap_region+0x255/0x5a0 [] param_attr_store+0x50/0x80 [] module_attr_store+0x26/0x30 [] sysfs_write_file+0xf2/0x180 [] vfs_write+0xc8/0x190 [] sys_write+0x51/0x90 [] system_call_fastpath+0x16/0x1b Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 5a0d2268d259886f0c87131639d19eb4a67b4532 Author: Eric Dumazet Date: Tue Nov 23 10:42:02 2010 +0000 net: add netif_tx_queue_frozen_or_stopped When testing struct netdev_queue state against FROZEN bit, we also test XOFF bit. We can test both bits at once and save some cycles. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit d3c15cab213becc49a6f2ad7f48a59513a5f17dd Author: Shan Wei Date: Wed Nov 24 21:47:56 2010 +0000 ipv6: kill two unused macro definition 1. IPV6_TLV_TEL_DST_SIZE This has not been using for several years since created. 2. RT6_INFO_LEN commit 33120b30 kill all RT6_INFO_LEN's references, but only this definition remained. commit 33120b30cc3b8665204d4fcde7288638b0dd04d5 Author: Alexey Dobriyan Date: Tue Nov 6 05:27:11 2007 -0800 [IPV6]: Convert /proc/net/ipv6_route to seq_file interface Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit a40c9f88b5e3da500ddab9440e5ddac170c12281 Author: Uwe Kleine-König Date: Tue Nov 23 22:57:47 2010 +0000 net: add some KERN_CONT markers to continuation lines Cc: netdev@vger.kernel.org Signed-off-by: Uwe Kleine-König Signed-off-by: David S. Miller commit 5a6f95e653adf52ee1ff09cd5e66c2640c65ff66 Author: Rajesh Borundia Date: Tue Nov 23 03:08:27 2010 +0000 netxen: avoid using reset_devices as it may become obsolete In kdump environment do not depend on reset_devices parameter to reset the device as the parameter may become obsolete. Instead use an adapter specific mechanism to determine if the device needs a reset. Driver maintains a count of number of pci functions probed and decrements the count when remove handler of that pci function is called. If the first probe, probe of function 0, detects the count as non zero then reset the device. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b0044bcfa95ddf2e317863fb29121c284b6725ca Author: Rajesh Borundia Date: Tue Nov 23 01:25:21 2010 +0000 qlcnic: avoid using reset_devices as it may become obsolete. In kdump environment do not depend upon reset_devices parameter to reset the pci function as this parameter may become obsolete. Instead use an adapter specific mechanism to determine if the pci function needs to be reset. Per function refcount is maintained in driver, which is set in probe and reset in remove handler of adapter. If the probe detects the count as non zero then reset the function. Signed-off-by: Rajesh Borundia Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 5584b8078a60e34ec7d37c9b67a0f3d389a1a2f6 Author: Shan Wei Date: Mon Nov 22 23:00:42 2010 +0000 sctp: kill unused macro definition These macros have been existed for several years since v2.6.12-rc2. But they never be used. So remove them now. Signed-off-by: Shan Wei Signed-off-by: David S. Miller commit 7d2cb39c332146b0906651a8567f8b81af4b1584 Author: Chris Wilson Date: Sat Nov 27 17:38:29 2010 +0000 drm/i915: Release fenced GTT mapping on suspend ... so that upon first use after resume we will reacquire the fence reg. Reported-by: Keith Packard Signed-off-by: Chris Wilson commit 3619df035ec9280314fae44032a6167f16ec38d2 Merge: 602606a de18a29 Author: Chris Wilson Date: Sun Nov 28 15:37:17 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c commit ce06b9d6d33fd2ed799b6e825d68fe95077da354 Author: Dmitry Torokhov Date: Sun Nov 28 16:37:14 2010 +0100 HID: hid-core - rename hid_blacklist to hid_have_special_driver To avoid confusion with hid_blacklist describing various quirks in usbhid code, let's rename this one. Signed-off-by: Dmitry Torokhov Signed-off-by: Jiri Kosina commit 602606a472963a67b234e6b5c99293de4aa9d06b Author: Chris Wilson Date: Sun Nov 28 15:31:02 2010 +0000 drm/i915/execbuffer: On error, starting unwinding from the previous object As the error occurred on the current object, it means that its state was not changed and so it should be excluded from the unwind. Reported-by: Daniel Vetter Signed-off-by: Chris Wilson commit c762be637503b833012457087133c1292fd6056d Author: Herbert Xu Date: Sun Nov 28 16:28:01 2010 +0800 crypto: algif_skcipher - Pass on error from af_alg_make_sg The error returned from af_alg_make_sg is currently lost and we always pass on -EINVAL. This patch pases on the underlying error. Signed-off-by: Herbert Xu commit cf7afbfeb8ceb0187348d0a1a0db61305e25f05f Author: Thomas Graf Date: Mon Nov 22 01:31:54 2010 +0000 rtnl: make link af-specific updates atomic As David pointed out correctly, updates to af-specific attributes are currently not atomic. If multiple changes are requested and one of them fails, previous updates may have been applied already leaving the link behind in a undefined state. This patch splits the function parse_link_af() into two functions validate_link_af() and set_link_at(). validate_link_af() is placed to validate_linkmsg() check for errors as early as possible before any changes to the link have been made. set_link_af() is called to commit the changes later. This method is not fail proof, while it is currently sufficient to make set_link_af() inerrable and thus 100% atomic, the validation function method will not be able to detect all error scenarios in the future, there will likely always be errors depending on states which are f.e. not protected by rtnl_mutex and thus may change between validation and setting. Also, instead of silently ignoring unknown address families and config blocks for address families which did not register a set function the errors EAFNOSUPPORT respectively EOPNOSUPPORT are returned to avoid comitting 4 out of 5 update requests without notifying the user. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit 89bf67f1f080c947c92f8773482d9e57767ca292 Author: Eric Dumazet Date: Mon Nov 22 00:15:06 2010 +0000 drivers/net: use vzalloc() Use vzalloc() and vzalloc_node() in net drivers Signed-off-by: Eric Dumazet Acked-by: Jon Mason Signed-off-by: David S. Miller commit fe6d2a38b2076cba515dc95b5dc1589a7ab51c17 Author: Sathya Perla Date: Sun Nov 21 23:25:50 2010 +0000 be2net: adding support for Lancer family of CNAs Key changes are: - EQ ids are not assigned consecutively in Lancer. So, fix mapping of MSIx vector to EQ-id. - BAR mapping and some req locations different for Lancer. - TCP,UDP,IP checksum fields must be compulsorily set in TX wrb for TSO in Lancer. - CEV_IST reg not present in Lancer; so, peek into event queue to check for new entries - cq_create and mcc_create cmd interface is different for Lancer; handle accordingly Signed-off-by: Padmanabh Ratnakar Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit f30195c50245d8ace628e1978b1daa8df86e7224 Merge: d07335e d4d7762 Author: Jens Axboe Date: Sat Nov 27 19:49:18 2010 +0100 Merge branch 'cleanup-bd_claim' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into for-2.6.38/core commit 39fb51a123c125e36e9bcb67686b3e2945784250 Author: Mark Brown Date: Fri Nov 26 17:23:43 2010 +0000 ASoC: Implement runtime PM for WM8994/58 This allows us to communicate our power management state back to the parent device, allowing it to do a full power down when the device is idle. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 2e19b0c8c21cb06eb5b902588c30ae0529ce8ec3 Author: Mark Brown Date: Fri Nov 26 17:23:42 2010 +0000 ASoC: Enable rbtree compression for WM8994/58 register cache The WM8994 and WM8958 register map is relatively sparse so benefits from compression. The rbtree compression gives better results than LZO for both memory and CPU consumption on a map as sparse as this. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ca9aef50727dec76ab12513ba833a1cf5e9d7e83 Author: Mark Brown Date: Fri Nov 26 17:23:41 2010 +0000 ASoC: Convert WM8994 to use soc-cache.c cache functions In the process we convert the driver to read registers one at a time when initialising the cache. This has the effect of working around limitations in the sizes of I2C transactions which can be done by some CPUs. Due to the sparseness of the register map the overhead from this should be minimual unless I2C transactions are very expensive to start. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 821edd2fb5b289b84d715fb744106019fa2e1920 Author: Mark Brown Date: Fri Nov 26 15:21:09 2010 +0000 ASoC: Add WM8958 microphone detection support The WM8958 contains an advanced accessory detection feature which allows detection of up to seven different impedence levels on the microphone bias output, including detection of video outputs. Since some of the more involved accessory interfaces may involve noticable interactions with external components a simple detection scheme is provided by default with the option to provide custom handling of accessory detect. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit d6addcc9d88aeac4a0cc63a06d36baef04f5dc3b Author: Mark Brown Date: Fri Nov 26 15:21:08 2010 +0000 ASoC: Add WM8958 Multi-band compressor support The WM8958 features a multi-band compressor which can be enabled on any of the AIF inputs. The MBC allows different gains to be applied to differnt audio bands, providing an improvement in perceived loudness of the signal by avoiding overdriving the output transducers. This patch enables support for the MBC. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit c4431df050ff124cae7716e301cead1e8f33c575 Author: Mark Brown Date: Fri Nov 26 15:21:07 2010 +0000 ASoC: Implement support for enhanced AIF3 on WM8958 Additional audio routing options are available on the WM8958 audio interface 3. Add support for these. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3a42315740fa80bb4579eb25fedec9d09ff154e7 Author: Mark Brown Date: Fri Nov 26 15:21:06 2010 +0000 ASoC: Initial WM8958 audio configuration The WM8958 is a WM8994 derivative. This patch merely ensures that some revision specific configuration for WM8994 is not enabled on WM8994, additional patches will add support for the new features introduced on the WM8958. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 11cef5f07ba0e925af432fc3229fb87585ccccf0 Author: Mark Brown Date: Fri Nov 26 17:23:44 2010 +0000 ASoC: Use DC servo startup mode when not doing DCS correction Devices which do not have a DCS correction applied can use the explicit DC servo startup mode for optimal startup performance. This most immediately affects the WM8958. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 887c883eea9867535059f3c8414c8cfc952ccff1 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:29 2010 +0200 crypto: omap-sham - zero-copy scatterlist handling If scatterlist have more than one entry, current driver uses aligned buffer to copy data to to accelerator to tackle possible issues with DMA and SHA buffer alignment. This commit adds more intelligence to verify SG alignment and possibility to use DMA directly on the data without using copy buffer. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit a55b290b0e41e02d1969589c5d77d966ac2b7ec8 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:28 2010 +0200 crypto: omap-sham - FLAGS_FIRST is redundant and removed bufcnt is 0 if it was no update requests before, which is exact meaning of FLAGS_FIRST. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 3c8d758ab528317ecd6d91f8651170ffd2331899 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:27 2010 +0200 crypto: omap-sham - hash-in-progress is stored in hw format Hash-in-progress is now stored in hw format. Only on final call, hash is converted to correct format. Speedup copy procedure and will allow to use OMAP burst mode. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 798eed5d9204b01862985ba0643ce5cf84114072 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:26 2010 +0200 crypto: omap-sham - crypto_ahash_final() now not need to be called. According to the Herbert Xu, client may not always call crypto_ahash_final(). In the case of error in hash calculation resources will be automatically cleaned up. But if no hash calculation error happens and client will not call crypto_ahash_final() at all, then internal buffer will not be freed, and clocks will not be disabled. This patch provides support for atomic crypto_ahash_update() call. Clocks are now enabled and disabled per update request. Data buffer is now allocated as a part of request context. Client is obligated to free it with crypto_free_ahash(). Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit a5d87237bb15eed8449e5a30c0bbe626e0e7f43d Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:25 2010 +0200 crypto: omap-sham - removed redundunt locking Locking for queuing and dequeuing is combined. test_and_set_bit() is also replaced with checking under dd->lock. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 3e133c8bf6a6723377d94bc97aa52596e49a4090 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:24 2010 +0200 crypto: omap-sham - error handling improved Introduces DMA error handling. DMA error is returned as a result code of the hash request. Clients needs to handle error codes and may repeat hash calculation attempt. Also in the case of DMA error, SHAM module is set to be re-initialized again. It significantly improves stability against possible HW failures. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit c8eb54041acc4dedeaf0d9da34b91b8658386751 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:23 2010 +0200 crypto: omap-sham - DMA initialization fixes for off mode DMA parameters for constant data were initialized during driver probe(). It seems that those settings sometimes are lost when devices goes to off mode. This patch makes DMA initialization just before use. It solves off mode problems. Fixes: NB#202786 - Aegis & SHA1 block off mode changes Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 0c3cf4cc9abd854dcc6488719348a75b8f328c54 Author: Dmitry Kasatkin Date: Fri Nov 19 16:04:22 2010 +0200 crypto: omap-sham - uses digest buffer in request context Currently driver storred digest results in req->results provided by the client. But some clients do not set it until final() call. It leads to crash. Changed to use internal buffer to store temporary digest results. Signed-off-by: Dmitry Kasatkin Signed-off-by: Herbert Xu commit 0d258efb6a58fe047197c3b9cff8746bb176d58a Author: Mathias Krause Date: Sat Nov 27 16:34:46 2010 +0800 crypto: aesni-intel - Ported implementation to x86-32 The AES-NI instructions are also available in legacy mode so the 32-bit architecture may profit from those, too. To illustrate the performance gain here's a short summary of a dm-crypt speed test on a Core i7 M620 running at 2.67GHz comparing both assembler implementations: x86: i568 aes-ni delta ECB, 256 bit: 93.8 MB/s 123.3 MB/s +31.4% CBC, 256 bit: 84.8 MB/s 262.3 MB/s +209.3% LRW, 256 bit: 108.6 MB/s 222.1 MB/s +104.5% XTS, 256 bit: 105.0 MB/s 205.5 MB/s +95.7% Additionally, due to some minor optimizations, the 64-bit version also got a minor performance gain as seen below: x86-64: old impl. new impl. delta ECB, 256 bit: 121.1 MB/s 123.0 MB/s +1.5% CBC, 256 bit: 285.3 MB/s 290.8 MB/s +1.9% LRW, 256 bit: 263.7 MB/s 265.3 MB/s +0.6% XTS, 256 bit: 251.1 MB/s 255.3 MB/s +1.7% Signed-off-by: Mathias Krause Reviewed-by: Huang Ying Signed-off-by: Herbert Xu commit 21ea28abcf825729f9698afd7357dfbf7040d4f8 Author: Tracey Dent Date: Sat Nov 27 16:32:57 2010 +0800 crypto: Makefile clean up Changed Makefile to use -y instead of -objs. Signed-off-by: Tracey Dent Signed-off-by: Herbert Xu commit c8484594aeafe889269bd01232049b184140de3f Author: Joe Perches Date: Sat Nov 27 16:30:39 2010 +0800 crypto: Use vzalloc Signed-off-by: Joe Perches Signed-off-by: Herbert Xu commit 068ffaa8bfb67c2ddb3ecaf38cc90f94a1a92fe3 Author: Arnaldo Carvalho de Melo Date: Sat Nov 27 02:41:01 2010 -0200 perf tools: Fix lost and unknown events handling Fix it by explaining what can be happening and giving the number of processed and lost events. Also holler if unknown events were found, that can be due to processing a perf.data file collected using a newer tool where newer events got added on reporting using an older perf tool, that or a bug, so ask for a report to be made. Works on both --tui and --stdio. Suggested-by: Thomas Gleixner Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Stephane Eranian Cc: Thomas Gleixner LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 008f29d3865828bb27e35d6d3fa889d0853b469f Author: Shawn Bohrer Date: Sun Nov 21 10:09:39 2010 -0600 perf trace: Handle DT_UNKNOWN on filesystems that don't support d_type Some filesystems like xfs and reiserfs will return DT_UNKNOWN for the d_type. Handle this case by calling stat() to determine the type. Cc: Andreas Schwab Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290355779-3276-1-git-send-email-sbohrer@rgmadvisors.com> Signed-off-by: Shawn Bohrer Signed-off-by: Arnaldo Carvalho de Melo commit 9d1faba5fe410558099f13cfada2eab03186769d Author: Ian Munsie Date: Thu Nov 25 15:12:53 2010 +1100 perf symbols: Correct final kernel map guesses If a 32bit userspace perf is running on a 64bit kernel, the end of the final map in the kernel would incorrectly be set to 2^32-1 rather than 2^64-1. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <1290658375-10342-1-git-send-email-imunsie@au1.ibm.com> Signed-off-by: Ian Munsie Signed-off-by: Arnaldo Carvalho de Melo commit 37982ba0a0630066a6a0844a66aedaf91c66db84 Author: Arnaldo Carvalho de Melo Date: Fri Nov 26 18:31:54 2010 -0200 perf events: Default to using event__process_lost Tool developers have to fill in a 'perf_event_ops' method table to specify how to handle each event, so far the ones that were not explicitely especified would get a stub that would just discard the event. Change that so that tool developers can get the lost event details and the total number of such events at the end of 'perf report -D' output. Suggested-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian CC: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit baa2f6cedbfae962f04281a31f08ec29667d31a0 Author: Arnaldo Carvalho de Melo Date: Fri Nov 26 19:39:15 2010 -0200 perf record: Add option to disable collecting build-ids Collecting build-ids for long running sessions may take a long time because it needs to traverse the whole just collected perf.data stream of events, marking the DSOs that had hits and then looking for the .note.gnu.build-id ELF section. For things like the 'trace' tool that records and right away consumes the data on systems where its unlikely that the DSOs being monitored will change while 'trace' runs, it is desirable to remove build id collection, so add a -B/--no-buildid option to perf record to allow such use case. Longer term we'll avoid all this if we, at DSO load time, in the kernel, take advantage of this slow code path to collect the build-id and stash it somewhere, so that we can insert it in the PERF_RECORD_MMAP event. Reported-by: Thomas Gleixner Cc: Frederic Weisbecker Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit f6e3354d02aa1f30672e3671098c12cb49c7da25 Author: Russell King Date: Tue Nov 16 00:22:09 2010 +0000 ARM: pgtable: introduce pteval_t to represent a pte value This makes everywhere dealing with pte values use the same type. Signed-off-by: Russell King commit 97092e0c56830457af0639f6bd904537a150ea4a Author: Russell King Date: Tue Nov 16 00:16:01 2010 +0000 ARM: pgtable: use phys_addr_t for physical addresses Ensure that physical addresses are typed as phys_addr_t Signed-off-by: Russell King commit 6e4beb5e682953212da48ebb9e5c90408b8d38ae Author: Russell King Date: Sun Nov 21 23:48:55 2010 +0000 ARM: pgtable: use pXd_none_or_clear_bad() in pgd_free() Remove knowledge of the 2-level wrapping in pgd_free(), and use the pXd_none_or_clear_bad() macros when checking the entries. Signed-off-by: Russell King commit b0d03745b18c39b8e86e70f7778f2093d2cd4ed7 Author: Russell King Date: Sun Nov 21 11:00:56 2010 +0000 ARM: pgtable: get rid of get_pgd_slow()/free_pgd_slow() These old names are just aliases for pgd_alloc/pgd_free. Just use the new names. Signed-off-by: Russell King commit 69529c0eb76469168f1dd5851f363dbab17ce8fd Author: Russell King Date: Tue Nov 16 00:19:55 2010 +0000 ARM: pgtable: directly pass pgd/pmd/pte to their error functions Rather than passing the pte value to __pte_error, pass the raw pte_t cookie instead. Do the same for pmd and pgd functions. Signed-off-by: Russell King commit b510b049b549500816280f7ceaa087cfefdec581 Author: Russell King Date: Fri Nov 26 20:35:25 2010 +0000 ARM: pgtable: group pte functions together Signed-off-by: Russell King commit 4eec4b1396ac6a6a602b4521d40e9cf596ab776d Author: Russell King Date: Fri Nov 26 20:12:12 2010 +0000 ARM: pgtable: group pgd functions and data together Signed-off-by: Russell King commit cf36797f35676dafae9d44484391ac7f56b2485a Author: Mac Lin Date: Tue Nov 23 00:32:44 2010 +0800 ARM: cns3xxx: Add architecture definition for EHCI/OHCI controller This patch add plateform_device for EHCI and OHCI controller on CNS3XXX. Power reference count (usb_pwr_ref) is used to control enabling and disabling the single clock control for both EHCI and OHCI controller. It also removes EHCI/OHCI unused virtual address definitions. Signed-off-by: Mac Lin Signed-off-by: Anton Vorontsov commit 38e64ba0f13918d11e50bbd5bb775781ccd6439d Author: Mac Lin Date: Tue Nov 23 00:32:43 2010 +0800 ARM: cns3xxx: Add new and export the old power management functions This patch adds cns3xxx_pwr_clk_dis, and exports these power management functions that may be used by many other device drivers on CNS3XXX. Signed-off-by: Mac Lin Signed-off-by: Anton Vorontsov commit df8f4d2f3ef9ca2154f7bd531492a83c4ab4558a Author: Anton Vorontsov Date: Fri Nov 26 20:48:35 2010 +0300 ARM: cns3xxx: Make cns3xxx_pwr_soft_rst_force() to actually reset blocks commit 6eb5d146d4535 ("ARM: cns3xxx: Use IO memory accessors everywhere") breaks cns3xxx_pwr_soft_rst_force() function, so that it doesn't write cleared bit into the register. This patch fixes the issue by adding the necessary __raw_writel(). Signed-off-by: Anton Vorontsov commit eb9b2b69d3bdfe9cd98cd9b2c5715346a0f0140d Author: Russell King Date: Fri Nov 26 17:39:28 2010 +0000 ARM: pgtable: move pgprot functions to one place Rather than scattering them throughout the file, group them together. Signed-off-by: Russell King commit 4b666729010cbf315c9099b956b193df8edc6753 Author: Mark Brown Date: Wed Sep 1 10:47:16 2010 +0100 gpiolib: Add WM8958 support to the WM8994 driver Several of the GPIOs on the WM8994 are fixed function on the WM8958 so error out if the user tries to request them with gpiolib. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 559e0df6b3ffbc218a11bb9dada5320a217cb7a6 Author: Mark Brown Date: Tue Aug 31 19:25:12 2010 +0100 mfd: Add initial WM8958 support The WM8958 is a derivative of the WM8994 which is register compatible with the addition of some extra features, mostly in the CODEC side. The major change visible at the MFD level is that rather than a single DBVDD supply we now have three separate DBVDDs so we must request and enable a different set of supplies. Signed-off-by: Mark Brown Acked-by: Samuel Ortiz Acked-by: Liam Girdwood commit ccf1fa403e44c4107ef4d73f73cafe81b5148d40 Author: Mark Brown Date: Fri Nov 26 11:50:03 2010 +0000 ASoC: Remove redundant hw_write initialisation in WM8737 Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 73d8c34f3d78ccf90a431c221df10377affce650 Author: Alan Stern Date: Mon Nov 15 16:03:04 2010 -0500 SCSI: improve two error messages This trivial patch (as1338) makes two uninformative error messages in scsi_sysfs_add_sdev() more explicit. Signed-off-by: Alan Stern Signed-off-by: Jiri Kosina commit af86da5318136eb49c0453c2e2be3280ee5d18d9 Author: Cyrill Gorcunov Date: Fri Nov 26 14:32:09 2010 +0300 perf, x86: P4 PMU - describe config format Add description of .config in a sake of RAW events. At least this should bring some light to those who will be reading this code. Signed-off-by: Cyrill Gorcunov Reviewed-by: Stephane Eranian Cc: Lin Ming Signed-off-by: Ingo Molnar commit 004417a6d468e24399e383645c068b498eed84ad Author: Peter Zijlstra Date: Thu Nov 25 18:38:29 2010 +0100 perf, arch: Cleanup perf-pmu init vs lockup-detector The perf hardware pmu got initialized at various points in the boot, some before early_initcall() some after (notably arch_initcall). The problem is that the NMI lockup detector is ran from early_initcall() and expects the hardware pmu to be present. Sanitize this by moving all architecture hardware pmu implementations to initialize at early_initcall() and move the lockup detector to an explicit initcall right after that. Cc: paulus Cc: davem Cc: Michael Cree Cc: Deng-Cheng Zhu Acked-by: Paul Mundt Acked-by: Will Deacon Signed-off-by: Peter Zijlstra LKML-Reference: <1290707759.2145.119.camel@laptop> Signed-off-by: Ingo Molnar commit 5ef428c4b5950dddce7311e84321abb3aff7ebb0 Author: Andi Kleen Date: Thu Nov 18 11:47:31 2010 +0100 x86: Set cpu masks before calling CPU_STARTING notifiers When booting up a CPU set the various topology masks before calling the CPU_STARTING notifier. This way the notifier can actually use the masks. This is needed for a perf change. Signed-off-by: Andi Kleen Signed-off-by: Peter Zijlstra LKML-Reference: <1290077254-12165-2-git-send-email-andi@firstfloor.org> Signed-off-by: Ingo Molnar commit 963988262c3c8f4234f64a0dde59446a295e07bb Author: Peter Zijlstra Date: Wed Nov 24 18:55:29 2010 +0100 perf: Ignore non-sampling overflows Some arch implementations call perf_event_overflow() by 'accident', ignore this. Reported-by: Francis Moreau Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 5d508e820a23d9b6e8a149dfaa8ba5cbedf3d95c Author: Franck Bui-Huu Date: Tue Nov 23 16:21:45 2010 +0100 perf: Don't bother to init the hrtimer for no SW sampling counters Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-3-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 2e939d1da9b5628642314c1e68b4319e61263c94 Author: Franck Bui-Huu Date: Tue Nov 23 16:21:44 2010 +0100 perf: Limit event refresh to sampling event Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-2-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 6c7e550f13f8ad82efb6a5653ae628c2543c1768 Author: Franck Bui-Huu Date: Tue Nov 23 16:21:43 2010 +0100 perf: Introduce is_sampling_event() and use it when appropriate. Signed-off-by: Franck Bui-Huu Signed-off-by: Peter Zijlstra LKML-Reference: <1290525705-6265-1-git-send-email-fbuihuu@gmail.com> Signed-off-by: Ingo Molnar commit 35d3778a8fe3c8b4a7513565e34d3bde00ce43ec Author: Peter Zijlstra Date: Wed Nov 24 10:43:55 2010 +0100 scripts/tags.sh: Add magic for trace-events Make tags find the trace-event definitions Signed-off-by: Peter Zijlstra Acked-by: WANG Cong LKML-Reference: <1290591835.2072.438.camel@laptop> Signed-off-by: Ingo Molnar commit 6c869e772c72d509d0db243a56c205ef48a29baf Merge: e4e91ac ee6dcfa Author: Ingo Molnar Date: Fri Nov 26 15:07:02 2010 +0100 Merge branch 'perf/urgent' into perf/core Conflicts: arch/x86/kernel/apic/hw_nmi.c Merge reason: Resolve conflict, queue up dependent patch. Signed-off-by: Ingo Molnar commit b7a2b39d9b7703ccf068f549c8dc3465fc41d015 Author: Nikanth Karthikesan Date: Fri Nov 26 12:37:09 2010 +0530 sched: Remove unused argument dest_cpu to migrate_task() Remove unused argument, 'dest_cpu' of migrate_task(), and pass runqueue, as it is always known at the call site. Signed-off-by: Nikanth Karthikesan Signed-off-by: Peter Zijlstra LKML-Reference: <201011261237.09187.knikanth@suse.de> Signed-off-by: Ingo Molnar commit 335d7afbfb71faac833734a94240c1e07cf0ead8 Author: Gerald Schaefer Date: Mon Nov 22 15:47:36 2010 +0100 mutexes, sched: Introduce arch_mutex_cpu_relax() The spinning mutex implementation uses cpu_relax() in busy loops as a compiler barrier. Depending on the architecture, cpu_relax() may do more than needed in this specific mutex spin loops. On System z we also give up the time slice of the virtual cpu in cpu_relax(), which prevents effective spinning on the mutex. This patch replaces cpu_relax() in the spinning mutex code with arch_mutex_cpu_relax(), which can be defined by each architecture that selects HAVE_ARCH_MUTEX_CPU_RELAX. The default is still cpu_relax(), so this patch should not affect other architectures than System z for now. Signed-off-by: Gerald Schaefer Signed-off-by: Peter Zijlstra LKML-Reference: <1290437256.7455.4.camel@thinkpad> Signed-off-by: Ingo Molnar commit 22a867d81707b0a2720bb5f65255265b95d30526 Merge: 5bb6b1e 3561d43 Author: Ingo Molnar Date: Fri Nov 26 15:03:27 2010 +0100 Merge commit 'v2.6.37-rc3' into sched/core Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar commit e4e91ac410356da3a518188f371e9d3b52ee38ee Merge: ea7872b 3561d43 Author: Ingo Molnar Date: Fri Nov 26 15:04:42 2010 +0100 Merge commit 'v2.6.37-rc3' into perf/core Merge reason: Pick up latest fixes. Signed-off-by: Ingo Molnar commit 2f6724b24525fc989c0707974b23d96b36132385 Author: Juuso Oikarinen Date: Wed Nov 24 08:16:57 2010 +0200 wl1271: Fix setting of the hardware connection monitoring probe-req template The probe-request template used in the hardware connection monitoring feature thus far has been an empty one, without the SSID IE and without supported rate IEs. This causes problems with some AP's. Additionally, after connected scans, the template for connection maintenance would remain to be the one last used for scanning - potentially incorrect. Fix these by getting a pre-filled directed probe-request template for the associated-to AP from mac80211. Signed-off-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 573c67cf819d52d2e12adf75a9a8cfbd216190a3 Author: Luciano Coelho Date: Fri Nov 26 13:44:59 2010 +0200 wl12xx: disable 11a channels when regulatory changes if 11a is not supported Instead of simply not scanning for the 11a channels when not supported by the hardware, disable the channels in reg_notify. This centralizes the decision on whether to scan 5GHz channel in one place and allows userspace to know exactly which channels are in use. Based on Juuso Oikarinen's idea. Cc: Juuso Oikarinen Signed-off-by: Luciano Coelho Reviewed-by: Juuso Oikarinen commit 8ff590903d5fc7f5a0a988c38267a3d08e6393a2 Author: Herbert Xu Date: Tue Oct 19 21:31:55 2010 +0800 crypto: algif_skcipher - User-space interface for skcipher operations This patch adds the af_alg plugin for symmetric key ciphers, corresponding to the ablkcipher kernel operation type. Keys can optionally be set through the setsockopt interface. Once a sendmsg call occurs without MSG_MORE no further writes may be made to the socket until all previous data has been read. IVs and and whether encryption/decryption is performed can be set through the setsockopt interface or as a control message to sendmsg. The interface is completely synchronous, all operations are carried out in recvmsg(2) and will complete prior to the system call returning. The splice(2) interface support reading the user-space data directly without copying (except that the Crypto API itself may copy the data if alignment is off). The recvmsg(2) interface supports directly writing to user-space without additional copying, i.e., the kernel crypto interface will receive the user-space address as its output SG list. Thakns to Miloslav Trmac for reviewing this and contributing fixes and improvements. Signed-off-by: Herbert Xu Acked-by: David S. Miller commit 65500fa94aaeb3475e39c0c5180f188014164ca4 Author: Linus Walleij Date: Thu Nov 4 13:06:59 2010 +0100 ARM: 6467/1: amba: optional PrimeCell core voltage switch On some contemporary sub-micron SoCs, peripherals on the chip have power domain switches, i.e. the voltage to the core may be turned off to conserve power. In the Ux500 we have this for out PrimeCell derivates. This patch makes it possible to specify an (optional) regulator to handle the voltage domain switch on AMBA PrimeCells, modeled very similar to how block clocks are handled. Additional amba_vcore_[enable|disable] calls are supplied to make it possible introduce optional powering off of the core voltage. Using this will require code to spool/unspool any core HW state. Cc: Rabin Vincent Cc: Bengt Jonsson Cc: Jonas Aaberg Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 283a1b92e25fe3a62c766a042f96dad2eefa7d17 Author: Russell King Date: Mon Nov 8 10:11:19 2010 +0000 ARM: always build swp_emulate as ARMv7 swp_emulate is only used on ARMv7+, and includes ARMv7+ assembly instructions. Allow the assembler to accept ARMv7 instructions, but leave the compiler's code generation options alone. Signed-off-by: Russell King commit 6d803ba736abb5e122dede70a4720e4843dd6df4 Author: Jean-Christop PLAGNIOL-VILLARD Date: Wed Nov 17 10:04:33 2010 +0100 ARM: 6483/1: arm & sh: factorised duplicated clkdev.c factorise some generic infrastructure to assist looking up struct clks for the ARM & SH architecture. as the code is identical at 99% put the arch specific code for allocation as example in asm/clkdev.h Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Acked-by: Paul Mundt Signed-off-by: Russell King commit fbd29a14af42d374ddce9c16ff5f7805e69c764f Author: Sebastian Andrzej Siewior Date: Fri Nov 19 09:00:11 2010 -0800 spi/pxa2xx: register driver properly use platform_driver_register instead of platform_driver_probe. The latter only checks available devices at the time of calling. So if a device gets inserter at a later point in time then the driver will never play with it. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Dirk Brandewie commit 83cf1eecfe9afee99d6b86f963187acd414c019d Merge: f1690d1 0e341af Author: Russell King Date: Fri Nov 26 10:28:11 2010 +0000 Merge branch 'ftrace' of git://github.com/rabinv/linux-2.6 into devel-stable commit f1690d17d2c7afa2a2079e3c91eb2bca8c1c5ecd Merge: 612275a 43eab87 Author: Russell King Date: Fri Nov 26 10:26:43 2010 +0000 Merge branch 'perf-split' of git://linux-arm.org/linux-2.6-wd into devel-stable commit 612275ad3966dd7ba491d5fe94e894a3861c9062 Merge: 698fd6a2 176bfc4 Author: Russell King Date: Fri Nov 26 10:26:10 2010 +0000 Merge branch 'for-russell' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable commit 6e9d4476063a820764ec063bf683379c38ea1e18 Author: Paul Mundt Date: Fri Nov 26 16:48:31 2010 +0900 usb: ehci-sh: Add missing ehci helpers. The ehci-sh driver was missing tie-ins for endpoint_reset and clear_tt_buffer_complete, add them in. Reported-by: Alan Stern Signed-off-by: Paul Mundt commit c1e0774d74481fdc3082d2096a99a3aa411a71f1 Author: Paul Mundt Date: Fri Nov 26 16:43:38 2010 +0900 usb: ehci-sh: Fix up fault in shutdown path. We can't use the generic usb_hcd_platform_shutdown helper on account of the fact we don't stash the hcd pointer in the driver data, so we provide our own shutdown handler. Signed-off-by: Paul Mundt commit ea7872b9d6a81101f6ba0ec141544a62fea35876 Author: Hitoshi Mitake Date: Thu Nov 25 16:04:53 2010 +0900 perf bench: Add feature that measures the performance of the arch/x86/lib/memcpy_64.S memcpy routines via 'perf bench mem' This patch ports arch/x86/lib/memcpy_64.S to perf bench mem memcpy for benchmarking memcpy() in userland with tricky and dirty way. util/include/asm/cpufeature.h, util/include/asm/dwarf2.h, and util/include/linux/linkage.h are mostly dummy files with small wrappers, so that we are able to include memcpy_64.S unmodified. Signed-off-by: Hitoshi Mitake Cc: h.mitake@gmail.com Cc: Miao Xie Cc: Ma Ling Cc: Zhao Yakui Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Andi Kleen LKML-Reference: <1290668693-27068-2-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit 49ce8fc651794878189fd5f273228832cdfb5be9 Author: Hitoshi Mitake Date: Thu Nov 25 16:04:52 2010 +0900 perf bench: Print both of prefaulted and no prefaulted results by default After applying this patch, perf bench mem memcpy prints both of prefualted and without prefaulted score of memcpy(). New options --no-prefault and --only-prefault are added to print single result, mainly for scripting usage. Usage example: | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 634.969014 MB/Sec | 4.828062 GB/Sec (with prefault) | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --only-prefault | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 4.705192 GB/Sec (with prefault) | mitake@X201i:~/linux/.../tools/perf% ./perf bench mem memcpy -l 500MB --no-prefault | # Running mem/memcpy benchmark... | # Copying 500MB Bytes ... | | 642.725568 MB/Sec Signed-off-by: Hitoshi Mitake Cc: h.mitake@gmail.com Cc: Miao Xie Cc: Ma Ling Cc: Zhao Yakui Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Andi Kleen LKML-Reference: <1290668693-27068-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Ingo Molnar commit cffd9348a3ae87ac98a4b3c03a5359e28ad50b93 Author: Michael Hennerich Date: Wed Nov 24 09:33:59 2010 +0000 fbdev: bfin_adv7393fb: new Blackfin ADV7393 driver Driver for ADV7393 add-on card for multiple Blackfin boards. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit dbcc465a3c8d81da132cc1dd4e5fbf731172477f Author: Michael Hennerich Date: Wed Nov 24 09:33:58 2010 +0000 fbdev: bf537-lq035: new Blackfin Sharp LQ035 framebuffer driver For LCDs hooked up to BF537-STAMP boards. Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Mike Frysinger Signed-off-by: Paul Mundt commit acb325062afc09c196f7d3888b81312e6ebcdc35 Author: Alex Deucher Date: Tue Nov 23 00:41:00 2010 -0500 drm/radeon/kms: improve pflip precision on r1xx-r4xx The update pending bit has a separate enable bit. Cc: Mario Kleiner Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 432e58edc9de1d9c3d6a7b444b3c455b8f209a7d Author: Chris Wilson Date: Thu Nov 25 19:32:06 2010 +0000 drm/i915: Avoid allocation for execbuffer object list Besides the minimal improvement in reducing the execbuffer overhead, the real benefit is clarifying a few routines. Signed-off-by: Chris Wilson commit 54cf91dc4e51fd5070a9a2346377493cc38a1ca9 Author: Chris Wilson Date: Thu Nov 25 18:00:26 2010 +0000 drm/i915: Split i915_gem_execbuffer into its own file. A number of dragons have been seen lurking within the execbuffer code. The first step is then to isolate them from the rest and begin to scrutinise them in depth. Suggested by Daniel Vetter. Signed-off-by: Chris Wilson commit fdc1f5d0608faa9bb06c1e7c662831550b32d2d3 Merge: 77c667d 2543618 Author: Mark Brown Date: Thu Nov 25 21:16:52 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 43eab87828fee65f89f4088736b2b7a187390a2f Author: Will Deacon Date: Sat Nov 13 19:04:32 2010 +0000 ARM: perf: separate PMU backends into multiple files The ARM perf_event.c file contains all PMU backends and, as new PMUs are introduced, will continue to grow. This patch follows the example of x86 and splits the PMU implementations into separate files which are then #included back into the main file. Compile-time guards are added to each PMU file to avoid compiling in code that is not relevant for the version of the architecture which we are targetting. Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 629948310e4270e9b32c37b4a65a8cd5d6ebf38a Author: Will Deacon Date: Sat Nov 13 18:45:27 2010 +0000 ARM: perf: encode PMU name in arm_pmu structure Currently, perf uses the PMU ID as an index into a string table to look up the name of a given PMU. This patch encodes the name of a PMU directly into the arm_pmu structure so that PMU-specific code can be factored out into separate files. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 3cb314bae2191b432a7e898abf865db880f6d07d Author: Will Deacon Date: Sat Nov 13 17:37:46 2010 +0000 ARM: perf: add _init() functions to PMUs In preparation for separating the PMU-specific code, this patch adds self-contained init functions to each PMU, therefore removing any PMU-specific knowledge from the PMU-agnostic init_hw_perf_events function. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 59a98a1e56edea4d7d9c5f4ce9d50e271a04993c Author: Will Deacon Date: Sat Nov 13 17:18:36 2010 +0000 ARM: perf: avoid exposing internal stop function for v6 PMU Unlike other pmu functions, armv6pmu_pmu_stop is not declared static. This patch adds the missing keyword. Acked-by: Jamie Iles Signed-off-by: Will Deacon commit 84fee97a026ca085f08381054513f9e24689a303 Author: Will Deacon Date: Sat Nov 13 17:13:56 2010 +0000 ARM: perf: consolidate common PMU behaviour The functions for mapping PMU events (perf, cache and raw) are common between all PMU types and differ only in the data on which they operate. This patch implements common definitions of these mapping functions and changes the arm_pmu struct to hold pointers to the data which they require. This is in anticipation of separating out the PMU-specific code into separate files. Acked-by: Jamie Iles Acked-by: Jean Pihet Signed-off-by: Will Deacon commit 01660dfc37933c92dbb7c5718aea61f88025d71f Author: Arnaud Lacombe Date: Mon Nov 8 18:31:53 2010 -0500 scripts/genksyms: fix header usage FreeBSD does not like when __STDC__ is defined, use the standard instead. Signed-off-by: Arnaud Lacombe Signed-off-by: Michal Marek commit 6299f992c0491232f008028a1f40bc9d86c4c76c Author: Chris Wilson Date: Wed Nov 24 12:23:44 2010 +0000 drm/i915: Defer accounting until read from debugfs Simply remove our accounting of objects inside the aperture, keeping only track of what is in the aperture and its current usage. This removes the over-complication of BUGs that were attempting to keep the accounting correct and also removes the overhead of the accounting on the hot-paths. Signed-off-by: Chris Wilson commit 2021746e1d5ad1e3b51e24480c566acbb833c7c1 Author: Chris Wilson Date: Tue Nov 23 15:26:33 2010 +0000 drm/i915: Mark a few functions as __must_check ... to benefit from the compiler checking that we remember to handle and propagate errors. Signed-off-by: Chris Wilson commit ab5793ad3ae11a5cbe2194b449e5fdd80b19f14f Author: Chris Wilson Date: Mon Nov 22 13:24:13 2010 +0000 drm/i915: Tweak on-error bbaddr parsing for clarity Signed-off-by: Chris Wilson commit 312817a39f17dbb4de000165b5b724e3728cd91c Author: Chris Wilson Date: Mon Nov 22 11:50:11 2010 +0000 drm/i915: Only save and restore fences for UMS With KMS, we can simply relinquish the fence when we idle the GPU and reassign it upon first use. Signed-off-by: Chris Wilson commit c6642782b988e907bb50767eab50042f4947e163 Author: Daniel Vetter Date: Fri Nov 12 13:46:18 2010 +0000 drm/i915: Add a mechanism for pipelining fence register updates Not employed just yet... Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit b9e4b1e0cd401e915e3ba97afc152946f78f9f0b Author: Dennis Kügler Date: Tue Nov 23 21:40:09 2010 +0100 HID: Add support for Perixx PERIBOARD-707 (Plus) This patch adds support for the media keys of the Perixx PERIBOARD-707 (Plus) keyboard / remote control. Signed-off-by: Dennis Kügler Signed-off-by: Jiri Kosina commit 45f53cc90e8f0e46ab024d0bc1de49ebee0dc583 Author: Andi Kleen Date: Fri Nov 5 12:06:05 2010 +0100 Kconfig: fix single letter command in scripts/config The one letter commands in scripts/config didn't work and always printed usage. Fix this here. Cc: erick@openchill.org Reported-by: erick@openchill.org Signed-off-by: Andi Kleen Signed-off-by: Michal Marek commit 6e5b86924a633f5b6eefb051404339a5a7bb005e Author: Américo Wang Date: Fri Nov 5 14:16:10 2010 +0800 gitignore: add scripts/recordmcount This file is generated, should be ignored by git. Signed-off-by: WANG Cong Signed-off-by: Michal Marek commit 10f26fa64200095af0e5d80a980e47877865e4b7 Author: Asbjoern Sloth Toennesen Date: Fri Nov 5 13:30:08 2010 +0000 kbuild, deb-pkg: select userland architecture based on UTS_MACHINE Instead of creating the debian package for the compiling userland, create it for a userland matching the kernel thats being compiled. This patch supports all Lenny release architectures, and Linux-based architecture candidates for Squeeze. If it can't find a proper Debian userspace it displays a warning, and fallback to let deb-gencontrol use the host's userspace arch. Eg. with this patch the following make command: make ARCH=i386 deb-pkg will output an i386 Debian package instead of an amd64 one, when run on an amd64 machine. Signed-off-by: Asbjoern Sloth Toennesen Acked-by: maximilian attems Signed-off-by: Michal Marek commit db6857c6e700111e2787b8e08ef1a7ceae363e03 Author: Simon Horman Date: Thu Nov 25 10:30:12 2010 +0900 kdump: update kexec-tools URL and Vivek's email Signed-off-by: Simon Horman Signed-off-by: Jiri Kosina commit 77c667d1365e19c2848d37bf408e2f0b086b63d9 Author: Mark Brown Date: Wed Nov 24 15:48:01 2010 +0000 ARM: Samsung: Make sure ASoC DMA device is prototyped Ensure that the prototype agrees with the definition and stop sparse complaining when building the file. Signed-off-by: Mark Brown Acked-by: Kukjin Kim Acked-by: Jassi Brar Acked-by: Liam Girdwood commit fcd02e261bb3b1ae14830d33da5401c6c4ee9bcc Author: Mark Brown Date: Wed Nov 24 16:27:08 2010 +0000 ASoC: Add WM8737 ALC support Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7a93941975a95dd3be319128552fea71867724d7 Author: Mark Brown Date: Wed Nov 24 17:20:27 2010 +0000 ASoC: Update MAINTAINERS for Samsung driver move Signed-off-by: Mark Brown Acked-by: Jassi Brar Acked-by: Liam Girdwood commit 38533698dc14e739eefb22cf66c048e3c9264313 Author: Mark Brown Date: Wed Nov 24 17:18:45 2010 +0000 ASoC: Make SMDK WM8580 driver unloadable Supply a module exit function so that the driver can be unloaded. Signed-off-by: Mark Brown Acked-by: Jassi Brar Acked-by: Liam Girdwood commit 2c54c1586c78775cfdfb071e68b27e14b668921f Merge: b26bb71 8b6b30a Author: Mark Brown Date: Thu Nov 25 11:17:24 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit b26bb71f610f9b346203bff407e4278d98f9fe80 Author: Axel Lin Date: Thu Nov 25 15:11:45 2010 +0800 ASoC: smdk_wm9713: fix resource leak in smdk_init error path Fix the error path to properly free allocated resources. Signed-off-by: Axel Lin Acked-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f Author: Axel Lin Date: Thu Nov 25 13:43:49 2010 +0800 ASoC: Fix compile error for smartq_wm8987.c Fix below compile error: CC sound/soc/samsung/smartq_wm8987.o sound/soc/samsung/smartq_wm8987.c: In function 'smartq_hifi_hw_params': sound/soc/samsung/smartq_wm8987.c:42: error: 'struct snd_soc_pcm_runtime' has no member named 'dai' sound/soc/samsung/smartq_wm8987.c:43: error: 'struct snd_soc_pcm_runtime' has no member named 'dai' sound/soc/samsung/smartq_wm8987.c: In function 'smartq_wm8987_init': sound/soc/samsung/smartq_wm8987.c:192: warning: passing argument 1 of 'snd_soc_jack_new' from incompatible pointer type sound/soc/samsung/smartq_wm8987.c: At top level: sound/soc/samsung/smartq_wm8987.c:216: warning: initialization from incompatible pointer type make[3]: *** [sound/soc/samsung/smartq_wm8987.o] Error 1 make[2]: *** [sound/soc/samsung] Error 2 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 Signed-off-by: Axel Lin Signed-off-by: Mark Brown commit 8ce28bfcf25527b228b8dff1d38480e3643a94d1 Author: Axel Lin Date: Thu Nov 25 16:50:56 2010 +0800 ASoC: neo1973_gta02_wm8753: fix wrong parameter for snd_soc_register_dai and snd_soc_unregister_dai Signed-off-by: Axel Lin Signed-off-by: Mark Brown commit 1ad2096c4eba144522d87541c4024b8c84e95051 Merge: c4d73e7 df73af8 Author: Paul Mundt Date: Thu Nov 25 16:45:43 2010 +0900 Merge branch 'rmobile/mmcif' into rmobile-latest commit 696d6e178a95d95dbb222d89e5e91a6fa9911440 Author: Kuninori Morimoto Date: Wed Nov 24 07:41:14 2010 +0000 ARM: mach-shmobile: clock-sh73a0: modify MSTP order This patch permuted clock arrays in the order of MSTP Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit df73af86b6e737f357aae85e0b5e621516117780 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:26 2010 +0000 ARM: mach-shmobile: enable MMCIF DMA on ap4evb Have to add DMA slave configuration to enable DMA for the sh7372 MMCIF controller. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit a782d688e9c6f9ca9a7a9a28e8e2876969ddef53 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:22 2010 +0000 mmc: sh_mmcif: add DMA support The MMCIF controller on sh-mobile platforms can use the DMA controller for data transfers. Interface to the SH dmaengine driver to enable DMA. We also have to lower the maximum number of segments to match with the number od DMA descriptors on SuperH, this doesn't significantly affect driver's PIO performance. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e47bf32aa8de06ec72e18b4fbbd880caeedb0088 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:18 2010 +0000 mmc: sh_mmcif: cosmetic clean up Replace pr_* with respective dev_*, sort headers alphabetically, remove an unused struct member, superfluous variable initialisations and type-casts. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 6d11dc14e608d637b09277c7b499f2f46b29cc35 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:15 2010 +0000 ARM: mach-shmobile: add DMA defines for MMCIF on sh7372 Add DMA slave IDs and slave definitions for MMCIF on sh7372. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit aa0787a90c70587db6934547bb7687efc30062c7 Author: Guennadi Liakhovetski Date: Wed Nov 24 10:05:12 2010 +0000 mmc: sh_mmcif: switch to completion, fix flags In sh_mmcif.c an event is used as a completion, switch over. When a wait_for_completion*_timeout() returns, it suffices to check the remaining time, setting an additional flag before waking up the waiting task only reduces the race window, but does not eliminate it. This patch switches the driver to use a completion to signal an interrupt, the only case, when an interrupt should not wake up the waiter, is when an automatic CMD12 completes. Also fix MODULE_ALIAS. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 2d3e4e7652f1db2de0fe8798a1a9be460ac9057b Merge: 698fd6a2 da1d39e Author: Paul Mundt Date: Thu Nov 25 16:26:14 2010 +0900 Merge branch 'common/mmcif' into rmobile/mmcif commit 9a67d761b39614c0495dcab9a204e21a9f4c4d31 Author: Wey-Yi Guy Date: Thu Nov 18 10:40:03 2010 -0800 iwlagn: minor change in bt coex normal LUT Minor changes in LUT Signed-off-by: Wey-Yi Guy commit 506aa156fa736e9f9ce476239c9549ebbf6b08ea Author: Wey-Yi Guy Date: Wed Nov 24 17:25:03 2010 -0800 iwlagn: use different kill mask when SCO active use different kill_ack_mask and kill_cts_mask when detect SCO is active. Signed-off-by: Wey-Yi Guy commit 638514ff5d5845c6eba8c266ea04325be6e7d106 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:55 2010 -0800 iwlagn: Offical name for 100/130 device Change to offical name for 100 devices: "Intel(R) Centrino(R) Wireless-N 100" Change to offical name for 130 devices: "Intel(R) Centrino(R) Wireless-N 130" Signed-off-by: Wey-Yi Guy commit d2eceef02e717751d4f6a01eddea6f241d63c213 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:54 2010 -0800 iwlagn: Offical name for 6000g2b device Change to offical name for 6000g2b devices: "Intel(R) Centrino(R) Wireless-N 1030" "Intel(R) Centrino(R) Advanced-N 6230" Signed-off-by: Wey-Yi Guy commit 55017ab87831b3ca449b81b83b180baac2895666 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:53 2010 -0800 iwlagn: Offical name for 6000g2a device Change to offical name for 6000g2a devices: "Intel(R) Centrino(R) Advanced-N 6205" Signed-off-by: Wey-Yi Guy commit f9dc6467223319acaea64d95ff208409e4e48d07 Author: Wey-Yi Guy Date: Wed Nov 17 12:13:52 2010 -0800 iwlagn: Offical name for 6050g2 device Change to offical name for 6050g2 devices: "Intel(R) Centrino(R) Wireless-N 6150" Signed-off-by: Wey-Yi Guy commit 0c4ac342997c9597706a8fcbb0ccf920b3d33570 Author: Johannes Berg Date: Wed Nov 17 11:33:27 2010 -0800 iwlwifi: use mac80211 AC defines Instead of hardcoding the numbers that must match mac80211, use the constants. Not that this means we could change the constants, but at least this way it's clearer. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 6fb5511ab96d9f31be747bab842f96227a5c7aec Author: Johannes Berg Date: Tue Nov 16 11:55:02 2010 -0800 iwlagn: advertise reliable TX status Our hardware has reliable TX status, but we're not currently advertising that to mac80211. Since the packet loss monitoring will depend on it, advertise it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 2e34034e8c9755ff144379d410d5227926e91cce Author: Johannes Berg Date: Tue Nov 16 11:51:38 2010 -0800 iwlagn: fix station powersave accounting for aggregation Since aggregation queues are station-specific, the device will not reject packets in them but rather will stop the appropriate aggregation queues when a station goes to sleep. I forgot to account for this in the driver, so if a station went to sleep that had aggregation enabled, traffic would stop indefinitely. Fix this by only accounting frames queued on the normal AC queues for associated station. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 67158b67cea0c92dba1dda74cde926d149cc1a2e Author: Johannes Berg Date: Tue Nov 16 11:51:04 2010 -0800 iwlagn: remove powersave warning Through races, a packet may be enqueued for transmission to a station while that station is going to sleep, in which case the warning here triggers. Instead of warning, check the condition -- if this packet is not a PS-poll response then we still enqueue it but it will be rejected by the device since the station is marked as asleep. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit dbbf1755b09eef8ff6dd21c8dafe1606f051ce12 Author: Wey-Yi Guy Date: Mon Nov 15 13:43:07 2010 -0800 iwlwifi: use antenna information in EEPROM The valid tx/rx antenna information is part of EEPROM, so use it to configure the device. For few cases, the EEPROM did not reflect the correct antenna, but it is too late to modify the EEPROM, so overwrite with .cfg parameters Signed-off-by: Wey-Yi Guy commit 4b7384f936817489a4172b9c5d946f63f479ca15 Author: Wey-Yi Guy Date: Mon Nov 15 13:56:10 2010 -0800 iwlwifi: remove unused define was not used, remove it Signed-off-by: Wey-Yi Guy commit 2862945bf5262d516583477ce420a2f122306f43 Author: Aaro Koskinen Date: Thu Nov 18 19:59:51 2010 +0200 arm: omap2: timer-gp: delete unused variable Delete a redundant local variable. Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 7489ffcea62e0b990d3557746d19a47e83e07042 Author: Aaro Koskinen Date: Thu Nov 18 19:59:50 2010 +0200 arm: omap1: board-ams-delta: fix cast Use IOMEM() macro to get rid of the following sparse warning: arch/arm/mach-omap1/board-ams-delta.c:319:36: warning: incorrect type in initializer (different address spaces) arch/arm/mach-omap1/board-ams-delta.c:319:36: expected void [noderef] *membase arch/arm/mach-omap1/board-ams-delta.c:319:36: got void * Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 87aedfe25a754a3ab49a7cfdb8f81bc882bc34fa Author: Aaro Koskinen Date: Thu Nov 18 19:59:49 2010 +0200 arm: omap1: mbox: delete unused variable Delete unused variable from probe(). Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit dba5e190fcbe2a76b1a867ec6cbe9d7009e43708 Author: Aaro Koskinen Date: Thu Nov 18 19:59:48 2010 +0200 arm: omap1: mbox: make variables static Make some variables static to get rid of the following warnings: arch/arm/mach-omap1/mailbox.c:136:18: warning: symbol 'mbox_dsp_info' was not declared. Should it be static? arch/arm/mach-omap1/mailbox.c:142:18: warning: symbol 'omap1_mboxes' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit e6f168212243452eae7c0d0c20c2f6e213933fc8 Author: Aaro Koskinen Date: Thu Nov 18 19:59:47 2010 +0200 arm: omap1: make some functions static Make some functions static to get rid of the following sparse warnings: arch/arm/mach-omap1/mcbsp.c:177:12: warning: symbol 'omap1_mcbsp_init' was not declared. Should it be static? arch/arm/mach-omap1/mux.c:346:22: warning: symbol 'omap1_cfg_reg' was not declared. Should it be static? arch/arm/plat-omap/dma.c:177:5: warning: symbol 'omap_dma_in_1510_mode' was not declared. Should it be static? arch/arm/plat-omap/sram.c:273:12: warning: symbol 'omap1_sram_init' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 706afddaf53522b67c81a0b1b38bdccd4d4ff00c Author: Aaro Koskinen Date: Thu Nov 18 19:59:46 2010 +0200 arm: omap1: add missing includes Add missing includes to get rid of the following sparse warnings: arch/arm/mach-omap1/devices.c:225:13: warning: symbol 'omap1_camera_init' was not declared. Should it be static? arch/arm/mach-omap1/flash.c:15:6: warning: symbol 'omap1_set_vpp' was not declared. Should it be static? arch/arm/mach-omap1/serial.c:190:6: warning: symbol 'omap_serial_wake_trigger' was not declared. Should it be static? arch/arm/mach-omap1/time.c:252:18: warning: symbol 'omap_timer' was not declared. Should it be static? Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 51cce8a590c4696d62bfacc63378d1036084cef7 Merge: 2fe66ec 4f85593 Author: John W. Linville Date: Wed Nov 24 16:49:20 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem commit 4f8559383c41262b50dc758e2e310f257ce6a14d Author: Felix Fietkau Date: Sat Nov 20 03:08:48 2010 +0100 ath9k_hw: remove ath9k_hw_stoppcurecv It is no longer used anywhere Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit fa6e15e0b5952fd2cd99fc6d4f4473f6b9da18df Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:22 2010 +0530 ath9k_htc: Identify devices using driver_info Categorize AR7010 & AR9287 devices based on driver_info of usb_device_id, instead of PIDs. This avoids per-device cases and minimize code changes for new device addition. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit f7ec8fb4d6f8f3ecb8b11e9e46ece95aa66139cc Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:21 2010 +0530 ath9k_hw: Fix eeprom offset for AR9287 devices (PCI/USB) AR9287 devices (PCI/USB) use different eeprom start location to read nvram. New devices might endup with same devid. So use driver_info to set offset, instead of devid. driver_info is valid for HTC devices alone which is filled in usb_device_id. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 64f121708342afec306ce52920cc9982f4f1008f Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:20 2010 +0530 ath9k_htc: Add driver_info in usb device list Added driver_info to identify AR7010, R9287 HTC devices. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit bedbbb959d2c1d1dbb4c2215f5b7074b1da3030a Author: Rajkumar Manoharan Date: Fri Nov 19 16:53:19 2010 +0530 ath: Add a driver_info bitmask field The driver_info stores the device category information which is used to load appropriate device firmware, select firmware offset and eeprom starting location. The driver_info is accessed across ath9k_htc and ath9k_hw. Hence placed under common structure. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit 35162ba75900209755628ccf7357763797037ba6 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:56 2010 -0800 iwlwifi: advance power management support For 6000g2b and up, adding advance power management support for better power consumption Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 1f37daf3233ccda5072f715d6c322d84833cdd92 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:55 2010 -0800 iwlwifi: power management checking for shadow register If shadow register is enable, modify the power management command to inform uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e366176e5c7f37d2d4cd0708e63b939e3fa3b5c6 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:54 2010 -0800 iwlwifi: consider BT for power management Check the BT PSPoll flag when fill PM command to uCode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 97badb0eefc9b6f23f864c5348b695be35f05882 Author: Wey-Yi Guy Date: Tue Nov 23 10:58:53 2010 -0800 iwlwifi: add more power management flags Adding additional power management option available for the device. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit eeb1f83fa8f96501331cc17b73c57999e3a1ec5d Author: Wey-Yi Guy Date: Tue Nov 23 10:58:52 2010 -0800 iwlagn: name change for BT config flag Bit 7 of BT config flag is used to enable/disable PSPoll sync. Make the name to match it. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 99ba2a14283be96a682e04455061c08a46bbf4ec Author: Johannes Berg Date: Wed Nov 24 08:10:06 2010 +0100 mac80211: implement packet loss notification For drivers that have accurate TX status reporting we can report the number of consecutive lost packets to userspace using the new cfg80211 CQM event. The threshold is fixed right now, this may need to be improved in the future. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c063dbf52b998b852122dff07a8b8dd430b38437 Author: Johannes Berg Date: Wed Nov 24 08:10:05 2010 +0100 cfg80211: allow using CQM event to notify packet loss This adds the ability for drivers to use CQM events to notify about packet loss for specific stations (which could be the AP for the managed mode case). Since the threshold might be determined by the driver (it isn't passed in right now) it will be passed out of the driver to userspace in the event. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 79b1c460a0b55e55981c25c56597c4d5d2872de3 Author: Bruno Randolf Date: Wed Nov 24 14:34:41 2010 +0900 cfg80211: Add documentation for antenna ops Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 48124d1a91fb77defc9734b4556350d59671fb2c Author: Luis R. Rodriguez Date: Tue Nov 23 15:05:02 2010 -0800 mac80211: avoid aggregation for VO traffic This should help with latency issues which can happen when using aggregation. Cc: Felix Fietkau Cc: Matt Smith Cc: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit c8b576061d87e2a4fb100e70c6a6dae189b3a310 Author: Luis R. Rodriguez Date: Tue Nov 23 15:05:01 2010 -0800 ath9k: avoid aggregation for VO traffic This should help with latency issues which can happen when using aggregation. Cc: Matt Smith Cc: Senthil Balasubramanian Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 72a8a3edd630995662bdc85957206685f376f9c4 Author: Felix Fietkau Date: Tue Nov 23 03:10:32 2010 +0100 mac80211: reduce the number of retries for nullfunc probing Since nullfunc frames are transmitted as unicast frames, they're more reliable than the broadcast probe requests, so we need fewer retries to figure out whether the AP is really gone. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4e5ff37692df35c8826f1291204841b174d3c3ce Author: Felix Fietkau Date: Tue Nov 23 03:10:31 2010 +0100 mac80211: use nullfunc instead of probe request for connection monitoring nullfunc frames are better for connection monitoring, because probe requests are answered even if the AP has already dropped the connection, whereas nullfunc frames from an unassociated station will trigger a disassoc/deauth frame from the AP (WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA), which allows the station to reconnect immediately instead of waiting until it attempts to transmit the next unicast frame. This only works on hardware with reliable tx ACK reporting, any other hardware needs to fall back to the probe request method. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit dd5b4cc71cd09c33e1579cc6d5720656e94e52de Author: Felix Fietkau Date: Mon Nov 22 20:58:24 2010 +0100 cfg80211/mac80211: improve ad-hoc multicast rate handling - store the multicast rate as an index instead of the rate value (reduces cpu overhead in a hotpath) - validate the rate values (must match a bitrate in at least one sband) Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 46090979a55a0dc2cdb3d939f94fa47742108194 Author: Felix Fietkau Date: Tue Nov 23 20:28:03 2010 +0100 mac80211: probe the AP when resuming Check the connection by probing the AP (either using nullfunc or a probe request). If nullfunc probing is supported and the assoc is no longer valid, the AP will send a disassoc/deauth immediately. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7ccc8bd7593634d827e8bc55898a5038e29848b5 Author: Felix Fietkau Date: Fri Nov 19 22:55:38 2010 +0100 mac80211: calculate beacon loss time accurately Instead of using a fixed 2 second timeout, calculate beacon loss interval from the advertised beacon interval and a frame count. With this beacon loss happens after N (default 7) consecutive frames are missed which for a typical setup (100TU beacon interval) is ~700ms (or ~1/3 previous). Signed-off-by: Sam Leffler Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c8a7972c3b3633bf90daf50b135665d8ca4838c4 Author: Felix Fietkau Date: Fri Nov 19 22:55:37 2010 +0100 mac80211: restart beacon miss timer on system resume from suspend Signed-off-by: Paul Stewart Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 0b81c23d2e3a8589514fa69b2f153f006a4ad773 Author: Rafał Miłecki Date: Thu Nov 18 21:11:43 2010 +0100 b43: N-PHY: little cleanups Remove some typos, warnings, initialize some values to follow wl's code path. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a529cecd29ecf1e5416316ae06ce515bf67b5d5a Author: Rafał Miłecki Date: Thu Nov 18 21:11:42 2010 +0100 b43: N-PHY: rev2: save and restore PHY regs on RSSI poll Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit fee613b77df721781b9794945f0f1a8f535456ff Author: Rafał Miłecki Date: Thu Nov 18 21:11:41 2010 +0100 b43: N-PHY: fix BPHY init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit bec186452b4cfecff9e2c579bfd4016119d39614 Author: Rafał Miłecki Date: Thu Nov 18 13:28:00 2010 +0100 b43: N-PHY: init BPHY when needed Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit a5d3598de086cd38f71fe2fec43ac3ca97bb24bb Author: Rafał Miłecki Date: Thu Nov 18 13:27:59 2010 +0100 b43: N-PHY: fix some typos, conditions, set gain_boost Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c0f05b9879a324937f14270e4a14d661d2beca63 Author: Rafał Miłecki Date: Thu Nov 18 13:27:58 2010 +0100 b43: N-PHY: minor fixes to match specs Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 69a3229edcf0c354e1cd93a811843fba7b6e1472 Author: Rafał Miłecki Date: Thu Nov 18 13:27:57 2010 +0100 b43: N-PHY: fix values for PHY regs in channel tables of 2055 radio Additional comment by Larry Finger : This change deserves a bit more explanation. You might include something like "These tables came from reverse engineering the 5.10.56.46 version of the Broadcom driver. Trace comparisons between b43 and the current Broadcom driver (5.10.120.0) show byte reversals for the PHY register writes." Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit e9c0268f02f8970149158a9b7ea1e5c1c45c819d Author: Joe Perches Date: Tue Nov 16 19:56:49 2010 -0800 net/wireless: Use pr_ and netdev_ No change in output for pr_ prefixes. netdev_ output is different, arguably improved. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit d7a066c92394f3e777351de0c903beeb8a08af76 Merge: ccb1435 e476a5a Author: John W. Linville Date: Wed Nov 24 16:19:24 2010 -0500 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit ccb14354017272ddac002e859a2711610b6af174 Author: John W. Linville Date: Wed Nov 24 16:18:36 2010 -0500 Revert "nl80211/mac80211: Report signal average" This reverts commit 86107fd170bc379869250eb7e1bd393a3a70e8ae. This patch inadvertantly changed the userland ABI. Signed-off-by: John W. Linville commit 1d24eb4815d1e0e8b451ecc546645f8ef1176d4f Author: Tom Herbert Date: Sun Nov 21 13:17:27 2010 +0000 xps: Transmit Packet Steering This patch implements transmit packet steering (XPS) for multiqueue devices. XPS selects a transmit queue during packet transmission based on configuration. This is done by mapping the CPU transmitting the packet to a queue. This is the transmit side analogue to RPS-- where RPS is selecting a CPU based on receive queue, XPS selects a queue based on the CPU (previously there was an XPS patch from Eric Dumazet, but that might more appropriately be called transmit completion steering). Each transmit queue can be associated with a number of CPUs which will use the queue to send packets. This is configured as a CPU mask on a per queue basis in: /sys/class/net/eth/queues/tx-/xps_cpus The mappings are stored per device in an inverted data structure that maps CPUs to queues. In the netdevice structure this is an array of num_possible_cpu structures where each structure holds and array of queue_indexes for queues which that CPU can use. The benefits of XPS are improved locality in the per queue data structures. Also, transmit completions are more likely to be done nearer to the sending thread, so this should promote locality back to the socket on free (e.g. UDP). The benefits of XPS are dependent on cache hierarchy, application load, and other factors. XPS would nominally be configured so that a queue would only be shared by CPUs which are sharing a cache, the degenerative configuration woud be that each CPU has it's own queue. Below are some benchmark results which show the potential benfit of this patch. The netperf test has 500 instances of netperf TCP_RR test with 1 byte req. and resp. bnx2x on 16 core AMD XPS (16 queues, 1 TX queue per CPU) 1234K at 100% CPU No XPS (16 queues) 996K at 100% CPU Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 3853b5841c01a3f492fe137afaad9c209e5162c6 Author: Tom Herbert Date: Sun Nov 21 13:17:29 2010 +0000 xps: Improvements in TX queue selection In dev_pick_tx, don't do work in calculating queue index or setting the index in the sock unless the device has more than one queue. This allows the sock to be set only with a queue index of a multi-queue device which is desirable if device are stacked like in a tunnel. We also allow the mapping of a socket to queue to be changed. To maintain in order packet transmission a flag (ooo_okay) has been added to the sk_buff structure. If a transport layer sets this flag on a packet, the transmit queue can be changed for the socket. Presumably, the transport would set this if there was no possbility of creating OOO packets (for instance, there are no packets in flight for the socket). This patch includes the modification in TCP output for setting this flag. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit 22f4fbd9bd283ef85126e511171932a4af703776 Author: Eric Dumazet Date: Wed Nov 24 11:41:56 2010 -0800 infiniband: remove dev_base_lock use dev_base_lock is the legacy way to lock the device list, and is planned to disappear. (writers hold RTNL, readers hold RCU lock) Convert rdma_translate_ip() and update_ipv6_gids() to RCU locking. Signed-off-by: Eric Dumazet Acked-by: Roland Dreier Signed-off-by: David S. Miller commit bba14de98753cb6599a2dae0e520714b2153522d Author: Eric Dumazet Date: Tue Nov 23 14:09:15 2010 +0000 scm: lower SCM_MAX_FD Lower SCM_MAX_FD from 255 to 253 so that allocations for scm_fp_list are halved. (commit f8d570a4 added two pointers in this structure) scm_fp_dup() should not copy whole structure (and trigger kmemcheck warnings), but only the used part. While we are at it, only allocate needed size. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 456b61bca8ee324ab6c18b065e632c9a8c88aa39 Author: Eric Dumazet Date: Tue Nov 23 13:12:15 2010 +0000 ipv6: mcast: RCU conversion ipv6_sk_mc_lock rwlock becomes a spinlock. readers (inet6_mc_check()) now takes rcu_read_lock() instead of read lock. Writers dont need to disable BH anymore. struct ipv6_mc_socklist objects are reclaimed after one RCU grace period. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 2757a15f08adbed9480c30bdb4e9a0bbf2b6f33a Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:17 2010 +0000 stmmac: update the driver version Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 874bd42d24c2a74f5dbd65e81e175982240fecd8 Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:11 2010 +0000 stmmac: convert to dev_pm_ops. This patch updates the PM support using the dev_pm_ops and reviews the hibernation support. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 293bb1c41b728d4aa248fe8a0acd2b9066ff5c34 Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:38:05 2010 +0000 stmmac: add init/exit callback in plat_stmmacenet_data struct This patch adds in the plat_stmmacenet_data the init and exit callbacks that can be used for invoking specific platform functions. For example, on ST targets, these call the PAD manager functions to set PIO lines and syscfg registers. The patch removes the stmmac_claim_resource only used on STM Kernels as well. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit 9dfeb4d953f914bd3bb56ce60e22ee84687399ce Author: Giuseppe CAVALLARO Date: Wed Nov 24 02:37:58 2010 +0000 stmmac: tidy-up stmmac_priv structure This patch tidies-up the stmmac_priv structure that had many fileds alredy defined in the plat_stmmacenet_data structure. Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit b340007f79941297c44a7dfba4d3c587ff81590f Author: Vladislav Zolotarov Date: Wed Nov 24 11:09:50 2010 -0800 bnx2x: Do interrupt mode initialization and NAPIs adding before register_netdev() Move the interrupt mode configuration and NAPIs adding before a register_netdev() call to prevent netdev->open() from running before these functions are done. Advance a driver version number. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Reported-by: Michael Chan Signed-off-by: David S. Miller commit e1210d127d11fc40d229648c9754aa60776ef796 Author: Eric Dumazet Date: Wed Nov 24 03:45:10 2010 +0000 bnx2x: Disable local BHes to prevent a dead-lock situation According to Eric's suggestion: Disable local BHes to prevent a dead-lock situation between sch_direct_xmit() (Soft_IRQ context) and bnx2x_tx_int (called by bnx2x_run_loopback() - syscall context), as both are taking a netif_tx_lock(). Signed-off-by: Eric Dumazet Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 37a118452cbc9c0cf0d23bfd16d3ca56058be754 Author: Matt Carlson Date: Wed Nov 24 08:31:54 2010 +0000 tg3: Remove tg3_config_info definition This structure isn't used anywhere in the driver. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 2e1e3291d4727e14c8f0f48df561afb1a5c26ffe Author: Matt Carlson Date: Wed Nov 24 08:31:53 2010 +0000 tg3: Enable phy APD for 5717 and later asic revs This patch enables the gphy autopowerdown feature in the phy for all new devices that support it. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 4bae65c892b4ff9a2797cbfa8526a5f9aaf1b2ed Author: Matt Carlson Date: Wed Nov 24 08:31:52 2010 +0000 tg3: use dma_alloc_coherent() instead of pci_alloc_consistent() Using dma_alloc_coherent() permits to use GFP_KERNEL allocations instead of GFP_ATOMIC ones. Its better when a machine is out of memory, because this allows driver to sleep to get its memory and succeed its init, especially when allocating high order pages. Signed-off-by: Eric Dumazet Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b92b9040f6e4997b895b7b9c655a158354d28964 Author: Matt Carlson Date: Wed Nov 24 08:31:51 2010 +0000 tg3: Reenable TSS for 5719 All TSS bugs have been fixed in the 5719. This patch reenables the feature. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit deabaac8beeccdfee5358c0cd4c63258f28f3a74 Author: Matt Carlson Date: Wed Nov 24 08:31:50 2010 +0000 tg3: Enable mult rd DMA engine on 5719 The multiple DMA read engine bugs have been fixed on the 5719. This patch reenables support for this feature. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 07ae8fc00bcc97d2f896b257da225a0789b0aa5d Author: Matt Carlson Date: Wed Nov 24 08:31:49 2010 +0000 tg3: Reorg tg3_napi members This patch reorders and realigns the tg3_napi members for a ~3-4% performance improvement on small packet performance tests. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit cf79003d598b1f82a4caa0564107283b4f560e14 Author: Matt Carlson Date: Wed Nov 24 08:31:48 2010 +0000 tg3: Fix 5719 internal FIFO overflow problem Under load, there an internal FIFO can overflow on the 5719. The fix is to scale back the PCIe maximum read request size based on the current link speed and width. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit d2394e6bb1aa636f3bd142cb6f7845a4332514b5 Author: Matt Carlson Date: Wed Nov 24 08:31:47 2010 +0000 tg3: Always turn on APE features in mac_mode reg The APE needs certain bits in the mac_mode register to be enabled for traffic to flow correctly. This patch changes the code to always enable these bits in the presence of the APE. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit b75cc0e4c1caac63941d96a73b2214e8007b934b Author: Matt Carlson Date: Wed Nov 24 08:31:46 2010 +0000 tg3: Assign correct tx margin for 5719 Commit d309a46e42542223946d3a9e4e239fdc945cb53e, entitled "tg3: 5719: Prevent tx data corruption", was supposed to contain the tx margin adjustment but it looks like it somehow was omitted. This patch fixes the problem. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit 5093eedc8bdfd7d906836a44a248f66a99e27d22 Author: Matt Carlson Date: Wed Nov 24 08:31:45 2010 +0000 tg3: Apply 10Mbps fix to all 57765 revisions Commit a977dbe8445b8a81d6127c4aa9112a2c29a1a008, entitled "tg3: Reduce 57765 core clock when link at 10Mbps" needs to be applied to all revisions of the 57765 asic rev, not just the A0 revision. Signed-off-by: Matt Carlson Reviewed-by: Michael Chan Signed-off-by: David S. Miller commit caea7476d48e5f401f2d18b1738827748fb56c12 Author: Chris Wilson Date: Fri Nov 12 13:53:37 2010 +0000 drm/i915: More accurately track last fence usage by the GPU Based on a patch by Daniel Vetter. Signed-off-by: Chris Wilson commit a7a09aebe8c0dd2b76c7b97018a9c614ddb483a5 Author: Chris Wilson Date: Fri Nov 12 13:49:09 2010 +0000 drm/i915: Rework execbuffer pinning Avoid evicting buffers that will be used later in the batch in order to make room for the initial buffers by pinning all bound buffers in a single pass before binding (and evicting for) fresh buffer. Signed-off-by: Chris Wilson commit ab4e57446ff2e0a5c154cb703595d574130dc919 Merge: 2a9ae13 d6f443a Author: Mark Brown Date: Wed Nov 24 11:57:43 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 2a9ae13a2641373d06e24f866c7427644c39bfea Author: Mark Brown Date: Tue Nov 23 19:31:18 2010 +0000 ASoC: Add initial WM8737 driver The WM8737 is a low power, flexible stereo ADC designed for portable applications. This driver supports most of the functionality of the WM8737, though some features such as the ALC are not yet implemented. Signed-off-by: Mark Brown commit a1c1f770e3653bfcd5dd664d8471f70d220e19f3 Merge: d50a874 2ab46c9 Author: Mark Brown Date: Wed Nov 24 11:26:39 2010 +0000 Merge branch 'topic/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 into for-2.6.38 commit b66ff7a2cd411a2245c984793a7eb98ee91771f9 Author: Dinh Nguyen Date: Mon Nov 15 11:30:00 2010 -0600 ARM: imx: Add mx53 support to common msl functions. Add mx53 support to cpu.c and mm.c. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit c0abefd30b2c9db015df4914a95d268ecdb39b00 Author: Dinh Nguyen Date: Mon Nov 15 11:29:59 2010 -0600 ARM: imx: Add core definitions for MX53 Add iomux, clocks, and memory map for Freescale's MX53 SoC. Add cpu_is_mx53 function to common.h. Add 3 more banks of gpio's to mxc_gpio_ports. Add MX53 phys offset address. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 374daa4f9019f75da1addb3f31a22df1966a5baa Author: Fabio Estevam Date: Wed Nov 10 07:00:02 2010 -0800 mx51_babbage: Add SPI flash support MX51 Babbage has an AT45DB321 SPI Flash connected to eCSPI1. Add support for it. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer Acked-by: Uwe Kleine-König commit 76586d35eb31192bf3f395c2e02cef8a57e3558c Author: Sascha Hauer Date: Thu Nov 4 23:09:18 2010 +0100 ARM i.MX27 pm: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit 92fcdc9d1054a630f224657dc675e03bf3bb62ed Author: Sascha Hauer Date: Thu Nov 4 23:08:17 2010 +0100 ARM i.MX51: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit 8bffb77e198df83224a6a258291bd41c05ab84d1 Author: Sascha Hauer Date: Thu Nov 4 23:07:56 2010 +0100 ARM i.MX DMA: return gracefully on different socs Code called from an initcall can be maybe called for machines it's not intended for. So check for valid machines and return gracefully if an incompatible machine is found. Signed-off-by: Sascha Hauer commit ec4bb253fcc5c07519b5e701d2c87100aef0d2ba Author: Sascha Hauer Date: Fri Nov 5 09:47:21 2010 +0100 ARM i.MX51: Make CONFIG_MXC_TZIC an invisible option There's no point showing this option to the user. The correct value will be selected anyway. Signed-off-by: Sascha Hauer commit c7259df3af03aee00985e9bb64fb2afa593f703f Author: Sascha Hauer Date: Fri Nov 5 09:37:22 2010 +0100 ARM i.MX irq: Compile avic irq code only on SoCs that need it This patch adds a Kconfig option for the avic irq controller and lets the SoCs that need it select this option. Also, as we have two irq controllers for i.MX, irq.c is not appropriate anymore, so rename it to avic.c Signed-off-by: Sascha Hauer commit 7608d7d2b4a146f560436f5b99b1b93d30049e4e Author: Sascha Hauer Date: Thu Nov 4 21:20:43 2010 +0100 ARM i.MX51 boards: Do not use PHYS_OFFSET PHYS_OFFSET may become a variable once the runtime PHYS_OFFSET patch is merged, so use MX51_PHYS_OFFSET for boot_params. Signed-off-by: Sascha Hauer commit db037126656fb75482c09fb8673d97a5b44bcbae Author: Fabio Estevam Date: Wed Nov 3 14:39:13 2010 -0700 mx51_3ds: Add esdhc support Add support for esdhc on mx51_3ds board. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 28d6a7a2f37a349a2292e52a87d76f06f55dc9d8 Author: Arnaud Patard (Rtp) Date: Wed Nov 3 15:54:36 2010 +0100 imx: fix iomux v3 Commit "ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie" (b705cb4d42e95a4a43a8945571c8613e71526c3d) introduced a typo which was preventing my efikamx to boot. This patch is fixing that. Signed-off-by: Arnaud Patard Tested-by: Fabio Estevam Signed-off-by: Sascha Hauer commit c2932bf47001697fc48e89f1d136532703ed4779 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:55 2010 +0200 efikamx: add reset The efikamx board is using a gpio to reset the board so add support for it Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit c6e34a4cbe8d4e126c3f603d11cce6979952cbb1 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:54 2010 +0200 efikamx: add spi nor support On efikamx, uboot is stored on a nor spi flash. Add support for it Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0dea1c74642fb46cb94282719dafe7c2a7d3068f Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:53 2010 +0200 imx51: fix gpio_4_24 and gpio_4_25 pad configuration s/NO_PAD_CTRL/MX51_GPIO_PAD_CTRL/ Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit fcbd0c5f20918c6db0c72d4e7546880833713f9c Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:52 2010 +0200 efikamx: add support for power key This patch adds support for power key button of the efika mx. It's connected on GPIO 2 31. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 9d2c0ef76f429c038de27e1b734d65a67dbc8088 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:51 2010 +0200 efikamx: add leds support The efika mx a 3 leds (1 blue, 1 red, 1 green) connected on GPIOS 3 13/14/15. Also, some special care is done for default trigger of blue led for mmc as the mmc host used is different between hw revisions Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 82df68ad26c1cb4c31e1a2750c0020038dd77cc6 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:50 2010 +0200 imx51: add gpio mode for csi1 {h,v}sync Add definitions for configuring CSI1_{H,V}SYNC as GPIO Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit a96eb148c74a09bc872b1490141d98811a3c7dbd Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:49 2010 +0200 efikamx: add mmc support The efika mx is using a esdhc host for mmc support. Now that the sdhci has support for it, enable it. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit 0a7d48712f9a279464d2587e52e60fdc81f9a65a Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:48 2010 +0200 imx51: enhance iomux configuration for esdhc support - add definition to configure pads as ESDHC{1,2} WP and CD Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit db9d42348f6f5b37ae658a506bf80fa935dc1b0a Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:47 2010 +0200 imx51: fix iomux configuration - ALT0 is used to set GPIO mode of GPIO_1_{2,3,4,5,6,7,8,9} but it's ALT1 for GPIO_1_{0,1}. Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit f1dd361b679977d449b7d10ddc9b5fcdfa8c0ca9 Author: Arnaud Patard (Rtp) Date: Wed Oct 27 14:40:46 2010 +0200 efikamx: read board id read board id value from the GPIO3_16/17/11 Signed-off-by: Arnaud Patard Signed-off-by: Sascha Hauer commit bd02a9e5eee6335f23f1fff52a1e5c8e1783c49e Author: Fabio Estevam Date: Wed Oct 27 10:31:06 2010 -0700 mx31_3ds: Add touchscreen support On the mx31_3ds board the touchscreen feature is provided by MC13783 PMIC. Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit 8f5260c8c1a1f9b25dfedd5ca749e4faef1b3eb9 Author: Lothar Waßmann Date: Tue Oct 26 14:28:31 2010 +0200 ARM: i.MX IOMUX-V3 replace struct pad_desc with bitmapped cookie The following patch is a first step to convert the 'struct pad_desc' to a bitmapped cookie to facilitate adding platform specific pullup or drive strength definitions to existing pad definitions without need to rewrite the complete pad def. The patch wraps 'struct pad_desc' in an opaque data type and introduces macros to access the individual members. This patch does not constitute any functional change! Signed-off-by: Lothar Waßmann Signed-off-by: Sascha Hauer commit 2a85927c79634e89b9cd683dd2bae65966d9b216 Merge: 3561d43 124bf94 Author: Sascha Hauer Date: Wed Nov 24 08:24:29 2010 +0100 Merge branch 'imx-for-2.6.38' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38 commit c4d73e7d75a54451d6e073c118ba2b8d87bd350d Merge: 0421860 fd34f85 421b446 Author: Paul Mundt Date: Wed Nov 24 15:34:46 2010 +0900 Merge branches 'rmobile/ag5' and 'rmobile/fsi-despair' into rmobile-latest commit fd34f85832550d419e8b70f284ad545cdde0664f Author: Paul Mundt Date: Wed Nov 24 15:22:09 2010 +0900 mailmap: Fix up Takashi YOSHII's attribution. Signed-off-by: Paul Mundt commit aae0f73604ff4bf65d0e4f5d4a10f214a6c98282 Author: Kuninori Morimoto Date: Wed Nov 24 05:03:33 2010 +0000 ARM: mach-shmobile: ag5evm: remove unused define Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 8e67b22a13e53335657b595bc4e4c01a559f8845 Author: Yoshii Takashi Date: Fri Nov 19 13:21:32 2010 +0000 ARM: mach-shmobile: ag5evm i2c_shmobile support. Just add port multiplex settings to enable i2c modules. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit b028f94b76319e1b86103b767ca1c22546a5e7e7 Author: Yoshii Takashi Date: Fri Nov 19 13:20:45 2010 +0000 ARM: mach-shmobile: sh73a0 i2c_shmobile support. Platform device resource/data definition for CPU, and clkdev entries Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 2d22d486601b2eaedd1c8dd5dc1c4602cab896ef Author: Yoshii Takashi Date: Fri Nov 19 13:15:46 2010 +0000 ARM: mach-shmobile: ag5evm: scan keyboard support This consists of platform device resources/data for the board, and simple clvdev entry for MSTP bit for keysc module. This support only 49 of 80 key-switches on the board. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 03cfe6f57dc5c13ccdd235c23c80e3fa170f03d1 Author: Kay Sievers Date: Tue Nov 23 17:43:19 2010 +0100 ALSA: support module on-demand loading for seq and timer If CONFIG_SND_DYNAMIC_MINORS is used, assign /dev/snd/seq and /dev/snd/timer the usual static minors, and export specific module aliases to generate udev module on-demand loading instructions: $ cat /lib/modules/2.6.33.4-smp/modules.devname # Device nodes to trigger on-demand module loading. microcode cpu/microcode c10:184 fuse fuse c10:229 ppp_generic ppp c108:0 tun net/tun c10:200 uinput uinput c10:223 dm_mod mapper/control c10:236 snd_timer snd/timer c116:33 snd_seq snd/seq c116:1 The last two lines instruct udev to create device nodes, even when the modules are not loaded at that time. As soon as userspace accesses any of these nodes, the in-kernel module-loader will load the module, and the device can be used. The header file minor calculation needed to be simplified to make __stringify() (supports only two indirections) in the MODULE_ALIAS macro work. This is part of systemd's effort to get rid of unconditional module load instructions and needless init scripts. Cc: Lennart Poettering Signed-off-by: Kay Sievers Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 919926aeb3e89825093c743dd54f04e42e7d9150 Author: Chris Wilson Date: Fri Nov 12 13:42:53 2010 +0000 drm/i915: Thread the pipelining ring through the callers. Signed-off-by: Chris Wilson commit 576ae4b8e46b4cb9d5390f4348c265329793d9bf Author: Chris Wilson Date: Fri Nov 12 13:36:26 2010 +0000 drm/i915: Extend hangcheck timeout ... reduce the frequency of checking to further reduce the wakeups and CPU overhead. Signed-off-by: Chris Wilson commit dddbc0e5257572079602654258adc8d117e168ad Author: Chris Wilson Date: Fri Nov 12 13:56:11 2010 +0000 drm/i915: Remove a defunct BUG_ON This used to check the precondition that all fences were to be located in a mappable area, redundant now as those two parameters are combined into one. After pinning, we assert that the buffer is bound into the desired region. Signed-off-by: Chris Wilson commit b6913e4bdb09134dbdccd613e880d413b5911591 Author: Chris Wilson Date: Fri Nov 12 10:46:37 2010 +0000 drm/i915: Move the implementation details of PIPE_CONTROL to the ringbuffer The pipe control object is allocated by the device for the sole use of the render ringbuffer. Move this detail from the general code to the render ring buffer initialisation. Signed-off-by: Chris Wilson commit 748ebc6017a943ec065e653e975a5e8dace77ac6 Author: Chris Wilson Date: Sun Oct 24 10:28:47 2010 +0100 drm/i915: Record fence registers on error. Having seen the effects of erroneous fencing on the batchbuffer, a useful sanity check is to record the fence registers at the time of an error. Signed-off-by: Chris Wilson commit 7bdc9ab00b1b0fdbb490f41c5c7c2fbc66fed9ee Author: Chris Wilson Date: Tue Nov 9 17:53:20 2010 +0000 agp/intel: Remove duplicate const drivers/char/agp/intel-gtt.c:340:48: warning: duplicate const Signed-off-by: Chris Wilson commit 92b88aeb1ad67417c002fdd77409771ca7e5433a Author: Chris Wilson Date: Tue Nov 9 11:47:32 2010 +0000 drm/i915: Not all mappable regions require GTT fence regions Combining map_and_fenceable revealed a bug in i915_gem_object_gtt_size() in that it always computed the appropriate fence size for the object regardless of tiling state which caused us to over-allocate linear buffers when binding to the GTT. Signed-off-by: Chris Wilson commit 05394f3975dceb107a5e1393e2244946e5b43660 Author: Chris Wilson Date: Mon Nov 8 19:18:58 2010 +0000 drm/i915: Use drm_i915_gem_object as the preferred type A glorified s/obj_priv/obj/ with a net reduction of over a 100 lines and many characters! Signed-off-by: Chris Wilson commit 185cbcb304ba4dee55e39593fd86dcd7813f62ec Author: Daniel Vetter Date: Sat Nov 6 12:12:35 2010 +0100 drm/i915: no more agp for gem Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 4080775b60cc26044e7c4aba5e76e5041b0d7004 Author: Daniel Vetter Date: Sat Nov 6 11:18:58 2010 +0100 intel-gtt: export api for drm/i915 Just some minor shuffling to get rid of any agp traces in the exported functions. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 7c2e6fdf452cddeff6a8ee5156edba39e53246fc Author: Daniel Vetter Date: Sat Nov 6 10:10:47 2010 +0100 drm/i915: move gtt handling to i915_gem_gtt.c No more drm_*_agp in i915_gem.c! Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit cb16b67b5cb33b7d6732e0c416d29d933eea13ce Author: Daniel Vetter Date: Fri Nov 5 22:27:10 2010 +0100 agp: kill agp_rebind_memory Its only user, intel-gtt.c is now gone. Cc: Dave Airlie Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 76aaf22016caa7764f40e792aaca7b4918312b22 Author: Daniel Vetter Date: Fri Nov 5 22:23:30 2010 +0100 drm/i915: restore gtt on resume in the drm instead of in intel-gtt.ko This still uses the agp functions to actually reinstate the mappings (with a gross hack to make agp cooperate), but it wires everything up correctly for the switchover. The call to agp_rebind_memory can be dropped because all non-kms drivers do all their rebinding on EnterVT. v2: Be more paranoid and flush the chipset cache after restoring gtt mappings. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 93a37f20eabeea4039130527b07453038c07f471 Author: Daniel Vetter Date: Fri Nov 5 20:24:53 2010 +0100 drm/i915: track objects in the gtt This is required to restore gtt mappings on resume when agp is gone. The right way to do this would be to make sturct drm_mm_node embeddable and use the allocation list maintained by the drm memory manager. But that's a bigger project. Getting rid of the per bo agp_mem will save more memory than this wastes, anyway. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit f050a8abbda0efcd597c6b1825e3b9ce4d613383 Author: Daniel Vetter Date: Fri Nov 5 18:40:56 2010 +0100 agp: kill agp_flush_chipset and corresponding ioctl The intel drm calls the chipset functions now directly. Userspace never called the corresponding ioctl, hence it can be killed, too. Cc: Dave Airlie Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 4af72e2865a23ac090884a421bd1a8b19e247a22 Author: Daniel Vetter Date: Fri Nov 5 18:13:43 2010 +0100 drm: kill drm_agp_chipset_flush No longer used. Cc: Dave Airlie Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 40ce6575102b23e432932b5ce41c44bf7cc5023b Author: Daniel Vetter Date: Fri Nov 5 18:12:18 2010 +0100 drm/i915/gtt: call chipset flush directly Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 23ed992a5ebe6964ebe312b54142fbc5e8185cdc Author: Daniel Vetter Date: Fri Nov 5 18:04:52 2010 +0100 drm/i915|intel-gtt: consolidate intel-gtt.h headers ... and a few other defines. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit ff26860fb53f2dcfaaaf1bf017b09dbdfddff5ee Author: Daniel Vetter Date: Fri Nov 5 15:43:35 2010 +0100 intel-gtt: fold i81x-only dcache support into the generic driver Now the intel-gtt.c rewrite is complete! Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 820647b97a9cbdd976c7177f1b6047fc1f6dd5c0 Author: Daniel Vetter Date: Fri Nov 5 13:30:14 2010 +0100 intel-gtt: switch i81x to the common initialization helpers Still a separate agp_bridge_driver because of the i81x-only dedicated vram support. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 625dd9d331d8a1ce5ee4e9924a22f3e55b7ac615 Author: Daniel Vetter Date: Thu Nov 4 20:07:57 2010 +0100 intel-gtt: switch i81x to the write_entry helpers Initialization is still done with the old code with a few added things sprinkled in to make the intel_fake_agp helper functions work. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 24a6b387af7cd5d1e0e5d15b15104644a5105de7 Author: Daniel Vetter Date: Thu Nov 4 20:14:15 2010 +0100 intel-gtt: kill unneeded sandybridge memory types Used for the now dead agp type_to_mask stuff. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit b47cf66f315a258c458ed4345c443dba396fb787 Author: Daniel Vetter Date: Thu Nov 4 18:41:50 2010 +0100 intel-gtt: drop dcache support for i830 and later i830_check_flags already disallows it, so no need to implement it in the write_entry function. Seems to be a remnant from i810 support. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit e384eafc1c2f4f10155fe25324afe51129ec3e6a Merge: faa60c4 bcf50e2 Author: Chris Wilson Date: Tue Nov 23 20:13:13 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit 2fe66ec242d3f76e3b0101f36419e7e5405bcff3 Author: Eric Paris Date: Tue Nov 23 06:28:08 2010 +0000 SELinux: indicate fatal error in compat netfilter code The SELinux ip postroute code indicates when policy rejected a packet and passes the error back up the stack. The compat code does not. This patch sends the same kind of error back up the stack in the compat code. Based-on-patch-by: Paul Moore Signed-off-by: Eric Paris Reviewed-by: Paul Moore Signed-off-by: David S. Miller commit 04f6d70f6e64900a5d70a5fc199dd9d5fa787738 Author: Eric Paris Date: Tue Nov 23 06:28:02 2010 +0000 SELinux: Only return netlink error when we know the return is fatal Some of the SELinux netlink code returns a fatal error when the error might actually be transient. This patch just silently drops packets on potentially transient errors but continues to return a permanant error indicator when the denial was because of policy. Based-on-comments-by: Paul Moore Signed-off-by: Eric Paris Reviewed-by: Paul Moore Signed-off-by: David S. Miller commit faa60c4174d943696b9478c5de6438c4f0fecba6 Author: Chris Wilson Date: Tue Nov 23 13:50:14 2010 +0000 drm/i915: Contract the magic IPS constants into a direct LUT ... and no need to perform a linear search for the index. Signed-off-by: Chris Wilson commit c64f7ba5f1006d8c20eacafecf98d4d00a6902a0 Author: Chris Wilson Date: Tue Nov 23 14:24:24 2010 +0000 agp/intel: Remove confusion of stolen entries not stolen memory Signed-off-by: Chris Wilson commit 1b6064d79b9a1c5e5aa6fcc6855f3da5e639ff73 Author: Chris Wilson Date: Tue Nov 23 12:33:54 2010 +0000 agp/intel: Remove the artificial cap on stolen size Now that the stolen memory does not also steal entries from the GTT, we can use all the memory the BIOS set aside for the GPU. Signed-off-by: Chris Wilson commit fe669bf88e9108b96a847385df08c9b1e98c1420 Author: Chris Wilson Date: Tue Nov 23 12:09:30 2010 +0000 drm/i915: Compute physical addresses from base of stolen memory The GATT is a write-only set of registers, reading from them in the manner of i915_gtt_to_phys() is supposed to be undefined. However a simple solution exists as we allocate linear memory from the stolen area, we can simply add the block offset to the base register. As a side-effect we recover all the unused stolen GTT entries and so enlarge our aperture. Signed-off-by: Chris Wilson commit d50a87402e29e16a63152be810d9723ce4d87e37 Merge: 5033f43 24fb2b1 Author: Mark Brown Date: Tue Nov 23 14:30:41 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 5033f43c66754296dfb0ac5c895208e4a7f93aac Author: Jassi Brar Date: Mon Nov 22 15:37:25 2010 +0900 ASoC: Samsung: Rename from s3c24xx to samsung Finally, move the 's3c24xx' directory to 'samsung' Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a964f34d8b516633d471191156963bae0d1bf730 Author: Jassi Brar Date: Mon Nov 22 15:37:22 2010 +0900 ASoC: Samsung: Generalize Kconfig symbols Move prefixes to repesent the nature of Samsung ASoC suitably. SND_S3C24XX_SOC -> ASOC_SAMSUNG SND_S3C_SOC_PCM -> SND_SAMSUNG_PCM SND_S3C_SOC_AC97 -> SND_SAMSUNG_AC97 SND_S5P_SOC_SPDIF -> SND_SAMSUNG_SPDIF SND_S3C24XX_SOC_I2S -> SND_S3C24XX_I2S SND_S3C64XX_SOC_SMARTQ -> ASOC_SMARTQ SND_SOC_SMDK_SPDIF -> ASOC_SAMSUNG_SMDK_SPDIF SND_SOC_SMDK_WM8580 -> ASOC_SAMSUNG_SMDK_WM8580 SND_SOC_SMDK_WM9713 -> ASOC_SAMSUNG_SMDK_WM9713 SND_SOC_GONI_AQUILA_WM8994 -> ASOC_GONI_AQUILA_WM8994 Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b0f39c25a1bf6b4c81c183dfd0920e76f8e43488 Author: Jassi Brar Date: Mon Nov 22 15:37:19 2010 +0900 ASoC: SMDK_WM8580: Enable for SMDKC100 Enable the ASoC Machine driver to run on SMDKC100 as well. Signed-off-by: Jassi Brar Acked-by: Kukjin Kim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit d98ce6cf0303dc8edc9fdc18f84e4d7dafbb61a2 Author: Jassi Brar Date: Mon Nov 22 15:37:16 2010 +0900 ASoC: SMDK64XX: Rename for other platforms We plan to use the same ASoC Machine driver for most of latest SMDK platforms. So rename the 64XX specific driver to generic named. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 03e6a88897f923ae2608569e66afba4766e1abf7 Author: Jassi Brar Date: Mon Nov 22 15:37:13 2010 +0900 ASoC: S3C64XX: Remove obsoleted I2S drivers Now that we have better I2S CPU drivers and no need for the old ones, discard them. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0fff21a86c1ada9e9eba0d11fb91797bf2c73d46 Author: Jassi Brar Date: Mon Nov 22 15:37:07 2010 +0900 ASoC: SMDK64XX: Move to use new I2S driver Modify the smdk64xx_wm8580.c to use new i2s controller driver. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fcd8c742b92d834dee804b2a394cc575dd3a4084 Author: Jassi Brar Date: Mon Nov 22 15:37:04 2010 +0900 ASoC: GONI: Move to use new I2S driver Modify the goni_wm8994.c to use new i2s controller driver. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit b9493d6c3308b6bd0867d7175df03b111cda1afc Author: Jassi Brar Date: Mon Nov 22 15:37:02 2010 +0900 ASoC: SMARTQ: Move to use new I2S driver Modify the smartq_wm8987.c to use new i2s controller driver. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1c7ac01807ac89dee5e2ebf8f43fbc4cbba24af6 Author: Jassi Brar Date: Mon Nov 22 15:36:59 2010 +0900 ASoC: Samsung: Add common I2S driver The I2S controllers since S3C64XX are incremental revisions, with a new feature added to the last one. The programming i/f doesn't conflict between these revisions, so it is possible to have one common driver that could manage various versions of I2S (v3, 4 & 5) Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0068402c58d5f3e21b863de881508248f29b464f Author: Jassi Brar Date: Mon Nov 22 15:36:54 2010 +0900 ASoC: Samsung: Rename s3c64xx I2S device Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s' Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c3f2028b5b15c6799d84b29a07fb92934b10a4d2 Author: Jassi Brar Date: Mon Nov 22 15:36:50 2010 +0900 ASoC: Samsung: Generalize DMA driver namespace Remove S3C,s3c from static defines. s3c_dma_ -> dma_ s3c24xx_runtime_ -> runtime_ s3c24xx_audio_ -> audio_ s3c_preallocate_ -> preallocate_ s3c24xx_soc_platform -> samsung_asoc_platform s3c24xx_pcm_driver -> asoc_dma_driver snd_s3c24xx_pcm_ -> samsung_asoc_ Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 158a782843f9b0716c9fecf14a0563b07cf84da4 Author: Jassi Brar Date: Mon Nov 22 15:36:44 2010 +0900 ASoC: Samsung: Rename PCM driver Rename Samsung PCM Controller driver s3c-pcm.[c/h] -> pcm.[c/h] Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 99ce3a3f3748f39ab6447c246b675f182ee761da Author: Jassi Brar Date: Mon Nov 22 15:36:03 2010 +0900 ASoC: Samsung: Rename AC97 driver Rename Samsung AC97 driver s3c-ac97.[c/h] -> ac97.[c/h] Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e6104673d28823e33bfc3dfb046a117f2575c9a8 Author: Jassi Brar Date: Mon Nov 22 15:36:00 2010 +0900 ASoC: Samsung: Rename AC97 platform device Call the AC97 controller devices found in S3C, S5P and newer SoCs as 'samsung-ac97' rather than 's3c-ac97'. Signed-off-by: Jassi Brar Acked-by: Kukjin Kim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4b640cf309e517f1ea5ab308fc7b24352612f535 Author: Jassi Brar Date: Mon Nov 22 15:35:57 2010 +0900 ASoC: Samsung: Rename ASoC DMA driver Rename Samsung ASoC DMA driver s3c-dma.[c/h] -> dma.[c/h] Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 83e37b8e400ca51cc97946815b3055daacd92fa8 Author: Jassi Brar Date: Mon Nov 22 15:35:53 2010 +0900 ARM: Samsung: Define common audio-dma device The ASoC uses common DMA driver for Audio devices. So it makes sense to a common audio-dma device shared across all platforms. Signed-off-by: Jassi Brar Acked-by: Kukjin Kim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 58bb4072132c54d832082cc6eac396a6db009cbd Author: Jassi Brar Date: Mon Nov 22 15:35:50 2010 +0900 ASoC: Samsung: Rename DMA device Some Samsung SoCs have a PCM(DSP) controller. So the name s3c24xx-pcm-audio for DMA driver is not very appropraite. This patch moves :- s3c24xx-pcm-audio -> samsung-audio Signed-off-by: Jassi Brar Acked-by: Kukjin Kim Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 3a56d0ca72f8fc47240849b83acacd1c92283b99 Author: Jassi Brar Date: Mon Nov 22 15:35:36 2010 +0900 ASoC: Samsung: Remove redundant AQUILA driver AQUILA and GONI are essentially the same h/w w.r.t ASoC. They only differ by the fact that GONI has stereo speaker-out whereas AQUILA has mono. The difference can easily be handled in the same MACHINE driver by making machine-specific runtime changes. Signed-off-by: Jassi Brar Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 34a2d313c51f47cae50ccb89f4196462665f2c48 Author: Christoph Hellwig Date: Tue Nov 23 14:38:21 2010 +0100 hfsplus: flush disk caches in sync and fsync Flush the disk cache in fsync and sync to make sure data actually is on disk on completion of these system calls. There is a nobarrier mount option to disable this behaviour. It's slightly misnamed now that barrier actually are gone, but it matches the name used by all major filesystems. Signed-off-by: Christoph Hellwig commit e34947056076ca5467ee8256d2d9cbc594a79b37 Author: Christoph Hellwig Date: Tue Nov 23 14:38:15 2010 +0100 hfsplus: optimize fsync Avoid doing unessecary work in fsync. Do nothing unless the inode was marked dirty, and only write the various metadata inodes out if they contain any dirty state from this inode. This is archived by adding three new dirty bits to the hfsplus-specific inode which are set in the correct places. Signed-off-by: Christoph Hellwig commit b33b7921db14abcd10c30d0ccfc68e364f5ef7fe Author: Christoph Hellwig Date: Tue Nov 23 14:38:13 2010 +0100 hfsplus: split up inode flags Split the flags field in the hfsplus inode into an extent_state flag that is locked by the extent_lock, and a new flags field that uses atomic bitops. The second will grow more flags in the next patch. Signed-off-by: Christoph Hellwig commit eb29d66d4f2dc98a81ae590bbdddc8cfa8964d73 Author: Christoph Hellwig Date: Tue Nov 23 14:38:10 2010 +0100 hfsplus: write up fsync for directories fsync is supposed to not just work on regular files, but also on directories. Fortunately enough hfsplus_file_fsync works just fine for directories, so we can just wire it up. Signed-off-by: Christoph Hellwig commit 281469766bdde2d14bc73e1fec347e6dd7f63319 Author: Christoph Hellwig Date: Tue Nov 23 14:38:06 2010 +0100 hfsplus: simplify fsync Remove lots of code we don't need from fsync, we just need to call ->write_inode on the inode if it's dirty, for which sync_inode_metadata is a lot more efficient than write_inode_now, and we need to write out the various metadata inodes, which we now do explicitly instead of by calling ->sync_fs. Signed-off-by: Christoph Hellwig commit f02e26f8d90f8cde98314c72c2e890bc281a8346 Author: Christoph Hellwig Date: Tue Nov 23 14:38:02 2010 +0100 hfsplus: avoid useless work in hfsplus_sync_fs There is no reason to write out the metadata inodes or volume headers during a non-blocking sync, as we are almost guaranteed to dirty them again during the inode writeouts. Signed-off-by: Christoph Hellwig commit 7dc4f001123f9ebe3b010a6c26acd18698ad205f Author: Christoph Hellwig Date: Tue Nov 23 14:37:57 2010 +0100 hfsplus: make sure sync writes out all metadata hfsplus stores all metadata except for the volume headers in special inodes. While these are marked hashed and periodically written out by the flusher threads, we can't rely on that for sync. For the case of a data integrity sync the VM has life-lock avoidance code that avoids writing inodes again that are redirtied during the sync, which is something that can happen easily for hfsplus. So make sure we explicitly write out the metadata inodes at the beginning of hfsplus_sync_fs. Signed-off-by: Christoph Hellwig commit 358f26d52680cb150907302d4334359de7dd2d59 Author: Christoph Hellwig Date: Tue Nov 23 14:37:51 2010 +0100 hfsplus: use raw bio access for partition tables Switch the hfsplus partition table reding for cdroms to use our bio helpers. Again we don't rely on any caching in the buffer_heads, and this gets rid of the last buffer_head use in hfsplus. Signed-off-by: Christoph Hellwig commit 52399b171dfaea02b6944cd6feba49b624147126 Author: Christoph Hellwig Date: Tue Nov 23 14:37:47 2010 +0100 hfsplus: use raw bio access for the volume headers The hfsplus backup volume header is located two blocks from the end of the device. In case of device sizes that are not 4k aligned this means we can't access it using buffer_heads when using the default 4k block size. Switch to using raw bios to read/write all buffer headers. We were not relying on any caching behaviour of the buffer heads anyway. Additionally always read in the backup volume header during mount to verify that we can actually read it. Signed-off-by: Christoph Hellwig commit 3b5ce8ae31e3c66655207907527476bbd3e5063b Author: Christoph Hellwig Date: Tue Nov 23 14:37:43 2010 +0100 hfsplus: always use hfsplus_sync_fs to write the volume header Remove opencoded writing of the volume header in hfsplus_fill_super and hfsplus_put_super and offload it to hfsplus_sync_fs. In the put_super case this means we only write the superblock once instead of twice. Signed-off-by: Christoph Hellwig commit 6d1bbfc4c0458c514126ccf7d6ce9232d9dbc872 Author: Christoph Hellwig Date: Tue Nov 23 14:37:40 2010 +0100 hfsplus: silence a few debug printks Turn a few noisy debug printks that show up during xfstests into complied out debug print statements. Signed-off-by: Christoph Hellwig commit 2ab46c9390e74368a38ddb5aa525124518df8b69 Merge: 9e18e18 5b3b0fa Author: Takashi Iwai Date: Tue Nov 23 12:45:05 2010 +0100 Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc Conflicts: sound/soc/codecs/tpa6130a2.c commit 0b0b053a3949f5c467c3b3ba135d4c161f9fbd00 Author: Chris Wilson Date: Tue Nov 23 09:45:50 2010 +0000 drm/i915/panel: Restore saved value of BLC_PWM_CTL After a GPU reset, the backlight controller registers may be also reset to 0. In that case we should restore those to the original values programmed by the BIOS. Note that we still lack the code to handle the case where the BIOS failed to program those registers at all... Signed-off-by: Chris Wilson commit 5bb6b1ea67a73f0665a41726dd7138977b992c6c Author: Peter Zijlstra Date: Fri Nov 19 21:11:09 2010 +0100 sched: Add some clock info to sched_debug Add more clock information to /proc/sched_debug, Thomas wanted to see the sched_clock_stable state. Requested-by: Thomas Gleixner Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 51a96c77815e7f139892a6e9c8275a50e9baebdf Author: Peter Zijlstra Date: Fri Nov 19 20:37:53 2010 +0100 cpu: Remove incorrect BUG_ON Oleg mentioned that there is no actual guarantee the dying cpu's migration thread is actually finished running when we get there, so replace the BUG_ON() with a spinloop waiting for it. Reported-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 2e01f4740a874b6085da6ebf541e7ffde9a72bf2 Author: Dhaval Giani Date: Thu Nov 18 15:44:54 2010 +0100 cpu: Remove unused variable GCC warns us about: kernel/cpu.c: In function ‘take_cpu_down’: kernel/cpu.c:200:15: warning: unused variable ‘cpu’ This variable is unused since param->hcpu is directly used later on in cpu_notify. Signed-off-by: Dhaval Giani Signed-off-by: Peter Zijlstra LKML-Reference: <1290091494.1145.5.camel@gondor.retis> Signed-off-by: Ingo Molnar commit 70caf8a6c13c2279b35f2ad6b644815533d6c476 Author: Peter Zijlstra Date: Sat Nov 20 00:53:51 2010 +0100 sched: Fix UP build breakage The recent cgroup-scheduling rework caused a UP build problem. Cc: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 28d0686cf7b14e30243096bd874d3f80591ed392 Author: Erik Gilling Date: Fri Nov 19 18:08:51 2010 -0800 sched: Make task dump print all 15 chars of proc comm Signed-off-by: Erik Gilling Signed-off-by: John Stultz Signed-off-by: Peter Zijlstra LKML-Reference: <1290218934-8544-3-git-send-email-john.stultz@linaro.org> Signed-off-by: Ingo Molnar commit 3685092b717882bb9b6801bf3e4b02a106e3b129 Author: Chris Wilson Date: Tue Nov 23 08:49:38 2010 +0000 drm/i915: Avoid oops when capturing NULL ring for inactive pinned buffers Signed-off-by: Chris Wilson commit 6735329934e9acc1941a991ed6f6ad4be3e082a5 Author: Juuso Oikarinen Date: Thu Nov 18 15:19:02 2010 +0200 wl12xx: Fix kernel crash related to hw recovery and interface shutdown It is possible that the op_remove_interface function is invoked exactly at the same time has hw recovery is started. In this case it is possible for the interface to be already removed in the op_remove_interface call, which currently leads to a kernel warning and a subsequent kernel crash. Fix this by ignoring the op_remove_interface call if the interface is already down at that point. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Signed-off-by: Luciano Coelho commit 439bd6cde45d0bff4f97513b01b976b9f72ae1f0 Author: Alex Deucher Date: Mon Nov 22 17:56:31 2010 -0500 drm/radeon/kms: add Ontario APU ucode loading support Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 11fa1618e327af7f08085e134b3325de9caf7a94 Author: Alex Deucher Date: Mon Nov 22 17:56:37 2010 -0500 drm/radeon/kms: add Ontario Fusion APU pci ids Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit bbbf9b7b02e0090d91c422398089c9f22361dc94 Author: Alex Deucher Date: Mon Nov 22 17:56:36 2010 -0500 drm/radeon/kms: enable MSIs on fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b0e664140a170382531a8c8b5396bf7e6903d5e3 Author: Alex Deucher Date: Mon Nov 22 17:56:35 2010 -0500 drm/radeon/kms: add power table parsing support for Ontario fusion APUs The vbios power tables on my inagua board seem a bit funky... Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 560154e9a27f2f260fcb2dd18c488203246f257e Author: Alex Deucher Date: Mon Nov 22 17:56:34 2010 -0500 drm/radeon/kms: refactor atombios power state fetching The function was getting too large. Rework it to share more state better handle new power table formats. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e719ebd916c2ecee072affc9e7f0b92aa33c2f94 Author: Alex Deucher Date: Mon Nov 22 17:56:33 2010 -0500 drm/radeon/kms: add bo blit support for Ontario fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e33df25fecd31be889a878bc75313817bc292bac Author: Alex Deucher Date: Mon Nov 22 17:56:32 2010 -0500 drm/radeon/kms: add thermal sensor support for fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d5e455e48b095df7f5381dff028f8523aaf565a9 Author: Alex Deucher Date: Mon Nov 22 17:56:29 2010 -0500 drm/radeon/kms: fill in GPU init for AMD Ontario Fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 958261d1e8755d1423beb0951ed0b9552c96f638 Author: Alex Deucher Date: Mon Nov 22 17:56:30 2010 -0500 drm/radeon/kms: add radeon_asic struct for AMD Ontario fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 180074010c6a8d1948638b4a136d2bd8111f4459 Author: Alex Deucher Date: Mon Nov 22 17:56:28 2010 -0500 drm/radeon/kms: evergreen.c updates for fusion fusion chips only have 2 crtcs. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6eb18f8b6006b0e869a8484b1daaa63adce1b73e Author: Alex Deucher Date: Mon Nov 22 17:56:27 2010 -0500 drm/radeon/kms: MC setup changes for fusion APUs - CONFIG_MEMSIZE is in bytes on fusion. - FB_BASE and FB_TOP are finer grained. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 0ef0c1f7349e782f6c79cb7e4bf8a4c3ce3371c6 Author: Alex Deucher Date: Mon Nov 22 17:56:26 2010 -0500 drm/radeon/kms: move r7xx/evergreen to its own vram_gtt setup function MC_VM_FB_LOCATION is at a different offset between r6xx and r7xx/evergreen. The location is needed for vram setup on fusion chips. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4339c442c0736db42329b68602308e95bcc75a30 Author: Alex Deucher Date: Mon Nov 22 17:56:25 2010 -0500 drm/radeon/kms: add support for ss overrides on Fusion APUs System specific spread spectrum overrides can be specified in the integrated system info table for Fusion APUs. This adds support for using those overrides. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit bf982ebf22d5d84dd4a2a8d8f1a11f75920020a7 Author: Alex Deucher Date: Mon Nov 22 17:56:24 2010 -0500 drm/radeon/kms: Add support for external encoders on fusion APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 4e8c65a1f9ee1a976d95c1d5d2027761aba2f1c3 Author: Alex Deucher Date: Mon Nov 22 17:56:23 2010 -0500 drm/radeon/kms: atom changes for DCE4.1 devices Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 2f062fda4f83932b87b3b6c903eeade43422245a Author: Alex Deucher Date: Mon Nov 22 17:56:22 2010 -0500 drm/radeon/kms: add new family id for AMD Ontario APUs Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 603a9da37b83c2b4cc4495ecab7916f45cf5837e Author: Alex Deucher Date: Mon Nov 22 17:56:21 2010 -0500 drm/radeon/kms: upstream power table updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 1422ef52efa2b9abcf8e9d4d641f3a12579f1027 Author: Alex Deucher Date: Mon Nov 22 17:56:20 2010 -0500 drm/radeon/kms: upstream atombios.h updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 5d68e501bf000b8b1696875455c7a556ce2e9c43 Author: Alex Deucher Date: Mon Nov 22 17:56:19 2010 -0500 drm/radeon/kms: upstream ObjectID.h updates Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9535ab7323351bacf02d82af79921df1d6594969 Author: Alex Deucher Date: Mon Nov 22 17:56:18 2010 -0500 drm/radeon/kms: setup mc chremap properly on r7xx/evergreen Should improve performance slightly and possibly fix some issues. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit f8afa42b01c7a9f45b7cbaadb0481a0eeb96f18d Author: Felix Fietkau Date: Mon Nov 22 18:26:51 2010 +0100 ath9k_htc: fix eeprom access wireless-testing commit a05b5d45049d60a06a1b12976150572304a51928 ath9k: add support for reading eeprom from platform data on PCI devices This change moved the initialization of the AH_USE_EEPROM flag from ath9k_hw to ath9k. This needs to be added to ath9k_htc as well Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 02d2ebb2a0aa2cae0446289c8f927067aec06079 Author: Felix Fietkau Date: Mon Nov 22 15:39:39 2010 +0100 ath9k_hw: fix A-MPDU key search issues on AR9003 Under load, a large number of frames can produce decryption errors, even when no key cache update is being done. Performing a key search for every single frame in an A-MPDU improves reliability. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7253965a1cfbd22dd20f92b7a054e831777e284e Author: Joe Perches Date: Sat Nov 20 18:39:03 2010 -0800 zd1211rw: Use const Mark arrays const that are unmodified after initializations. text data bss dec hex filename 19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.old 19291 56 4136 23483 5bbb drivers/net/wireless/zd1211rw/zd_chip.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit f4e16e41d62ddc75704a0344567a807ebb41a929 Author: Joe Perches Date: Sat Nov 20 18:39:01 2010 -0800 rt2x00: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 40197 56 8336 48589 bdcd drivers/net/wireless/rt2x00/rt2800lib.o.new 40205 56 8336 48597 bdd5 drivers/net/wireless/rt2x00/rt2800lib.o.old Signed-off-by: Joe Perches Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 22288a5847df30fb8ba298914f144c3b1d6e1fbe Author: Joe Perches Date: Sat Nov 20 18:39:00 2010 -0800 rndis_wlan: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 41757 2205 9896 53858 d262 drivers/net/wireless/rndis_wlan.o.old 41653 2205 9880 53738 d1ea drivers/net/wireless/rndis_wlan.o.new Changed functions rndis_set_oid and set_bssid to take const *'s. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit ff273b91ff04e6f232234b70c45101074a0daa27 Author: Joe Perches Date: Sat Nov 20 18:38:59 2010 -0800 ray_cs: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 42607 3581 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.new 42603 3585 8536 54724 d5c4 drivers/net/wireless/ray_cs.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 482e039f2a6546ee2ecf718ae6c02e84d1a7f00b Author: Joe Perches Date: Sat Nov 20 18:38:58 2010 -0800 libertas: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 3650 56 704 4410 113a drivers/net/wireless/libertas/rx.o.new 3695 56 704 4455 1167 drivers/net/wireless/libertas/rx.o.old 27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.new 27328 964 5240 33532 82fc drivers/net/wireless/libertas/cfg.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 20407ed8a5bb271dd8e8bd4678e1d3dadeb318bd Author: Joe Perches Date: Sat Nov 20 18:38:57 2010 -0800 iwlwifi: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 48644 57 12120 60821 ed95 drivers/net/wireless/b43/phy_n.o.new 48661 57 12120 60838 eda6 drivers/net/wireless/b43/phy_n.o.old 37906 86 7904 45896 b348 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.new 37937 86 7904 45927 b367 drivers/net/wireless/iwlwifi/iwl-agn-lib.o.old 37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.new 37781 523 6752 45056 b000 drivers/net/wireless/iwlwifi/iwl-3945.o.old Changed b43_nphy_write_clip_detection to take a const u16 * Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5b4bc649e18539a5d5a5482670d77f3f72de0eea Author: Joe Perches Date: Sat Nov 20 18:38:56 2010 -0800 b43: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 5502 56 1336 6894 1aee drivers/net/wireless/b43/phy_common.o.new 5511 56 1336 6903 1af7 drivers/net/wireless/b43/phy_common.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 3370a895454ad814d0fb5f50352cea4e51d7392f Author: Joe Perches Date: Sat Nov 20 18:38:55 2010 -0800 atmel: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.old 42578 720 8528 51826 ca72 drivers/net/wireless/atmel.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5653a63d85300dbed71b76ab7ada03808bdfb170 Author: Joe Perches Date: Sat Nov 20 18:38:54 2010 -0800 carl9170: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.new 1897 56 672 2625 a41 drivers/net/wireless/ath/carl9170/cmd.o.old Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 07b2fa5a2368accf0fe6cb16e7eca6d1150554ed Author: Joe Perches Date: Sat Nov 20 18:38:53 2010 -0800 ath9k: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 11161 56 2136 13353 3429 drivers/net/wireless/ath/ath9k/ar9003_paprd.o.new 11167 56 2136 13359 342f drivers/net/wireless/ath/ath9k/ar9003_paprd.o.old 15428 56 3056 18540 486c drivers/net/wireless/ath/ath9k/eeprom_4k.o.old 15451 56 3056 18563 4883 drivers/net/wireless/ath/ath9k/eeprom_4k.o.new 14087 56 2560 16703 413f drivers/net/wireless/ath/ath9k/eeprom_9287.o.old 14036 56 2560 16652 410c drivers/net/wireless/ath/ath9k/eeprom_9287.o.new 10041 56 2384 12481 30c1 drivers/net/wireless/ath/ath9k/ani.o.new 10088 56 2384 12528 30f0 drivers/net/wireless/ath/ath9k/ani.o.old 9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.new 9316 1580 2304 13200 3390 drivers/net/wireless/ath/ath9k/htc_drv_init.o.old 16483 56 3432 19971 4e03 drivers/net/wireless/ath/ath9k/ar9003_phy.o.new 16517 56 3432 20005 4e25 drivers/net/wireless/ath/ath9k/ar9003_phy.o.old 18221 104 2960 21285 5325 drivers/net/wireless/ath/ath9k/rc.o.old 18203 104 2960 21267 5313 drivers/net/wireless/ath/ath9k/rc.o.new 19985 56 4288 24329 5f09 drivers/net/wireless/ath/ath9k/eeprom_def.o.new 20040 56 4288 24384 5f40 drivers/net/wireless/ath/ath9k/eeprom_def.o.old 23997 56 4984 29037 716d drivers/net/wireless/ath/ath9k/ar5008_phy.o.old 23846 56 4984 28886 70d6 drivers/net/wireless/ath/ath9k/ar5008_phy.o.new 24285 56 3184 27525 6b85 drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.old 24101 56 3184 27341 6acd drivers/net/wireless/ath/ath9k/ar9003_eeprom.o.new 6834 56 1032 7922 1ef2 drivers/net/wireless/ath/ath9k/ar9002_phy.o.old 6780 56 1032 7868 1ebc drivers/net/wireless/ath/ath9k/ar9002_phy.o.new 36211 64 8624 44899 af63 drivers/net/wireless/ath/ath9k/hw.o.new 36401 64 8624 45089 b021 drivers/net/wireless/ath/ath9k/hw.o.old 9281 56 1496 10833 2a51 drivers/net/wireless/ath/ath9k/ar9003_calib.o.old 9150 56 1496 10702 29ce drivers/net/wireless/ath/ath9k/ar9003_calib.o.new Use ARRAY_SIZE instead of a magic number. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 8b22523b045858042c6700f556f840853de163ea Author: Joe Perches Date: Sat Nov 20 18:38:52 2010 -0800 ath5k: Use static const Using static const generally increases object text and decreases data size. It also generally decreases overall object size. text data bss dec hex filename 11266 56 2464 13786 35da drivers/net/wireless/ath/ath5k/ani.o.old 11181 56 2464 13701 3585 drivers/net/wireless/ath/ath5k/ani.o.new Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 85be3d98dbc8d9cff9411c52c619c3752737b7b4 Author: Joe Perches Date: Sat Nov 20 18:38:51 2010 -0800 ar9170: Use const Mark an array const. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit a9ab21133581580f6907abbc33fd3870e75dc935 Author: Christian Lamparter Date: Sat Nov 20 16:53:26 2010 +0100 carl9170: fix init-self regression The commit: "carl9170: tx path review" introduced a regression. gcc (with -Winit-self): tx.c:1264: warning: ‘super’ is used uninitialized in this function Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3b1d6dfaaf89694c2aa56fe9a6b0f0221b98a209 Author: Huang Weiyi Date: Sat Nov 20 20:06:02 2010 +0800 libertas: remove duplicated #include Remove duplicated #include('s) in drivers/net/wireless/libertas/cfg.c Signed-off-by: Huang Weiyi Signed-off-by: John W. Linville commit e1566d1f322b41b1ac3acf33407a0cfe2a311b75 Author: Felix Fietkau Date: Sat Nov 20 03:08:46 2010 +0100 ath9k: fix recursive locking in the tx flush path Signed-off-by: Felix Fietkau Tested-by: Ben Greear Signed-off-by: John W. Linville commit 33e808c383477e821163f133c2e3e671879c28b6 Author: Dmitry Torokhov Date: Mon Nov 22 12:53:23 2010 -0800 Input: iforce - clean up Makefile Use -y notation to specify list of objects comprising iforce module and conditionally pull in USB and RS232 support. Also remove custom compiler flags and rely on general makefile rules for enabling warnings. Signed-off-by: Dmitry Torokhov commit ebde50d5a49122c164f81958a03993e1c947c0b6 Author: Dmitry Torokhov Date: Mon Nov 22 12:39:28 2010 -0800 Input: clean up Makefile (use input-core-y) The proper way to specify multi-source object is to use -y instead of -obj (which is deprecated) as it allows conditional inclusion of modules in the list. Signed-off-by: Dmitry Torokhov commit b5bb2f2beb4d54597fd54075480fc4874a9c08dc Author: Johannes Berg Date: Thu Nov 18 12:08:10 2010 -0800 iwlwifi: fix modular 3945 only build If only 3945 is selected, and is a module, build fails because iwl-legacy.c won't be compiled. Fix this by adding it to the build correctly. This doesn't happen for 4965 because it is a bool option, not tristate, since it's built into the AGN module. Reported-by: Randy Dunlap Tested-by: Randy Dunlap Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 18890d4b89d8507ad09289f6f57a71591c7e9e83 Author: Helmut Schaa Date: Fri Nov 19 08:11:01 2010 +0100 mac80211: Disable hw crypto for GTKs on AP VLAN interfaces When using AP VLAN interfaces, each VLAN interface should be in its own broadcast domain. Hostapd achieves this by assigning different GTKs to different AP VLAN interfaces. However, mac80211 drivers are not aware of AP VLAN interfaces and as such mac80211 sends the GTK to the driver in the context of the base AP mode interface. This causes problems when multiple AP VLAN interfaces are used since the driver will use the same key slot for the different GTKs (there's no way for the driver to distinguish the different GTKs from different AP VLAN interfaces). Thus, only the clients associated to one AP VLAN interface (the one that was created last) can actually use broadcast traffic. Fix this by not programming any GTKs for AP VLAN interfaces into the hw but fall back to using software crypto. The GTK for the underlying AP interface is still sent to the driver. That means, broadcast traffic to stations associated to an AP VLAN interface is encrypted in software whereas broadcast traffic to stations associated to the non-VLAN AP interface is encrypted in hardware. Cc: Johannes Berg Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit b2e253cf300c5e33f49b7dd8b593bfc722177401 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:09 2010 -0800 cfg80211: Fix regulatory bug with multiple cards and delays When two cards are connected with the same regulatory domain if CRDA had a delayed response then cfg80211's own set regulatory domain would still be the world regulatory domain. There was a bug on cfg80211's logic such that it assumed that once you pegged a request as the last request it was already the currently set regulatory domain. This would mean we would race setting a stale regulatory domain to secondary cards which had the same regulatory domain since the alpha2 would match. We fix this by processing each regulatory request atomically, and only move on to the next one once we get it fully processed. In the case CRDA is not present we will simply world roam. This issue is only present when you have a slow system and the CRDA processing is delayed. Because of this it is not a known regression. Without this fix when a delay is present with CRDA the second card would end up with an intersected regulatory domain and not allow it to use the channels it really is designed for. When two cards with two different regulatory domains were inserted you'd end up rejecting the second card's regulatory domain request. This fails with mac80211_hswim's regtest=2 (two requests, same alpha2) and regtest=3 (two requests, different alpha2) module parameter options. This was reproduced and tested against mac80211_hwsim using this CRDA delayer: #!/bin/bash echo $COUNTRY >> /tmp/log sleep 2 /sbin/crda.orig And these regulatory tests: modprobe mac80211_hwsim regtest=2 modprobe mac80211_hwsim regtest=3 Reported-by: Mark Mentovai Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit b0e2880b0518ad11af20c7c93ec5cac93f9f03b0 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:08 2010 -0800 cfg80211: move mutex locking to reg_process_pending_hints() This will be required in the next patch and it makes the next patch easier to review. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit f333a7a2f49e2a9b46f8d18962bd750b18beeecd Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:07 2010 -0800 cfg80211: move reg_work and reg_todo above These will be used earlier in the next few patches. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit 31e99729ae66d8b74316547c40eed15172f14ea8 Author: Luis R. Rodriguez Date: Wed Nov 17 21:46:06 2010 -0800 cfg80211: put core regulatory request into queue This will simplify the synchronization for pending requests. Without this we have a race between the core and when we restore regulatory settings, although this is unlikely its best to just avoid that race altogether. Signed-off-by: Luis R. Rodriguez Tested-by: Mark Mentovai Tested-by: Bruno Randolf Signed-off-by: John W. Linville commit 8ce469999552b0c3325350cd9b4be417f2bbfc23 Author: Rafał Miłecki Date: Wed Nov 17 22:14:37 2010 +0100 b43: rfkill: use HI enabled bit for all devices Devices which use LO enabled bit are covered by b43legacy Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 176bfc44417544724e6df0831a7f576f4a56283d Author: Daniel Walker Date: Tue Sep 7 13:33:05 2010 -0700 arm: kconfig: dis-allow hotplug on MSM MSM doesn't support hotplug, so we prevent it from being selected in Kconfig. Signed-off-by: Daniel Walker commit 89c3dedf477da9c8d42d3a63d16875e52f74108b Author: Daniel Walker Date: Mon Nov 22 12:35:41 2010 -0800 arm: kconfig: enable SMP for MSM targets This just adds ARCH_MSM_SCORPIONMP to allow SMP selection for MSM. MSM is unique in that it doesn't enable SCU or TWD. Signed-off-by: Daniel Walker commit 8933f90c777c5728822206a2313c9c1361f5274f Author: Rafał Miłecki Date: Thu Oct 14 22:58:58 2010 +0200 b43: N-PHY: add 2056 radio channels tables Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit cbe80def41f2f12b1b4f8b5c4eb048d50d842d6e Merge: c7b6429 eba19fd Author: Mark Brown Date: Mon Nov 22 20:33:12 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit c7b642911ea0fa9168425757752f094a1255209a Author: Axel Lin Date: Mon Nov 22 08:34:07 2010 +0800 ASoC: Fix a memory leak in alc5623_i2c_probe error path Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 840fd8ff64f7b6c9cbfa9b7d0419f015f33303ff Merge: b84a7d3 9e2e742 Author: John W. Linville Date: Mon Nov 22 15:28:30 2010 -0500 Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit eb06acdc85585f28864261f28659157848762ee4 Author: Sridhar Samudrala Date: Thu Oct 28 13:10:50 2010 +0000 macvlan: Introduce 'passthru' mode to takeover the underlying device With the current default 'vepa' mode, a KVM guest using virtio with macvtap backend has the following limitations. - cannot change/add a mac address on the guest virtio-net - cannot create a vlan device on the guest virtio-net - cannot enable promiscuous mode on guest virtio-net To address these limitations, this patch introduces a new mode called 'passthru' when creating a macvlan device which allows takeover of the underlying device and passing it to a guest using virtio with macvtap backend. Only one macvlan device is allowed in passthru mode and it inherits the mac address from the underlying device and sets it in promiscuous mode to receive and forward all the packets. Signed-off-by: Sridhar Samudrala ------------------------------------------------------------------------- Signed-off-by: David S. Miller commit e5700c740da2cb9f5a3aa978cd1fa3a79916ba04 Author: Tracey Dent Date: Sun Nov 21 15:03:28 2010 +0000 Net: wanrouter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit fdb26195f494988fc155c204aab0f0953ba7ec6f Author: Tracey Dent Date: Sun Nov 21 15:03:27 2010 +0000 Net: sunrpc: auth_gss: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 9ed05ad3c0629f434b18d20c51162f9bbb4f5d31 Author: Tracey Dent Date: Sun Nov 21 15:03:26 2010 +0000 Net: rxrpc: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 094f2faaa2c4973e50979158f655a1d31a97ba98 Author: Tracey Dent Date: Sun Nov 21 15:03:25 2010 +0000 Net: rds: Makefile: Remove deprecated items Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. Last but not least, took out if-conditionals. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 927a41f50c83b539fde5c01911f4968d717199bf Author: Tracey Dent Date: Sun Nov 21 15:03:24 2010 +0000 Net: phonet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 64387df8da1e4f178a47d53930288a46a357a479 Author: Tracey Dent Date: Sun Nov 21 15:03:23 2010 +0000 Net: lapb: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 94ee288e94ab31cefe2c5af3b59c25a1374ca3e5 Author: Tracey Dent Date: Sun Nov 21 15:03:22 2010 +0000 Net: irda: irnet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit cd30c62024904951392e21a200fe5427a6286736 Author: Tracey Dent Date: Sun Nov 21 15:03:21 2010 +0000 Net: irda: irlan: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit f91c4ae4989322ed5cd10b5247e1a7bd3868a84e Author: Tracey Dent Date: Sun Nov 21 15:03:20 2010 +0000 Net: irda: ircomm: Makefile: Remove deprecated kbuild goal defintions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 4de58dfebe6882dc1e8e8dc5ec062e28e99623cd Author: Tracey Dent Date: Sun Nov 21 15:03:19 2010 +0000 Net: ipv6: netfiliter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 6b8ff8c517008d93a6da62b106072a12dea8cb7c Author: Tracey Dent Date: Sun Nov 21 15:03:18 2010 +0000 Net: ipv4: netfilter: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit cc0bdac399b1881626cd5512f292e396c9c96685 Author: Tracey Dent Date: Sun Nov 21 15:03:17 2010 +0000 Net: econet: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 22674a24b44ac53f244ef6edadd02021a270df5a Author: Tracey Dent Date: Sun Nov 21 15:03:16 2010 +0000 Net: dns_resolver: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit fa13bc3daa5954ce58f68fd34fb1611df6ea6e6f Author: Tracey Dent Date: Sun Nov 21 15:03:15 2010 +0000 Net: ceph: Makefile: remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit bac14e017830bd204b3a1bd55f42b0841c02e995 Author: Tracey Dent Date: Sun Nov 21 15:03:14 2010 +0000 Net: can: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit a3106d032fb17283c96fa041f8285e6926ae074d Author: Tracey Dent Date: Sun Nov 21 15:03:13 2010 +0000 Net: caif: Makefile: Remove deprecated items Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Also, use the ccflags-$ flag instead of EXTRA_CFLAGS because EXTRA_CFLAGS is deprecated and should now be switched. Last but not least, took out if-conditionals. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit 87217502d4f45a9925c5eda5b2179f1220e87537 Author: Tracey Dent Date: Sun Nov 21 15:03:12 2010 +0000 Net: bluetooth: Makefile: Remove deprecated kbuild goal definitions Changed Makefile to use -y instead of -objs because -objs is deprecated and not mentioned in Documentation/kbuild/makefiles.txt. Signed-off-by: Tracey Dent Signed-off-by: David S. Miller commit b84a7d3d9e7cd5a25f4fd32142cebdf4481a74a4 Author: Juuso Oikarinen Date: Mon Nov 22 12:59:08 2010 +0200 wl12xx: Unset bssid filter, ssid and bssid from firmware on disassoc On the disassociation event from the mac80211, the wl12xx driver does not clear the chipset configuration related to the AP - i.e. it does not perform a DISCONNECT and then a JOIN with zero SSID and dummy BSSID. Also, it does not unset the BSSID filter. Often this is not a problem, as the above is performed upon entering idle state. But if a scenario arises where a new association is attempted without cycling through idle state, the new association will fail. Fix this by resetting the firmware state on disassociation. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 68d069c45f73e8aeda0249891daec1f7e2f0e067 Author: Arik Nemtsov Date: Mon Nov 8 10:51:07 2010 +0100 wl1271: add support for HW TX fragmentation Indicate to mac80211 we support HW fragmentation. Support updates of the fragmentation threshold via the set_frag_threshold callback. Signed-off-by: Arik Nemtsov Signed-off-by: Luciano Coelho commit fa97f46b30357a50f3ee193e6f82864f95bc55ec Author: Juuso Oikarinen Date: Wed Nov 10 11:27:20 2010 +0100 Revert "wl1271: Change supported channel order for a more optimal scan" This reverts commit fa21c7a9e4be439e217fe72edbd39b643b643791. The reverted patch caused more harm than benefit. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Tested-by: Tuomas Katila Signed-off-by: Luciano Coelho commit b7417d930afdc214daa24299912d984e7f4f390a Author: Juuso Oikarinen Date: Wed Nov 10 11:27:19 2010 +0100 wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies The wl1271 does not support radar detection. Hence, prevent ad-hoc and active scanning on frequencies requiring DFS. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 91433029e42e58d8536299f32fa55cf589adff35 Author: Gery Kahn Date: Sun Nov 7 10:04:20 2010 +0100 wl1271: cleanup unused code of calibration structures The cleanup unused code for calibration procedures. Signed-off-by: Gery Kahn Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 00d201001bd4e8a46e3d03c970abcb72256c368b Author: Shahar Levi Date: Mon Nov 8 11:20:10 2010 +0000 wl1271: Change wl12xx Files Names All files name prefix removed due to the fact that wl12xx driver supports wl1271 and wl1273. Also the definition in Kconfig and header files changed respectively. Signed-off-by: Shahar Levi Signed-off-by: Luciano Coelho commit 851cad5aa11a0692c4c92ebbfa94d06564034dcc Author: Jarkko Nikula Date: Sun Nov 21 19:48:47 2010 +0200 ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h There is no need anymore to include soc.h in soc-dapm.h and soc-dai.h as drivers are converted to include only soc.h. Thanks to Lars-Peter Clausen for pointing out the issue. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 0d911baebf983931cb37e25b36c3371d9e4b5196 Author: Jarkko Nikula Date: Sun Nov 21 19:48:46 2010 +0200 ASoC: Do not include soc-dai.h There is no need to include soc-dai.h since soc.h includes it. Convert drivers to include only soc.h. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 505fb824e754efcc9702ce68d3911e7b86d3c690 Author: Jarkko Nikula Date: Sun Nov 21 19:48:45 2010 +0200 ASoC: Do not include soc-dapm.h There is no need to include soc-dapm.h since soc.h includes it. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 1c8f2c4287bcc1eb596149b2b36be5c809598926 Author: Jarkko Nikula Date: Sun Nov 21 19:48:44 2010 +0200 ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c Commit ce6120c require that soc-dapm.h cannot be included before soc.h but these two drivers were not checked. Fix them by including only soc.h as it includes soc-dapm.h. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 691513f70d3957939a318da970987b876c720861 Author: Lin Ming Date: Mon Nov 22 14:03:28 2010 +0100 x86: Resume trampoline must be executable commit 5bd5a452(x86: Add NX protection for kernel data) marked the trampoline area NX - which unsurprisingly breaks resume and cpu hotplug. Revert the portion of that commit, which touches the trampoline. Originally-from: Lin Ming LKML-Reference: <1290410581.2405.24.camel@minggr.sh.intel.com> Cc: Matthieu Castet Cc: Siarhei Liakh Cc: Xuxian Jiang Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Andi Kleen Tested-by: Peter Zijlstra Signed-off-by: Thomas Gleixner commit 9d57883f08d3c0c111b50bf185dfee9731a12c76 Author: Takashi Iwai Date: Mon Nov 22 13:29:19 2010 +0100 ALSA: hda - Add a generic fixup callback for Realtek codecs Add a generic callback function for fixup elements. This can be used to do some unusual things like overriding the AMP cache, etc. Signed-off-by: Takashi Iwai commit 5f75377db4d8d81ca4465b54d3c339c70c6a0fa2 Author: Keith Packard Date: Mon Nov 22 09:24:22 2010 +0000 drm/i915: Fix restore of 965 fence regs since the register tracing change. We were reading our 64-bit value in I915_READ64 and returning 32 bits of it. The restoration of fence regs at resume then had a zero end value, and the fence had no effect. Version 2: Split register access functions into per-size versions Sharing code between different sizes seemed reasonable when we only needed a single copy, but as 64-bit access requires its own version, it makes sense to just split them out for each size. Reported-by: Peter Clifton Signed-off-by: Eric Anholt Signed-off-by: Keith Packard [ickle: use a macro to create the various read/write routines] Signed-off-by: Chris Wilson commit cff458c21063de960bde0e39770a0f4cd0477d95 Author: Eric Anholt Date: Thu Nov 18 09:31:14 2010 +0800 drm/i915: Add support for GPU reset on gen6. This has proven sufficient to recover from a hang of the GPU using the gem_bad_blit test while at the KMS console then starting X. When attempting the same during an X session, the timer doesn't appear to trigger. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit 75a6898ffd20a13aba8d03f005eb4ab940134fcb Author: Eric Anholt Date: Thu Nov 18 09:31:13 2010 +0800 drm/i915: Also reinit the BSD and BLT rings after a GPU reset. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit df9c2042858e85ab46731c13e708a5b0799db848 Author: Eric Anholt Date: Thu Nov 18 09:31:12 2010 +0800 drm/i915: Correct a comment about the use of the workqueue. It isn't used for the hangcheck, which does its work right from the timer trigger, but hangcheck can lead to error state recording, which is run off of the workqueue. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit a940a75a9a4b0f2523fd6d944d1c8099e7da9bbb Merge: 8b5abbe e624ae8 Author: Chris Wilson Date: Mon Nov 22 08:56:33 2010 +0000 Merge branch 'drm-intel-next' of arrandale:git/linux-2.6 into drm-intel-next commit e624ae8e0d4243e71daedce7570e91290438eaca Merge: c4a1d9e 4ab0fbd Author: Chris Wilson Date: Mon Nov 22 08:51:36 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c commit c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 Author: Chris Wilson Date: Sun Nov 21 13:12:35 2010 +0000 drm/i915: Capture interesting display registers on error When trying to diagnose mysterious errors on resume, capture the display register contents as well. Signed-off-by: Chris Wilson commit c724e8a9407683a8a2ee8eb00b972badf237bbe1 Author: Chris Wilson Date: Mon Nov 22 08:07:02 2010 +0000 drm/i915: Capture pinned buffers on error The pinned buffers are useful for diagnosing errors in setting up state for the chipset, which may not necessarily be 'active' at the time of the error, e.g. the cursor buffer object. Signed-off-by: Chris Wilson commit 109fef9edcc100952eec980acbc2e1295627fbab Author: Clemens Ladisch Date: Thu Nov 18 09:53:54 2010 +0100 ALSA: timer: automatically load the high-resolution timer Increase the default timer limit so that snd-hrtimer.ko can be automatically loaded when needed, e.g., when used as the default sequencer timer. This replaces the check for the obsolete CONFIG_SND_HPET. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 47228e48aecdbec423a1275a5e27697d47f1f912 Author: Clemens Ladisch Date: Thu Nov 18 09:53:07 2010 +0100 ALSA: pcm: optimize xrun detection in no-period-wakeup mode Add a lightweight condition on top of the xrun checking so that we can avoid the division when the application is calling the update function often enough. Suggested-by: Jaroslav Kysela Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 59ff878ffb26bc0be812ca8295799164f413ae88 Author: Clemens Ladisch Date: Thu Nov 18 09:43:52 2010 +0100 ALSA: pcm: detect xruns in no-period-wakeup mode When period wakeups are disabled, successive calls to the pointer update function do not have a maximum allowed distance, so xruns cannot be detected with the pointer value only. To detect xruns, compare the actually elapsed time with the time that should have theoretically elapsed since the last update. When the hardware pointer has wrapped around due to an xrun, the actually elapsed time will be too big by about hw_ptr_buffer_jiffies. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 075140ea8bf1405057c072a84ccf4e0d3f2c76f5 Author: Clemens Ladisch Date: Mon Nov 15 10:50:37 2010 +0100 ALSA: oxygen: support for period wakeup disabling Allow disabling period wakeup interrupts for all PCM streams. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 7bb8fb70c491bd6f5ec99728db8d1b5f43b95471 Author: Clemens Ladisch Date: Mon Nov 15 10:49:47 2010 +0100 ALSA: hda-intel: support for period wakeup disabling Allow disabling period wakeup interrupts for HDA PCM streams. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit ab69a4904b5dd4d7cd6996587ba066bca8d13838 Author: Clemens Ladisch Date: Mon Nov 15 10:46:23 2010 +0100 ALSA: pcm: support for period wakeup disabling This patch allows to disable period interrupts which are not needed when the application relies on a system timer to wake-up and refill the ring buffer. The behavior of the driver is left unchanged, and interrupts are only disabled if the application requests this configuration. The behavior in case of underruns is slightly different, instead of being detected during the period interrupts the underruns are detected when the application calls snd_pcm_update_avail, which in turns forces a refresh of the hw pointer and shows the buffer is empty. More specifically this patch makes a lot of sense when PulseAudio relies on timer-based scheduling to access audio devices such as HDAudio or Intel SST. Disabling interrupts removes two unwanted wake-ups due to period elapsed events in low-power playback modes. It also simplifies PulseAudio voice modules used for speech calls. To quote Lennart "This patch looks very interesting and desirable. This is something have long been waiting for." Support for this in hardware drivers is optional. Signed-off-by: Pierre-Louis Bossart Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit d2b88e4c103f37584dc81ef8a41ca584c1ce847b Merge: 2146dcf a1d71a2 Author: Takashi Iwai Date: Mon Nov 22 08:11:10 2010 +0100 Merge branch 'fix/misc' into topic/misc commit a1d71a2c91239ecc1c1f9c97a081d71ebd30bfe5 Author: Daniel T Chen Date: Sun Nov 21 14:01:14 2010 -0500 ALSA: hda: Use hp-laptop quirk to enable headphones automute for Asus A52J BugLink: https://launchpad.net/bugs/677652 The original reporter states that, in 2.6.35, headphones do not appear to work, nor does inserting them mute the A52J's onboard speakers. Upon inspecting the codec dump, it appears that the newly committed hp-laptop quirk will suffice to enable this basic functionality. Testing was done with an alsa-driver build from 2010-11-21. Reported-and-tested-by: Joan Creus Cc: [2.6.35+] Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 5ad57d20c91bdaf743bd8e3015df5a388314df8d Author: Vasiliy Kulikov Date: Sun Nov 21 20:40:07 2010 +0300 ALSA: snd-atmel-abdac: test wrong variable After clk_get() pclk is checked second time instead of sample_clk check. Signed-off-by: Vasiliy Kulikov Signed-off-by: Takashi Iwai commit 7974150c8524423f878e8269010e911c3cc7ddb8 Author: Andreas Mohr Date: Sun Nov 21 12:09:32 2010 +0100 ALSA: azt3328: period bug fix (for PA), add missing ACK on stop timer . Fix PulseAudio "ALSA driver bug" issue (if we have two alternated areas within a 64k DMA buffer, then max period size should obviously be 32k only). Back references: http://pulseaudio.org/wiki/AlsaIssues http://fedoraproject.org/wiki/Features/GlitchFreeAudio . In stop timer function, need to supply ACK in the timer control byte. . Minor log output correction When I did my first PA testing recently, the period size bug resulted in quite precisely observeable half-period-based playback distortion. PA-based operation is quite a bit more underrun-prone (despite its zero-copy optimizations etc.) than raw ALSA with this rather spartan sound hardware implementation on my puny Athlon. Note that even with this patch, azt3328 still doesn't work for both cases yet, PA tsched=0 and tsched (on tsched=0 it will playback tiny fragments of periods, leading to tiny stuttering sounds with some pauses in between, whereas with timer-scheduled operation playback works fine - minus some quite increased underrun trouble on PA vs. ALSA, that is). Signed-off-by: Andreas Mohr Signed-off-by: Takashi Iwai commit 86cbbad2b6712fbd25c07a17e86b4345cee82c6d Author: Daniel T Chen Date: Sat Nov 20 10:20:35 2010 -0500 ALSA: hda: Add Samsung R720 SSID for subwoofer pin fixup BugLink: https://launchpad.net/bugs/677830 The original reporter states that the subwoofer does not mute when inserting headphones. We need an entry for his machine's SSID in the subwoofer pin fixup list, so add it there (verified using hda_analyzer). Reported-and-tested-by: i-NoD Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 03b7a1ab557efe34e8f79b78660e514bd7374248 Author: David Henningsson Date: Tue Nov 9 14:35:30 2010 +0100 ALSA: HDA: Create mixers on ALC887 BugLink: http://launchpad.net/bugs/669092 ALC887 does not have any volume control ability on the mixer NIDs, so put the volume controls on the dac NIDs instead. Without this patch, ALC887 users cannot use alsamixer at all. Cc: stable@kernel.org Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit f09830ab15bfb7eb4e832e44189b5b5883309811 Author: Axel Lin Date: Sun Nov 21 22:27:13 2010 -0800 Input: ct82c710 - remove a redundant serio_register_port() We already call serio_register_port() in ct82c710_probe(), thus remove a redundant serio_register_port() in ct82c710_init(). Looks like this bug is introduced by 916d83cfe5da1cda454d8b0ae233f06b58bd7f91 "Input: ct82c710 - convert to the new platform device interface" [dtor@mail.ru: also move printk to where we register port] Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit ebcc019926269e7e123d55ec92ff00c2688ca343 Author: Axel Lin Date: Sun Nov 21 22:27:09 2010 -0800 Input: ams_delta_serio - fix wrong kfree in ams_delta_serio_exit serio_unregister_port() will call put_device() to free the memory. Thus remove kfree(ams_delta_serio) after serio_unregister_port(ams_delta_serio). Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 0e86eb29def648664c2c0fa605f5b5bad84247cb Author: Axel Lin Date: Sun Nov 21 22:23:06 2010 -0800 Input: ps2mult - fix wrong kfree in ps2mult_connect error path Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 147666fb3b93b8c484f562da33a37f886ddff768 Author: Thomas Hellstrom Date: Wed Nov 17 12:38:32 2010 +0000 drm/radeon: Use the ttm execbuf utilities Rather than re-implementing in the Radeon driver, Use the execbuf / cs / pushbuf utilities that comes with TTM. This comes with an even greater benefit now that many spinlocks have been optimized away... Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit eba67093f535322cb4f1c4b737319c0907a0c81d Author: Thomas Hellstrom Date: Thu Nov 11 09:41:57 2010 +0100 drm/ttm: Fix up io_mem_reserve / io_mem_free calling This patch attempts to fix up shortcomings with the current calling sequences. 1) There's a fastpath where no locking occurs and only io_mem_reserved is called to obtain needed info for mapping. The fastpath is set per memory type manager. 2) If the fastpath is disabled, io_mem_reserve and io_mem_free will be exactly balanced and not called recursively for the same struct ttm_mem_reg. 3) Optionally the driver can choose to enable a per memory type manager LRU eviction mechanism that, when io_mem_reserve returns -EAGAIN will attempt to kill user-space mappings of memory in that manager to free up needed resources Signed-off-by: Thomas Hellstrom Reviewed-by: Ben Skeggs Signed-off-by: Dave Airlie commit 65705962025df490d13df59ec57c5329d1bd0a16 Author: Thomas Hellstrom Date: Wed Nov 17 12:28:31 2010 +0000 drm/ttm/vmwgfx: Have TTM manage the validation sequence. Rather than having the driver supply the validation sequence, leave that responsibility to TTM. This saves some confusion and a function argument. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 95762c2b34069bf4adb7929969f1f5f5fc8a38df Author: Thomas Hellstrom Date: Wed Nov 17 12:28:30 2010 +0000 drm/ttm: Improved fencing of buffer object lists Drastically reduce the number of spin lock / unlock operations by performing unreserving and fencing under global locks. Signed-off-by: Thomas Hellstrom Reviewed-by: Jerome Glisse Signed-off-by: Dave Airlie commit 702adba22433c175e8429a47760f35ca16caf1cd Author: Thomas Hellstrom Date: Wed Nov 17 12:28:29 2010 +0000 drm/ttm/radeon/nouveau: Kill the bo lock in favour of a bo device fence_lock The bo lock used only to protect the bo sync object members, and since it is a per bo lock, fencing a buffer list will see a lot of locks and unlocks. Replace it with a per-device lock that protects the sync object members on *all* bos. Reading and setting these members will always be very quick, so the risc of heavy lock contention is microscopic. Note that waiting for sync objects will always take place outside of this lock. The bo device fence lock will eventually be replaced with a seqlock / rcu mechanism so we can determine that a bo is idle under a rcu / read seqlock. However this change will allow us to batch fencing and unreserving of buffers with a minimal amount of locking. Signed-off-by: Thomas Hellstrom Reviewed-by: Jerome Glisse Signed-off-by: Dave Airlie commit 96726fe50feae74812a2ccf5d5da23cb01c0a413 Author: Thomas Hellstrom Date: Wed Nov 17 12:28:28 2010 +0000 drm/ttm: Don't deadlock on recursive multi-bo reservations Add an aid for the driver to detect deadlocks on multi-bo reservations Update documentation. Signed-off-by: Thomas Hellstrom Reviewed-by: Jerome Glisse Signed-off-by: Dave Airlie commit 68c4fa31aa52765314b4285a7835368ea35b509c Author: Thomas Hellstrom Date: Wed Nov 17 12:28:27 2010 +0000 drm/ttm: Optimize ttm_eu_backoff_reservation Avoid the ttm_bo_unreserve() spinlocks by calling ttm_eu_backoff_reservation_locked under the lru spinlock. Signed-off-by: Thomas Hellstrom Reviewed-by: Jerome Glisse Signed-off-by: Dave Airlie commit 2357cbe5f4ca8a52329c2c2a26b68839870d5d43 Author: Thomas Hellstrom Date: Tue Nov 16 15:21:08 2010 +0100 drm/ttm: Use kref_sub instead of repeatedly calling kref_put Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit ecf7ace9a8450303a987aa8364e53860cd50e554 Author: Thomas Hellstrom Date: Tue Nov 16 15:21:07 2010 +0100 kref: Add a kref_sub function Makes it possible to optimize batched multiple unrefs. Initial user will be drivers/gpu/ttm which accumulates unrefs to be processed outside of atomic code. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit d6ea88865d3e5b0c62040531310c1f2c6a994f46 Author: Dave Airlie Date: Mon Nov 22 13:24:40 2010 +1000 drm/ttm: Add a bo list reserve fastpath (v2) Makes it possible to reserve a list of buffer objects with a single spin lock / unlock if there is no contention. Should improve cpu usage on SMP kernels. v2: Initialize private list members on reserve and don't call ttm_bo_list_ref_sub() with zero put_count. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit b6724405bc67ef3ae1318002085cde382b12345f Author: Mario Kleiner Date: Sun Nov 21 10:59:03 2010 -0500 drm/kms/radeon: Use high precision timestamps for pageflip completion events. Signed-off-by: Mario Kleiner Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 3e4ea7421f45966c93c8cbe81569e8dc93a58b87 Author: Mario Kleiner Date: Sun Nov 21 10:59:02 2010 -0500 drm/kms/radeon: Reorder vblank and pageflip interrupt handling. In the vblank irq handler, calls to actual vblank handling, or at least drm_handle_vblank(), need to happen before calls to radeon_crtc_handle_flip(). Reason: The high precision pageflip timestamping and some other pageflip optimizations will need the updated vblank count and timestamps for the current vblank interval. These are calculated in drm_handle_vblank(), therefore it must go first. Signed-off-by: Mario Kleiner Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 6f34be50bd1bdd2ff3c955940e033a80d05f248a Author: Alex Deucher Date: Sun Nov 21 10:59:01 2010 -0500 drm/radeon/kms: add pageflip ioctl support (v3) This adds support for dri2 pageflipping. v2: precision updates from Mario Kleiner. v3: Multihead fixes from Mario Kleiner; missing crtc offset add note about update pending bit on pre-avivo chips Signed-off-by: Alex Deucher Signed-off-by: Mario Kleiner Signed-off-by: Dave Airlie commit f5a8020903932624cf020dc72455a10a3e005087 Author: Mario Kleiner Date: Sat Oct 23 04:42:17 2010 +0200 drm/kms/radeon: Add support for precise vblank timestamping. This patch adds new functions for use by the drm core: .get_vblank_timestamp() provides a precise timestamp for the end of the most recent (or current) vblank interval of a given crtc, as needed for the DRI2 implementation of the OML_sync_control extension. It is a thin wrapper around the drm function drm_calc_vbltimestamp_from_scanoutpos() which does almost all the work and is shared across drivers. .get_scanout_position() provides the current horizontal and vertical video scanout position and "in vblank" status of a given crtc, as needed by the drm for use by drm_calc_vbltimestamp_from_scanoutpos(). The function is also used by the dynamic gpu reclocking code to determine when it is safe to reclock inside vblank. For that purpose radeon_pm_in_vbl() is modified to accomodate a small change in the function prototype of the radeon_get_crtc_scanoutpos() which is hooked up to .get_scanout_position(). This code has been tested on AVIVO hardware, a RV530 (ATI Mobility Radeon X1600) in a Intel Core-2 Duo MacBookPro and some R600 variant (FireGL V7600) in a single cpu AMD Athlon 64 PC. Signed-off-by: Mario Kleiner Reviewed-by: Alex Deucher Signed-off-by: Dave Airlie commit 27641c3f003e7f3b6585c01d8a788883603eb262 Author: Mario Kleiner Date: Sat Oct 23 04:20:23 2010 +0200 drm/vblank: Add support for precise vblank timestamping. The DRI2 swap & sync implementation needs precise vblank counts and precise timestamps corresponding to those vblank counts. For conformance to the OpenML OML_sync_control extension specification the DRM timestamp associated with a vblank count should correspond to the start of video scanout of the first scanline of the video frame following the vblank interval for that vblank count. Therefore we need to carry around precise timestamps for vblanks. Currently the DRM and KMS drivers generate timestamps ad-hoc via do_gettimeofday() in some places. The resulting timestamps are sometimes not very precise due to interrupt handling delays, they don't conform to OML_sync_control and some are wrong, as they aren't taken synchronized to the vblank. This patch implements support inside the drm core for precise and robust timestamping. It consists of the following interrelated pieces. 1. Vblank timestamp caching: A per-crtc ringbuffer stores the most recent vblank timestamps corresponding to vblank counts. The ringbuffer can be read out lock-free via the accessor function: struct timeval timestamp; vblankcount = drm_vblank_count_and_time(dev, crtcid, ×tamp). The function returns the current vblank count and the corresponding timestamp for start of video scanout following the vblank interval. It can be used anywhere between enclosing drm_vblank_get(dev, crtcid) and drm_vblank_put(dev,crtcid) statements. It is used inside the drmWaitVblank ioctl and in the vblank event queueing and handling. It should be used by kms drivers for timestamping of bufferswap completion. The timestamp ringbuffer is reinitialized each time vblank irq's get reenabled in drm_vblank_get()/ drm_update_vblank_count(). It is invalidated when vblank irq's get disabled. The ringbuffer is updated inside drm_handle_vblank() at each vblank irq. 2. Calculation of precise vblank timestamps: drm_get_last_vbltimestamp() is used to compute the timestamp for the end of the most recent vblank (if inside active scanout), or the expected end of the current vblank interval (if called inside a vblank interval). The function calls into a new optional kms driver entry point dev->driver->get_vblank_timestamp() which is supposed to provide the precise timestamp. If a kms driver doesn't implement the entry point or if the call fails, a simple do_gettimeofday() timestamp is returned as crude approximation of the true vblank time. A new drm module parameter drm.timestamp_precision_usec allows to disable high precision timestamps (if set to zero) or to specify the maximum acceptable error in the timestamps in microseconds. Kms drivers could implement their get_vblank_timestamp() function in a gpu specific way, as long as returned timestamps conform to OML_sync_control, e.g., by use of gpu specific hardware timestamps. Optionally, kms drivers can simply wrap and use the new utility function drm_calc_vbltimestamp_from_scanoutpos(). This function calls a new optional kms driver function dev->driver->get_scanout_position() which returns the current horizontal and vertical video scanout position of the crtc. The scanout position together with the drm_display_timing of the current video mode is used to calculate elapsed time relative to start of active scanout for the current video frame. This elapsed time is subtracted from the current do_gettimeofday() time to get the timestamp corresponding to start of video scanout. Currently non-interlaced, non-doublescan video modes, with or without panel scaling are handled correctly. Interlaced/ doublescan modes are tbd in a future patch. 3. Filtering of redundant vblank irq's and removal of some race-conditions in the vblank irq enable/disable path: Some gpu's (e.g., Radeon R500/R600) send spurious vblank irq's outside the vblank if vblank irq's get reenabled. These get detected by use of the vblank timestamps and filtered out to avoid miscounting of vblanks. Some race-conditions between the vblank irq enable/disable functions, the vblank irq handler and the gpu itself (updating its hardware vblank counter in the "wrong" moment) are fixed inside vblank_disable_and_save() and drm_update_vblank_count() by use of the vblank timestamps and a new spinlock dev->vblank_time_lock. The time until vblank irq disable is now configurable via a new drm module parameter drm.vblankoffdelay to allow experimentation with timeouts that are much shorter than the current 5 seconds and should allow longer vblank off periods for better power savings. Followup patches will use these new functions to implement precise timestamping for the intel and radeon kms drivers. Signed-off-by: Mario Kleiner Signed-off-by: Dave Airlie commit 551eaff1b384cc107eab6332ba8424b3ca1f304b Author: Eric Dumazet Date: Sun Nov 21 10:26:44 2010 -0800 pktgen: allow faster module unload Unloading pktgen module needs ~6 seconds on a 64 cpus machine, to stop 64 kthreads. Add a pktgen_exiting variable to let kernel threads die faster, so that kthread_stop() doesnt have to wait too long for them. This variable is not tested in fast path. Note : Before exiting from pktgen_thread_worker(), we must make sure kthread_stop() is waiting for this thread to be stopped, like its done in kernel/softirq.c Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 20a95a2169d1cd3da50cf65ba882d0e27a4a2d4f Author: Jan Engelhardt Date: Sat Nov 20 18:07:21 2010 +0000 netns: let net_generic take pointer-to-const args This commit is same in nature as v2.6.37-rc1-755-g3654654; the network namespace itself is not modified when calling net_generic, so the parameter can be const. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit bbce5a59e4e0e6e1dbc85492caaf310ff6611309 Author: Eric Dumazet Date: Sat Nov 20 07:31:54 2010 +0000 packet: use vzalloc() alloc_one_pg_vec_page() is supposed to return zeroed memory, so use vzalloc() instead of vmalloc() Signed-off-by: Eric Dumazet Cc: Neil Horman Acked-by: Neil Horman Signed-off-by: David S. Miller commit 9a2d09cf61c9d9f1b31998bec5363a583e4564a4 Author: Don Skidmore Date: Sun Nov 21 09:55:10 2010 -0800 ixgbe: update version number for ixgbe This will reflect addition of new X540 hardware Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dca25ebdd09c7aa877f00c2bdbd58c74a909c6f8 Author: Robert P. J. Day Date: Sun Nov 21 08:15:01 2010 -0500 Fix "forcably" comment typo Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 39de52104dd92bc0548a20201350111dc9317df9 Author: Jesper Juhl Date: Sat Nov 20 13:36:49 2010 -0800 Input: serio HIL MLC - don't deref null, don't leak and return proper error While reviewing various users of kernel memory allocation functions I came across drivers/input/serio/hil_mlc.c::hil_mlc_register() and noticed that: - it calls kzalloc() but fails to check for a NULL return before use. - it makes several allocations and if one fails it doesn't free the previous ones. - It doesn't return -ENOMEM in the failed memory allocation case (it just crashes). This patch corrects all of the above and also reworks the only caller of this function that I could find (drivers/input/serio/hp_sdc_mlc.c::hp_sdc_mlc_out()) so that it now checks the return value of hil_mlc_register() and properly propagates it on failure and I also restructured the code to remove some labels and goto's to make it, IMHO nicer to read. Signed-off-by: Jesper Juhl Tested-by: Helge Deller Acked-by: Helge Deller Signed-off-by: Dmitry Torokhov commit d9cf837ef9629ab34167bd6fc0141383ddb8813a Author: Corey Ashford Date: Fri Nov 19 17:37:24 2010 -0800 perf stat: Change and clean up sys_perf_event_open error handling This patch makes several changes to "perf stat": - "perf stat" will no longer go ahead and run the application when one or more of the specified events could not be opened. - Use error() and die() instead of pr_err() so that the output is more consistent with "perf top" and "perf record". - Handle permission errors in a more robust way, and in a similar way to "perf record" and "perf top". In addition, the sys_perf_event_open() error handling of "perf top" and "perf record" is made more consistent and adds the following phrase when an event doesn't open (with something ther than an access or permission error): "/bin/dmesg may provide additional information." This is added because kernel code doesn't have a good way of expressing detailed errors to user space, so its only avenue is to use printk's. However, many users may not think of looking at dmesg to find out why an event is being rejected. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Ian Munsie Cc: Michael Ellerman LKML-Reference: <1290217044-26293-1-git-send-email-cjashfor@linux.vnet.ibm.com> Signed-off-by: Corey Ashford Signed-off-by: Arnaldo Carvalho de Melo commit 9cdca869724e766eb48c061967cb777ddb436c76 Author: Thomas Gleixner Date: Sat Nov 20 10:37:05 2010 +0100 x86: platform: Move iris to x86/platform where it belongs Signed-off-by: Thomas Gleixner commit b21bded7c006a29ccda0b8515c4ae3b49e3b599b Author: Vinod Koul Date: Fri Nov 19 15:10:39 2010 +0000 sst: log error returned by scu ipc read/write scu ipc driver fails sometimes to read/write. This add logs with register addr and ret code when these errors occur. Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 90abe60b32a4762fff9bef33295e08bc9bb355af Author: Vinod Koul Date: Fri Nov 19 15:09:50 2010 +0000 sst: Firmware error codes force number values To avoid mismatch in driver and firmware error codes assign specfic values to each enum. Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6f6ffec188b5416642b20ef14034d40cfeb3256e Author: Vinod Koul Date: Fri Nov 19 15:06:31 2010 +0000 sst: Change the SST driver PCM interface The PCM interface in SST driver is cmds only, this patch changes the interface to open, close and cmd interface. This allows SST driver to keep easy track of handles open Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4856ab33eb5c33bdf17a5a1bd8d720bffe5f6110 Author: Mark Allyn Date: Wed Nov 17 15:45:36 2010 -0800 Staging: sep: Introduce sep driver This driver is for the Security Processor, a dedicated encryption and decryption driver that is used on the Intel mobile platform. This has been checked with checkpatch and there are four warnings for lines over 80 charactors. There is one compile warning. This is for a function that is only used if the rar register driver is needed. There is an ifdef in a header file that stubs out the rar register driver if the rar register is not configured. This driver does add a configuration, which is CONFIG_DX_SEP. Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit d948d5f96a4b5923599a7a657dbbd8660b0f9fa5 Author: Randy Dunlap Date: Wed Nov 17 15:38:46 2010 -0800 staging: clearpad_tm1217 depends on INPUT clearpad_tm1217 driver uses many input_() interfaces, so it should depend on INPUT. clearpad_tm1217.c:(.text+0xf19ac): undefined reference to `input_unregister_device' clearpad_tm1217.c:(.text+0xf1b19): undefined reference to `input_event' clearpad_tm1217.c:(.text+0xf1b31): undefined reference to `input_event' clearpad_tm1217.c:(.text+0xf1bb4): undefined reference to `input_event' clearpad_tm1217.c:(.text+0xf1bf2): undefined reference to `input_event' drivers/built-in.o:clearpad_tm1217.c:(.text+0xf1c08): more undefined references to `input_event' follow clearpad_tm1217.c:(.text+0xf1df3): undefined reference to `input_allocate_device' clearpad_tm1217.c:(.text+0xf1eac): undefined reference to `input_set_abs_params' clearpad_tm1217.c:(.text+0xf1ed1): undefined reference to `input_set_abs_params' clearpad_tm1217.c:(.text+0xf1ed8): undefined reference to `input_register_device' clearpad_tm1217.c:(.text+0xf2040): undefined reference to `input_unregister_device' clearpad_tm1217.c:(.text+0xf204b): undefined reference to `input_free_device' Signed-off-by: Randy Dunlap Cc: Ramesh Agarwal Signed-off-by: Greg Kroah-Hartman commit 7716090be5603f1ad4df1379652b8d107c207f5c Author: Marek Belisko Date: Thu Nov 18 09:49:09 2010 +0100 staging: ft1000: Fix compilation warning. This patch fix following warning: drivers/staging/ft1000/ft1000-usb/ft1000_usb.c:67:22: warning: ‘pft1000info’ may be used uninitialized in this function Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 24d6050b352aa76364bd344c41b3e3e0f51466cc Author: Michael Hennerich Date: Fri Nov 19 15:16:46 2010 +0100 staging: iio: dac: Cleanup style - no functional changes Stick to the 80 character line limit at least for code Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit ece30c15921f94c1d58c494507f528c9482db409 Author: Michael Hennerich Date: Fri Nov 19 15:16:45 2010 +0100 staging: iio: dac: Use spi_device_id Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit df9cd1052079e5d0f88ed230276a17a49cc41045 Author: Michael Hennerich Date: Fri Nov 19 15:16:44 2010 +0100 staging: iio: dac: Use spi_write() and handle return value Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 51f8ad36022e880019e79a9dea2351cc47c739d7 Author: Michael Hennerich Date: Fri Nov 19 15:16:43 2010 +0100 staging: iio: dac: Update drivers to use new attribute naming Remove depreciated macro from header Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 5a7f4fddae8a50d076b5714f47936ea78e0c0858 Author: Michael Hennerich Date: Fri Nov 19 13:32:38 2010 +0100 staging: iio: dac: more consistent DAC sysfs attributes naming Align DAC sysfs attributes naming with the convention used by ADC Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 861f67031899b8ab909d672eaea85070317855c9 Author: Brett Rudley Date: Fri Nov 19 14:30:58 2010 -0800 staging: brcm80211: stragglers not handled by unifdef Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit f9ec972793fb61f6ec612ecee5b1cc6efeacfbd6 Author: Brett Rudley Date: Fri Nov 19 14:30:57 2010 -0800 staging: brcm80211: unifdef -UBCMSDIO Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit c73b9d6759993f521e3b0cb24abf74c4527469e3 Author: Brett Rudley Date: Fri Nov 19 14:30:56 2010 -0800 staging: brcm80211: remove bmac-only header files Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit f3ce1ef2f80627c2b6339bfc96ee5c1b189cac06 Author: Brett Rudley Date: Fri Nov 19 14:30:55 2010 -0800 staging: brcm80211: unifdef -UWLC_SPLIT Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 501c09346ce74ec688113d5c6b8a321514935228 Author: Brett Rudley Date: Fri Nov 19 14:30:54 2010 -0800 staging: brcm80211: unifdef -DWLC_LOW Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 02db6b4769e2465b872a6cd87465a3e20d4573ce Author: Brett Rudley Date: Fri Nov 19 14:30:53 2010 -0800 staging: brcm80211: unifdef -UWLC_LOW_ONLY Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 29efb1a9f450450e764d9901b434557349c3af53 Author: Brett Rudley Date: Fri Nov 19 14:30:52 2010 -0800 staging: brcm80211: unifdef -UWLC_HIGH_ONLY Part of BMAC removal. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 2cb8ada64f209c5c033f1821bbbc0e8d388cbf7f Author: Arend van Spriel Date: Thu Nov 18 20:46:44 2010 +0100 staging: brcm80211: replaced PKTSETLEN macro by native __skb_trim call - removed PKTSETLEN macro and used __skb_trim call instead. - removed unused macros PKTSETPOOL and PKTPOOL Reviewed-by: Henry Ptasinski Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit c303ecbda8b7c86975c4ba23f56b8cbe297cd060 Author: Arend van Spriel Date: Thu Nov 18 20:46:43 2010 +0100 staging: brcm80211: replace PKTPUSH and PKTPULL macros with native skbuff calls Replacing PKTPUSH by skb_push() call and PKTPULL by skb_pull() call to make it obvious what the operation is doing with the packet. Reviewed-by: Henry Ptasinski Reviewed-by: Brett Rudley Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman commit 26361116d7c94984a5fbdc1b6a11555a9dc33cf0 Author: Mike Rapoport Date: Wed Nov 17 10:00:00 2010 +0200 staging: brcm80211: brcmfmac: cleanup bcmsdh_(un)register Signed-off-by: Mike Rapoport Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 5dc177da85a813ff73c35f2d9edfb0bc2fe8271c Author: Mike Rapoport Date: Wed Nov 17 09:58:46 2010 +0200 staging: brcm80211: brcmfmac: remove PCI SDIO controller binding Signed-off-by: Mike Rapoport Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 1205065764f2eda3216ebe213143f69891ee3460 Author: Mi Jinlong Date: Thu Nov 11 18:03:40 2010 +0800 NFS4.1: Fix bug server don't reply the right fore_channel to client at create_session At the latest kernel(2.6.37-rc1), server just initialize the forechannel at init_forechannel_attrs, but don't reflect it to reply. After initialize the session success, we should copy the forechannel info to nfsd4_create_session struct. Reviewed-by: Benny Halevy Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit ced6dfe9fc7128995c6d60627938944b430d82c8 Author: Mi Jinlong Date: Thu Nov 11 18:03:50 2010 +0800 NFS4.1: server gets drc mem fail should reply error at create_session When server gets drc mem fail, it should reply error to client. Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit 044bc1d4324bfb34761cb361e404cb8d39c68777 Author: J. Bruce Fields Date: Fri Nov 12 14:36:06 2010 -0500 nfsd4: return serverfault on request for ssv We're refusing to support a mandatory features of 4.1, so serverfault seems the better error; see e.g.: http://www.ietf.org/mail-archive/web/nfsv4/current/msg07638.html Signed-off-by: J. Bruce Fields commit 5afa040b307952bb804eba34b21646da2842e14d Author: Mi Jinlong Date: Tue Nov 9 09:39:23 2010 +0800 NFSv4.1: Make sure nfsd can decode SP4_SSV correctly at exchange_id According to RFC, the argument of ssv_sp_parms4 is: struct ssv_sp_parms4 { state_protect_ops4 ssp_ops; sec_oid4 ssp_hash_algs<>; sec_oid4 ssp_encr_algs<>; uint32_t ssp_window; uint32_t ssp_num_gss_handles; }; If client send a exchange_id with SP4_SSV, server cann't decode the SP4_SSV's ssp_hash_algs and ssp_encr_algs arguments correctly. Because the kernel treat the two arguments as a signal sec_oid4 struct, but should be a set of sec_oid4 struct. Signed-off-by: Mi Jinlong Signed-off-by: J. Bruce Fields commit 9c335c0b8daf56b9f73479d00b1dd726e1fcca09 Author: J. Bruce Fields Date: Tue Oct 26 11:32:03 2010 -0400 svcrpc: fix wspace-checking race We call svc_xprt_enqueue() after something happens which we think may require handling from a server thread. To avoid such events being lost, svc_xprt_enqueue() must guarantee that there will be a svc_serv() call from a server thread following any such event. It does that by either waking up a server thread itself, or checking that XPT_BUSY is set (in which case somebody else is doing it). But the check of XPT_BUSY could occur just as someone finishes processing some other event, and just before they clear XPT_BUSY. Therefore it's important not to clear XPT_BUSY without subsequently doing another svc_export_enqueue() to check whether the xprt should be requeued. The xpo_wspace() check in svc_xprt_enqueue() breaks this rule, allowing an event to be missed in situations like: data arrives call svc_tcp_data_ready(): call svc_xprt_enqueue(): set BUSY find no write space svc_reserve(): free up write space call svc_enqueue(): test BUSY clear BUSY So, instead, check wspace in the same places that the state flags are checked: before taking BUSY, and in svc_receive(). Signed-off-by: J. Bruce Fields commit b176331627fccc726d28f4fc4a357d1f3c19dbf0 Author: J. Bruce Fields Date: Mon Oct 25 20:24:48 2010 -0400 svcrpc: svc_close_xprt comment Neil Brown had to explain to me why we do this here; record the answer for posterity. Signed-off-by: J. Bruce Fields commit f8c0d226fef05226ff1a85055c8ed663022f40c1 Author: J. Bruce Fields Date: Mon Oct 25 18:11:21 2010 -0400 svcrpc: simplify svc_close_all There's no need to be fooling with XPT_BUSY now that all the threads are gone. The list_del_init() here could execute at the same time as the svc_xprt_enqueue()'s list_add_tail(), with undefined results. We don't really care at this point, but it might result in a spurious list-corruption warning or something. And svc_close() isn't adding any value; just call svc_delete_xprt() directly. Signed-off-by: J. Bruce Fields commit ca7896cd83456082b1e78816cdf7e41658ef7bcd Author: J. Bruce Fields Date: Mon Oct 25 14:12:40 2010 -0400 nfsd4: centralize more calls to svc_xprt_received Follow up on b48fa6b99100dc7772af3cd276035fcec9719ceb by moving all the svc_xprt_received() calls for the main xprt to one place. The clearing of XPT_BUSY here is critical to the correctness of the server, so I'd prefer it to be obvious where we do it. The only substantive result is moving svc_xprt_received() after svc_receive_deferred(). Other than a (likely insignificant) delay waking up the next thread, that should be harmless. Also reshuffle the exit code a little to skip a few other steps that we don't care about the in the svc_delete_xprt() case. Signed-off-by: J. Bruce Fields commit 62bac4af3d778f6d06d351c0442008967c512588 Author: J. Bruce Fields Date: Mon Oct 25 12:50:15 2010 -0400 svcrpc: don't set then immediately clear XPT_DEFERRED There's no harm to doing this, since the only caller will immediately call svc_enqueue() afterwards, ensuring we don't miss the remaining deferred requests just because XPT_DEFERRED was briefly cleared. But why not just do this the simple way? Signed-off-by: J. Bruce Fields commit 43b0178eda1e7e5d1e205bbfd076ab5d6ecacc02 Author: Dan Carpenter Date: Wed Oct 27 23:19:04 2010 +0200 nfsd: fix NULL dereference in setattr() The original code would oops if this were called from nfsd4_setattr() because "filpp" is NULL. (Note this case is currently impossible, as long as we only give out read delegations.) Signed-off-by: Dan Carpenter Signed-off-by: J. Bruce Fields commit 09c5088e5c5993be217a2c85dca088147ffc9b72 Author: Shreyas Bhatewara Date: Fri Nov 19 10:55:24 2010 +0000 net-next: Add multiqueue support to vmxnet3 driver Add multiqueue support to vmxnet3 driver This change adds multiqueue and thus receive side scaling support to vmxnet3 device driver. Number of rx queues is limited to 1 in cases where MSI is not configured or one MSIx vector is not available per rx queue Signed-off-by: Shreyas Bhatewara Reviewed-by: Bhavesh Davda Signed-off-by: David S. Miller commit 24912420e923d56461b400d83f250a31bed8a964 Merge: 0670b8a 0302b86 Author: David S. Miller Date: Fri Nov 19 13:13:47 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bonding/bond_main.c net/core/net-sysfs.c net/ipv6/addrconf.c commit 124bf94a9f9b52341562628cd56b252e7d820ee8 Author: Uwe Kleine-König Date: Fri Nov 19 21:03:33 2010 +0100 ARM: imx: fix name for functions adding sdhci-esdhc-imx devices and restore alphabetic ordering. Signed-off-by: Uwe Kleine-König commit c496fa6bd5324ddce11e5e42670618ffb4d8f58d Author: Uwe Kleine-König Date: Tue Nov 16 23:24:21 2010 +0100 ARM: mx3/mx35_3ds: Add watchdog support This bases on a patch by Fabio Estevam who added the device before it was allocated dynamically. Cc: Fabio Estevam Signed-off-by: Uwe Kleine-König commit d690b4c4778096cde018709efd005dfef9714297 Author: Uwe Kleine-König Date: Tue Nov 16 21:27:33 2010 +0100 ARM: mx3: dynamically allocate imx-keypad devices Signed-off-by: Uwe Kleine-König commit 742269e2d971957c84f364c4e9f5c6439964ef01 Author: Uwe Kleine-König Date: Mon Nov 15 15:28:45 2010 +0100 ARM: mx3: dynamically allocate imx2-wdt devices Signed-off-by: Uwe Kleine-König commit 2d58de2805f93bdb8fa0608d98e1871bb28ec091 Author: Uwe Kleine-König Date: Mon Nov 15 11:57:49 2010 +0100 ARM: mx3: dynamically allocate mxc-ehci devices Signed-off-by: Uwe Kleine-König commit 9e1dde33876ba83ad586c336647fff133d0f5472 Author: Uwe Kleine-König Date: Fri Nov 12 16:40:06 2010 +0100 ARM: mx3: dynamically allocate fsl-usb2-udc devices While adapting the #defines for this I noticed that the offset used for USB HS on i.MX35 differs from the documented offset. I kept the working offset and commented that the documentation differs. Signed-off-by: Uwe Kleine-König commit fed3d35b06bf3f6a3383c2637d054823c563200b Author: Uwe Kleine-König Date: Fri Nov 12 11:49:34 2010 +0100 ARM: mx3: dynamically allocate mxc_rnga devices Signed-off-by: Uwe Kleine-König commit 6a697e3d310d79ea0e385975c57084ce22b04b36 Author: Uwe Kleine-König Date: Fri Nov 12 11:10:55 2010 +0100 ARM: mx3: dynamically register mxc-mmc devices Compared to the static devices the dynamic have a DMA resource. This should be save as it seems unused in the driver. Signed-off-by: Uwe Kleine-König commit a528bc87841d958bbd394abc9266aee9cdf45cb8 Author: Uwe Kleine-König Date: Fri Nov 12 10:11:42 2010 +0100 ARM: mx3: introduce SOC_IMX31 and SOC_IMX35 Additionally convert some known to be good usages to the new names. Signed-off-by: Uwe Kleine-König commit 86f8efdaab49f5710f0aa3a3c1d76edc1d3d0df9 Author: Uwe Kleine-König Date: Fri Nov 12 08:27:14 2010 +0100 ARM: mx3: use an MX35 constant in imx35 only code ... instead of MX3x Signed-off-by: Uwe Kleine-König commit d7e0951f929513ced7c57882d2f95d49a546e002 Author: Uwe Kleine-König Date: Thu Nov 11 18:50:50 2010 +0100 ARM: mx3: move registration of gpios to plat-mxc/gpio.c Signed-off-by: Uwe Kleine-König commit 972cc48207450ce6aeed416ac176fe4d0482a4a3 Author: Uwe Kleine-König Date: Thu Nov 11 18:35:01 2010 +0100 ARM: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC Some usages of ARCH_MX25 are assuming that if it is defined the other SoCs are undefined. Use SOC_IMX25 for the save places. Signed-off-by: Uwe Kleine-König commit 36a8cac9524bc67df2911cb3fbc349f87bcad37d Author: Uwe Kleine-König Date: Thu Nov 11 18:17:15 2010 +0100 ARM: imx: let the machines select SOC_IMX{21,27} This prepares multi-SoC kernel support. Signed-off-by: Uwe Kleine-König commit fd2fa2e3238197ef10101277dff67da10e68a61b Author: Uwe Kleine-König Date: Thu Nov 11 18:11:29 2010 +0100 ARM: imx: let IMX_HAVE_PLATFORM_IMX_FB select HAVE_FB_IMX This way FB_IMX can just depend on HAVE_FB_IMX and machines just need to select IMX_HAVE_PLATFORM_IMX_FB without bothering about HAVE_FB_IMX. Signed-off-by: Uwe Kleine-König commit e48ab1c16ff2af83e6a2a1228504710a5d339d08 Author: Uwe Kleine-König Date: Thu Nov 11 18:06:17 2010 +0100 ARM: imx: move mx25 support to mach-imx Signed-off-by: Uwe Kleine-König commit 2a8bd56a382ec0e24249b1adaca4f38bd529e825 Author: Uwe Kleine-König Date: Thu Nov 11 17:30:25 2010 +0100 ARM: mx25: remove now empty devices.h Signed-off-by: Uwe Kleine-König commit bb4c853ff18fe3b0e2aec45053c318479e0c55e3 Author: Uwe Kleine-König Date: Thu Nov 11 17:11:34 2010 +0100 ARM: mx25: dynamically allocate mx2-camera devices Signed-off-by: Uwe Kleine-König commit 00871505dcf15418aebc402db9f124dd2738fa2d Author: Uwe Kleine-König Date: Thu Nov 11 16:58:50 2010 +0100 ARM: mx25: dynamically allocate imx2-wdt devices Signed-off-by: Uwe Kleine-König commit bc95df78c4566327086d44f1bfab984a70dc4d6b Author: Rajeev Kumar Date: Fri Nov 19 12:41:19 2010 -0800 Input: add support for keyboards on ST SPEAr platform Signed-off-by: Rajeev Kumar Signed-off-by: Dmitry Torokhov commit 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 Author: andrew hendry Date: Thu Nov 18 13:21:35 2010 +0000 X25: remove bkl in routing ioctls Routing doesn't use the socket data and is protected by x25_route_list_lock Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 54aafbd4989a684ca876e49bf3e6eb931654dc02 Author: andrew hendry Date: Thu Nov 18 13:21:28 2010 +0000 X25: remove bkl in inq and outq ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 1ecd66bf2ce5e0f2bc72ffdeed814bb0e55a60dc Author: andrew hendry Date: Thu Nov 18 13:21:20 2010 +0000 X25: remove bkl in timestamp ioctls Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 70be998c2b44f942f11383496622500136816acb Author: andrew hendry Date: Thu Nov 18 13:20:57 2010 +0000 X25: pushdown bkl in ioctls Push down the bkl in the ioctls so they can be removed one at a time. Signed-off-by: Andrew Hendry Signed-off-by: David S. Miller commit 4aafd3f71a257a3522932944b5204262dfdff147 Author: Arnaldo Carvalho de Melo Date: Fri Nov 19 16:46:26 2010 -0200 perf tools: Change my maintainer address Also remove old snail mail address from CREDITS, moved years ago. LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit a71123977eb3c72dd5a8bac723b13faf9cdd2828 Author: Robert Morell Date: Tue Nov 16 14:16:33 2010 -0800 perf tools: Remove hardcoded include paths for elfutils This change removes the use of hardcoded absolute "/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes). Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory. Tested by building perf: - Cross-compiled for ARM on x86_64 - Built natively on x86_64 - Built on x86_64 with /usr/include/elfutils moved to another location and manually included in CFLAGS Acked-by: Masami Hiramatsu Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Ingo Molnar Cc: Masami Hiramatsu LKML-Reference: <1289945793-31441-1-git-send-email-rmorell@nvidia.com> Signed-off-by: Robert Morell Signed-off-by: Arnaldo Carvalho de Melo commit f5b4a9c3ab53d544a540a6f3a5d17184e374d91a Author: Stephane Eranian Date: Tue Nov 16 11:05:01 2010 +0200 perf stat: Add no-aggregation mode to -a This patch adds a new -A option to perf stat. If specified then perf stat does not aggregate counts across all monitored CPUs in system-wide mode, i.e., when using -a. This option is not supported in per-thread mode. Being able to get a per-cpu breakdown is useful to detect imbalances between CPUs when running a uniform workload than spans all monitored CPUs. The second version corrects the missing cpumap[] support, so that it works when the -C option is used. The third version fixes a missing cpumap[] in print_counter() and removes a stray patch in builtin-trace.c. Examples on a 4-way system: # perf stat -a -e cycles,instructions -- sleep 1 Performance counter stats for 'sleep 1': 9592808135 cycles 3490380006 instructions # 0.364 IPC 1.001584632 seconds time elapsed # perf stat -a -A -e cycles,instructions -- sleep 1 Performance counter stats for 'sleep 1': CPU0 2398163767 cycles CPU1 2398180817 cycles CPU2 2398217115 cycles CPU3 2398247483 cycles CPU0 872282046 instructions # 0.364 IPC CPU1 873481776 instructions # 0.364 IPC CPU2 872638127 instructions # 0.364 IPC CPU3 872437789 instructions # 0.364 IPC 1.001556052 seconds time elapsed Cc: David S. Miller Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Robert Richter LKML-Reference: <4ce257b5.1e07e30a.7b6b.3aa9@mx.google.com> Signed-off-by: Stephane Eranian Signed-off-by: Arnaldo Carvalho de Melo commit c26aed40f4fd18f86bcc6aba557cab700b129b73 Author: Eric Dumazet Date: Thu Nov 18 22:04:46 2010 +0000 filter: use reciprocal divide At compile time, we can replace the DIV_K instruction (divide by a constant value) by a reciprocal divide. At exec time, the expensive divide is replaced by a multiply, a less expensive operation on most processors. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 8c1592d68bc89248bfd0ee287648f41c1370d826 Author: Eric Dumazet Date: Thu Nov 18 21:56:38 2010 +0000 filter: cleanup codes[] init Starting the translated instruction to 1 instead of 0 allows us to remove one descrement at check time and makes codes[] array init cleaner. Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 4916a1083290edfb6cc53aa134f00597447de1ce Author: Pavankumar Kondeti Date: Tue Nov 9 15:41:29 2010 +0530 msm: io: Export __msm_ioremap This is required for modules to use ioremap() Signed-off-by: Pavankumar Kondeti Signed-off-by: Daniel Walker commit 93aaae2e01e57483256b7da05c9a7ebd65ad4686 Author: Eric Dumazet Date: Fri Nov 19 09:49:59 2010 -0800 filter: optimize sk_run_filter Remove pc variable to avoid arithmetic to compute fentry at each filter instruction. Jumps directly manipulate fentry pointer. As the last instruction of filter[] is guaranteed to be a RETURN, and all jumps are before the last instruction, we dont need to check filter bounds (number of instructions in filter array) at each iteration, so we remove it from sk_run_filter() params. On x86_32 remove f_k var introduced in commit 57fe93b374a6b871 (filter: make sure filters dont read uninitialized memory) Note : We could use a CONFIG_ARCH_HAS_{FEW|MANY}_REGISTERS in order to avoid too many ifdefs in this code. This helps compiler to use cpu registers to hold fentry and A accumulator. On x86_32, this saves 401 bytes, and more important, sk_run_filter() runs much faster because less register pressure (One less conditional branch per BPF instruction) # size net/core/filter.o net/core/filter_pre.o text data bss dec hex filename 2948 0 0 2948 b84 net/core/filter.o 3349 0 0 3349 d15 net/core/filter_pre.o on x86_64 : # size net/core/filter.o net/core/filter_pre.o text data bss dec hex filename 5173 0 0 5173 1435 net/core/filter.o 5224 0 0 5224 1468 net/core/filter_pre.o Signed-off-by: Eric Dumazet Acked-by: Changli Gao Signed-off-by: David S. Miller commit 0e341af835fdf553820a1fa98341b93ab32ce466 Author: Rabin Vincent Date: Sat Nov 6 23:03:53 2010 +0530 ARM: ftrace: enable function graph tracer Add the options to enable the function graph tracer on ARM. Function graph tracer support requires frame pointers, so exclude Thumb-2 and also make sure FRAME_POINTER gets enabled when FUNCTION_GRAPH_TRACER is used, since FUNCTION_TRACER doesn't "select FRAME_POINTER" when ARM_UNWIND is used. Therefore, with GCC 4.4.0+, you get plain function tracing without frame pointers, but you'll need them if you want function graph tracing. Acked-by: Catalin Marinas Signed-off-by: Rabin Vincent commit dd686eb13959e49a1112fd608c124ab711050582 Author: Rabin Vincent Date: Sat Nov 6 23:03:21 2010 +0530 ARM: ftrace: graph tracer + dynamic ftrace Support the graph tracer + dynamic ftrace combination on ARM. Signed-off-by: Rabin Vincent commit 376cfa8730c08c0394d0aa1d4a80fd8c9971f323 Author: Tim Bird Date: Sat Oct 9 22:24:38 2010 +0530 ARM: ftrace: function graph tracer support Cc: Tim Bird [rabin@rab.in: rebase on top of latest code, keep code in ftrace.c instead of separate file, check for ftrace_graph_entry also] Signed-off-by: Rabin Vincent commit d3b9dc9dd2b994f396741f7086ffe7a48bacb165 Author: Rabin Vincent Date: Thu Oct 7 17:39:47 2010 +0530 ARM: ftrace: use gas macros to avoid code duplication Use assembler macros to avoid copy/pasting code between the implementations of the two variants of the mcount call. Signed-off-by: Rabin Vincent commit 61b5cb1c3bff8875d2fd289c7b6ac344f95261fa Author: Rabin Vincent Date: Thu Oct 7 20:51:58 2010 +0530 ARM: place C irq handlers in IRQ_ENTRY for ftrace When FUNCTION_GRAPH_TRACER is enabled, place do_IRQ() and friends in the IRQ_ENTRY section so that the irq-related features of the function graph tracer work. Signed-off-by: Rabin Vincent commit 4d23033dfdbb0409dfebaf748ba37ac00ef39825 Author: Jiri Kosina Date: Fri Nov 19 17:06:41 2010 +0100 Don't touch blackfin with printk typo fixes This is a partial revert of b595076a ("tree-wide: fix comment/printk typos"), as blackfin tree is going to have completely different version of the code. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina commit ec763f0de879fa1a64b7641098271107f5e32c67 Author: Rabin Vincent Date: Fri Nov 19 21:11:02 2010 +0530 ARM: versatile: ensure sched_clock() is notrace Include sched.h to ensure sched_clock() has the notrace annotation. Signed-off-by: Rabin Vincent commit 042957801626465492b9428860de39a3cb2a8219 Author: Steven Rostedt Date: Fri Nov 12 22:32:11 2010 -0500 tracing/events: Show real number in array fields Currently we have in something like the sched_switch event: field:char prev_comm[TASK_COMM_LEN]; offset:12; size:16; signed:1; When a userspace tool such as perf tries to parse this, the TASK_COMM_LEN is meaningless. This is done because the TRACE_EVENT() macro simply uses a #len to show the string of the length. When the length is an enum, we get a string that means nothing for tools. By adding a static buffer and a mutex to protect it, we can store the string into that buffer with snprintf and show the actual number. Now we get: field:char prev_comm[16]; offset:12; size:16; signed:1; Something much more useful. Signed-off-by: Steven Rostedt commit 5b3b0fa8fb0db9645b56361cdc9a9d0ddbc35e4d Author: Axel Lin Date: Fri Nov 19 17:31:08 2010 +0800 ASoC: Move kfree(twl4030) to twl4030_soc_remove() As we allocate memory for twl4030 in twl4030_codec_probe(), twl4030_codec_remove() is a better place to free the memory. Signed-off-by: Axel Lin Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 9e18e1869f5ebac69f0d881fe97a198ebc0834db Merge: 04af964 460ed69 Author: Mark Brown Date: Fri Nov 19 11:49:35 2010 +0000 Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38 commit 04af964f9cb666caa7c1436d003f8fac0f1fedcc Merge: 7b306da 2811fe2 Author: Mark Brown Date: Fri Nov 19 11:45:05 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 7b306dae22ca377ea0020261ef13aea85b8f5f3f Author: Mark Brown Date: Tue Nov 16 20:11:40 2010 +0000 ASoC: Move WM8994 read/write access data into separate file Makes the WM8994 driver file itself substantially smaller. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 96b101efae0ab68b6510fdbb30384849d211da2c Author: Mark Brown Date: Thu Nov 18 15:49:38 2010 +0000 ASoC: Provide ADC left/right channel source selection on WM8994 Allow the application to choose if the ADC data presented on the left and right channels is sourced from the internal left or right channel. This allows a mono recording to be presented as stereo on the external bus. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit fe869cdb89c95d060c77eea20204d6c91f233b53 Author: Herbert Xu Date: Tue Oct 19 21:23:00 2010 +0800 crypto: algif_hash - User-space interface for hash operations This patch adds the af_alg plugin for hash, corresponding to the ahash kernel operation type. Keys can optionally be set through the setsockopt interface. Each sendmsg call will finalise the hash unless sent with a MSG_MORE flag. Partial hash states can be cloned using accept(2). The interface is completely synchronous, all operations will complete prior to the system call returning. Both sendmsg(2) and splice(2) support reading the user-space data directly without copying (except that the Crypto API itself may copy the data if alignment is off). For now only the splice(2) interface supports performing digest instead of init/update/final. In future the sendmsg(2) interface will also be modified to use digest/finup where possible so that hardware that cannot return a partial hash state can still benefit from this interface. Thakns to Miloslav Trmac for reviewing this and contributing fixes and improvements. Signed-off-by: Herbert Xu Acked-by: David S. Miller Tested-by: Martin Willi commit 03c8efc1ffeb6b82a22c1af8dd908af349563314 Author: Herbert Xu Date: Tue Oct 19 21:12:39 2010 +0800 crypto: af_alg - User-space interface for Crypto API This patch creates the backbone of the user-space interface for the Crypto API, through a new socket family AF_ALG. Each session corresponds to one or more connections obtained from that socket. The number depends on the number of inputs/outputs of that particular type of operation. For most types there will be a s ingle connection/file descriptor that is used for both input and output. AEAD is one of the few that require two inputs. Each algorithm type will provide its own implementation that plugs into af_alg. They're keyed using a string such as "skcipher" or "hash". IOW this patch only contains the boring bits that is required to hold everything together. Thakns to Miloslav Trmac for reviewing this and contributing fixes and improvements. Signed-off-by: Herbert Xu Acked-by: David S. Miller Tested-by: Martin Willi commit 8b5abbe0683f285e1311c4cc29c79da07d18d0af Author: Keith Packard Date: Tue Nov 16 16:03:53 2010 +0800 drm/i915: Take advantage of auto-polling CRT hotplug detection on PCH hardware Both IBX and CPT have an automatic hotplug detection mode which appears to work reliably enough that we can dispense with the manual force hotplug trigger stuff. This means that hotplug detection is as simple as reading the current hotplug register values. The first time the hotplug detection is activated, the code synchronously waits for a hotplug sequence in case the hardware hasn't bothered to do a detection cycle since being initialized. Signed-off-by: Keith Packard Signed-off-by: Chris Wilson commit 8f2535d9d9c8d87bfbbddab3a5b27abe48213ad2 Author: Chris Wilson Date: Tue Nov 16 10:58:37 2010 +0000 drm/i915/crt: Introduce struct intel_crt We will use this structure in future patches to store CRT specific information on the encoder. Split out and tweaked from a patch by Keith Packard. Signed-off-by: Keith Packard Signed-off-by: Chris Wilson commit fe040be2fdc49a4132c5f64359c629aeeb8e4947 Merge: 2006920 6722a40 Author: Paul Mundt Date: Fri Nov 19 17:04:25 2010 +0900 Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 6722a4016d7f5f107a82ad71a3ee1ccec105532f Author: Magnus Damm Date: Wed Nov 17 06:44:54 2010 +0000 fbdev: sh_mipi_dsi: Allow LCDC board callbacks Update the MIPI-DSI driver to make use of the LCD panel callbacks in the LCDC platform data. Without this patch MIPI panels cannot use board specific LCDC callbacks to control power and/or back light. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit deaba190188f1caa2317de4df6c9aaba501f9809 Author: Magnus Damm Date: Wed Nov 17 09:53:25 2010 +0000 fbdev: sh_mipi_dsi: Require two I/O resources V2 This is V2 of the MIPI-DSI two resources patch. The second I/O resource specifies the base address for the link hardware block. The base address for the link hardware block seems to vary with SoC type. Using two I/O resources to describe the MIPI-DSI hardware allows us to support both newer and older SoCs. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 5958d58a0e7699c791b9f4c99d76559a14770138 Author: Magnus Damm Date: Wed Nov 17 06:44:35 2010 +0000 ARM: mach-shmobile: Extend AP4EVB MIPI-DSI resources Update the AP4EVB board code to go from a single I/O resource to two I/O resources for the MIPI-DSI driver. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 71b146c815ed6034bc20a0ec265445bdf4bad78c Author: Magnus Damm Date: Wed Nov 17 06:44:25 2010 +0000 fbdev: sh_mipi_dsi: Make use of register names Keep MIPI-DSI registers in one place instead of using magic values together with comments. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2006920a18cc9f499e5cccf9e6f1aa9f6120705e Author: Arnd Hannemann Date: Thu Nov 18 09:45:42 2010 +0000 fbdev: modedb: fix CEA modes Some of the modes were missing the correct sync polarities. This was causing a corrupt or left shifted picture on my TV. Additionally format #35 had a wrong refresh rate and pixel clock. This patch fixes those issues. Signed-off-by: Arnd Hannemann Acked-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 3256c789882281b2eac5978c7d38f6f0bbd16ed6 Author: Takashi YOSHII Date: Fri Nov 19 16:49:38 2010 +0900 ARM: mach-shmobile: ag5evm: use gpio. Ag5evm board now uses gpio api to initialize pins and peripherals. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit 1cdf370244d5f0a4cf5ed672967cc2e16235908d Author: Takashi YOSHII Date: Fri Nov 19 16:47:16 2010 +0900 ARM: mach-shmobile: Add sh73a0 pinmux support PFC definitions for sh73a0 to support GPIO and pinmux handling. Signed-off-by: Takashi YOSHII Signed-off-by: Paul Mundt commit c2f9bff5ace07fbea03a53c6c3253f6c3a81e9f9 Author: Herbert Xu Date: Tue Oct 19 21:04:42 2010 +0800 net - Add AF_ALG macros This patch adds the socket family/level macros for the yet-to-be-born AF_ALG family. The AF_ALG family provides the user-space interface for the kernel crypto API. Signed-off-by: Herbert Xu Acked-by: David S. Miller commit 460ed699f4c943e1ec4a8458869eb532fe31fd16 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S5PV310: Add audio platform devices Define platform devices for all audio devices found on S5PV310 Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 9aa2570e9be4bc43a0ea6abb637d525088ed22b9 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S5PV210: Upgrade platform device for I2S Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 651cba5d17564e684584e544ff9111a3cb409c94 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S5PC100: Upgrade platform device for I2S Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 4f2e4e124c91bb5105b8ecc8928e5fc0f2b2af0f Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S5P6442: Upgrade platform device for I2S Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit d9a93c345a5503668ca2b3a75be0eba1131c90e4 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S5P64X0: Upgrade platform device for I2S Add more information to I2S platform_devices in order to prepare them for new controller driver. Also, discard duplicated gpio-cfg. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 6a62bee2105250ac02bf3c96b7f35e28dac36888 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: S3C64XX: Upgrade platform device for I2S Add more information to I2S platform_devices in order to prepare them for new controller driver. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 498c08805fdbfc0d8a3538bf288475fa3a064fb7 Author: Jassi Brar Date: Fri Nov 19 08:49:44 2010 +0900 ARM: SAMSUNG: Prepare audio header for new I2S driver Add new defined and data structures in order to prepare for new I2S driver. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit daea9b4f4416384dfcd0021a9461717974ed4354 Author: Jassi Brar Date: Fri Nov 19 08:49:43 2010 +0900 ARM: SAMSUNG: Rename s3c64xx I2S platform device Since the I2S of S3C64XX and newer SoCs are incremental versions of each other with changes managable in a single driver, rename the 's3c64xx-iis' -> 'samsung-i2s' Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 8b0ae0b719d4ea9aee4ed3a7a09d5ff76557fadf Author: Jassi Brar Date: Fri Nov 19 08:49:43 2010 +0900 ARM: S5PV310: Add platform devices for PL330 DMACs Samsung's Soc S5PV310 has three PL330 DMACs. First is dedicated for Memory->Memory data transfer while the other two meant for data transfer with peripherals. Define and add latter two PL330 DMACs as platform devices on the S5PV310 platform. Signed-off-by: Jassi Brar Acked-by: Mark Brown Acked-by: Liam Girdwood Signed-off-by: Kukjin Kim commit 45677454dd6d128608117abe7dcd2bdfdd7cdf72 Author: Wu Zhangjin Date: Thu Oct 28 00:24:34 2010 +0800 ftrace: Speed up recordmcount cmd_record_mcount is used to locate the _mcount symbols in the object files, only the files compiled with -pg has the _mcount symbol, so, it is only needed for such files, but the current cmd_record_mcount is used for all of the object files, so, we need to fix it and speed it up. Since -pg may be removed by the method used in kernel/trace/Makefile: ORIG_CFLAGS := $(KBUILD_CFLAGS) KBUILD_CFLAGS = $(subst -pg,,$(ORIG_CFLAGS)) Or may be removed by the method used in arch/x86/kernel/Makefile: CFLAGS_REMOVE_file.o = -pg So, we must check the last variable stores the compiling flags, that is c_flags(Please refer to cmd_cc_o_c and rule_cc_o_c defined in scripts/Makefile.build) and since the CFLAGS_REMOVE_file.o is already filtered in _c_flags(Please refer to scripts/Makefile.lib) and _c_flags has less symbols, therefore, we only need to check _c_flags. --------------- Changes from v1: o Don't touch Makefile for CONFIG_FTRACE_MCOUNT_RECORD is enough o Use _c_flags intead of KBUILD_CFLAGS to cover CONFIG_REMOVE_file.o = -pg (feedback from Steven Rostedt ) Acked-by: Michal Marek Signed-off-by: Wu Zhangjin LKML-Reference: <3dc8cddf022eb7024f9f2cf857529a15bee8999a.1288196498.git.wuzhangjin@gmail.com> [ changed if [ .. == .. ] to if [ .. = .. ] to handle dash environments ] Signed-off-by: Steven Rostedt commit 5ca9afdb9f6a5267927b54de3f42c756e8af7fcd Author: Vasiliy Kulikov Date: Thu Nov 18 21:16:45 2010 +0300 x86, mrst: Check platform_device_register() return code platform_device_register() may fail, if so propagate the return code from mrst_device_create(). Signed-off-by: Vasiliy Kulikov LKML-Reference: <1290104207-31279-1-git-send-email-segoon@openwall.com> Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit 8d1491bae72e3500b74e1855afa10f0544068cea Author: Steven Rostedt Date: Thu Nov 18 15:39:48 2010 -0500 ktest: Ask for the manditory config options instead of just failing In keeping with the notion that all tools should be simple for all to use. I've changed ktest.pl to ask for mandatory options instead of just failing. It will append (or create) the options the user types in, onto the config file. Signed-off-by: Steven Rostedt commit 0a80410dc53cf68e56456bef1ca66949b87412f9 Author: Tomoya Date: Wed Nov 17 14:06:25 2010 +0000 can: EG20T PCH: use BIT(X) Replace bit assignment value to BIT(X). For easy to readable/identifiable, replace all bit assigned macros to BIT(X) Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 086b5650dcdaae7c4aa60a5d0724f775e733610e Author: Tomoya Date: Wed Nov 17 01:13:16 2010 +0000 can: EG20T PCH: add prefix to macro For easy to readable/identifiable, add prefix "PCH_" to all of #define macros. Signed-off-by: Tomoya MORINAGA Acked-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit 30dfe2c05037fbc021121c037872c09956938c2f Author: David S. Miller Date: Thu Nov 18 11:49:25 2010 -0800 atm: fore200e: Fix build warning. GCC (rightfully) complains that: drivers/atm/fore200e.c:614:5: warning: operation on 'cmdq->head' may be undefined This is due to the FORE200E_NEXT_ENTRY macro, which essentially evaluates to: i = ++i % m Make it what's explicitly intended here which is: i = (i + 1) % m and the warning goes away. Signed-off-by: David S. Miller commit a76a574ca9ce7c05791cee42f000f2a42c687837 Author: Rafał Miłecki Date: Wed Nov 17 19:52:13 2010 +0100 ssb: drop BCM4328 hack for SPROM revision This hacks leads to incorrect SPROM parsing for me and reading for example MAC as: 00:00:00:54:00:00. Michael G. who introduced this confirmed it is not needed anymore. Signed-off-by: Rafał Miłecki Tested-by: Michael Gerdau Signed-off-by: John W. Linville commit aaa13ca2428789b3c8096b5edc175d4d78b5f504 Author: Felix Fietkau Date: Wed Nov 17 04:19:47 2010 +0100 ath9k_hw: support reading calibration data from flash on AR9003 Embedded boards do not have compressed EEPROM data, they use the struct ar9003_eeprom layout, with little endian fields, so copying the raw data to the eeprom buffer is enough. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a05b5d45049d60a06a1b12976150572304a51928 Author: Felix Fietkau Date: Wed Nov 17 04:25:33 2010 +0100 ath9k: add support for reading eeprom from platform data on PCI devices Some embedded boards store platform data for connected PCIe AR92xx chips in the system flash instead of a separate EEPROM chip. Signed-off-by: Gabor Juhos Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 458fafdd579dcb58c8288c55c9cd92d6816ba094 Author: John W. Linville Date: Tue Nov 16 16:49:08 2010 -0500 rndis_wlan: avoid uninitialized var warning in rndis_wlan_craft_connected_bss CC [M] drivers/net/wireless/rndis_wlan.o drivers/net/wireless/rndis_wlan.c: In function ‘rndis_wlan_craft_connected_bss’: drivers/net/wireless/rndis_wlan.c:2542:2: warning: ‘ret’ may be used uninitialized in this function Signed-off-by: John W. Linville Acked-by: Jussi Kivilinna commit 8befba6f2262a6e31d6e3bcf7d07ff46da444ec0 Author: John W. Linville Date: Tue Nov 16 16:08:56 2010 -0500 iwmc3200wifi: clarify potentially undefined operation in iwm_scan_ssids CC [M] drivers/net/wireless/iwmc3200wifi/commands.o drivers/net/wireless/iwmc3200wifi/commands.c: In function ‘iwm_scan_ssids’: drivers/net/wireless/iwmc3200wifi/commands.c:911:15: warning: operation on ‘iwm->scan_id’ may be undefined Signed-off-by: John W. Linville commit 86107fd170bc379869250eb7e1bd393a3a70e8ae Author: Bruno Randolf Date: Tue Nov 16 10:58:48 2010 +0900 nl80211/mac80211: Report signal average Extend nl80211 to report an exponential weighted moving average (EWMA) of the signal value. Since the signal value usually fluctuates between different packets, an average can be more useful than the value of the last packet. This uses the recently added generic EWMA library function. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit eef39befaae2a1559efe197d795c376a317af2af Author: Bruno Randolf Date: Tue Nov 16 10:58:43 2010 +0900 ath5k: Use generic EWMA library Remove ath5k's private moving average implementation in favour of the generic library version. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit c5485a7e7569ab32eea240c850198519e2a765ef Author: Bruno Randolf Date: Tue Nov 16 10:58:37 2010 +0900 lib: Add generic exponentially weighted moving average (EWMA) function This adds generic functions for calculating Exponentially Weighted Moving Averages (EWMA). This implementation makes use of a structure which keeps the EWMA parameters and a scaled up internal representation to reduce rounding errors. The original idea for this implementation came from the rt2x00 driver (rt2x00link.c). I would like to use it in several places in the mac80211 and ath5k code and I hope it can be useful in many other places in the kernel code. Signed-off-by: Bruno Randolf Reviewed-by: KOSAKI Motohiro Signed-off-by: John W. Linville commit ae51ce9061b1ddc0fde363913c932bee5b9bc5fd Merge: 072b198 423478c Author: Ingo Molnar Date: Thu Nov 18 20:07:12 2010 +0100 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core commit 57e1ab6eaddc9f2c358cd4afb497cda6e3c6821a Author: Eric Dumazet Date: Tue Nov 16 20:36:42 2010 +0000 igmp: refine skb allocations IGMP allocates MTU sized skbs. This may fail for large MTU (order-2 allocations), so add a fallback to try lower sizes. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4c3710afbc333c33100739dec10662b4ee64e219 Author: Changli Gao Date: Tue Nov 16 20:28:24 2010 +0000 net: move definitions of BPF_S_* to net/core/filter.c BPF_S_* are used internally, should not be exposed to the others. Signed-off-by: Changli Gao Acked-by: Eric Dumazet Acked-by: Hagen Paul Pfeifer Signed-off-by: David S. Miller commit cba328fc5ede9091616e7296483840869b615a46 Author: Tetsuo Handa Date: Tue Nov 16 15:19:51 2010 +0000 filter: Optimize instruction revalidation code. Since repeating u16 value to u8 value conversion using switch() clause's case statement is wasteful, this patch introduces u16 to u8 mapping table and removes most of case statements. As a result, the size of net/core/filter.o is reduced by about 29% on x86. Signed-off-by: Tetsuo Handa Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 9e50e3ac5a5bbb1fd2949bdd57444ad1b93e5f41 Author: John Fastabend Date: Tue Nov 16 19:12:28 2010 +0000 net: add priority field to pktgen Add option to set skb priority to pktgen. Useful for testing QOS features. Also by running pktgen on the vlan device the qdisc on the real device can be tested. Signed-off-by: John Fastabend Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit f72f2f4cdeb67bc262d80a6d474292f00182a4dc Author: Gerrit Renker Date: Thu Nov 18 09:37:07 2010 -0800 dccp ccid-2: whitespace fix-up This fixes whitespace noise introduced in commit "dccp ccid-2: Algorithm to update buffer state", 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a, 14 Nov 2010. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit 866f3b25a2eb60d7529c227a0ecd80c3aba443fd Author: Eric Dumazet Date: Thu Nov 18 09:33:19 2010 -0800 bonding: IGMP handling cleanup Instead of iterating in_dev->mc_list from bonding driver, its better to call a helper function provided by igmp.c Details of implementation (locking) are private to igmp code. ip_mc_rejoin_group(struct ip_mc_list *im) becomes ip_mc_rejoin_groups(struct in_device *in_dev); Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f1a27850095ebc66c138c940c1efedb8a95f92c4 Author: Steven Rostedt Date: Thu Nov 11 11:34:38 2010 -0500 ktest: Copy the last good and bad configs in config_bisect During the config_bisect, in case of failure, it is nice to have the last good and bad .configs that were used. This would let us restart the config_bisect from those configs. Copy the last good config into the output dir as config_good, and the last bad config as config_bad. Signed-off-by: Steven Rostedt commit eec5646031a54858362f7192a928511a23612f6b Author: Steven Rostedt Date: Wed Nov 10 09:08:20 2010 -0500 ktest: For grub reboot, use run_ssh instead of run_command The run_ssh handles the ssh variable $SSH_COMMAND, which was not being used by the run_command in reboot_to function. Signed-off-by: Steven Rostedt commit 1c8a617a274c4065681d964cd5a5afb921de4a87 Author: Steven Rostedt Date: Tue Nov 9 12:55:40 2010 -0500 ktest: Added force stop after success and failure Added the options STOP_AFTER_SUCCESS and STOP_AFTER_FAILURE to allow the user to give a time (in seconds) to stop the monitor after a stack trace or login has been detected. Sometimes the kernel constantly prints out to the console and this may cause the test to run indefinitely. Signed-off-by: Steven Rostedt commit cccae1a62a81dc8e32bf787024fdcf7ef71f1285 Author: Steven Rostedt Date: Tue Nov 9 12:21:32 2010 -0500 ktest: Parse off the directory name in useconfig for failures When we store failures, we create a directory that has the build_type in it. For useconfig, it also contains the name path of the config file it uses. This unfortunately gets its own directory on failure. Parse off the directory name when creating the directory to store the failures. Signed-off-by: Steven Rostedt commit 9be2e6b590b5d9cb6d6e38b6362a552bbcb118e0 Author: Steven Rostedt Date: Tue Nov 9 12:20:21 2010 -0500 ktest: Use different temp config name for minconfig By using the "use_config" for minconfig and addconfig we risk trying to copy itself to itself, which will cause an unexpected failure. Use a different name instead. Signed-off-by: Steven Rostedt commit d1fbd7e6a6a4c67ab895a0219a2bbcf09d039c3a Author: Steven Rostedt Date: Mon Nov 8 17:41:37 2010 -0500 ktest: Updated the sample.conf for the latest options Added documentation for SSH_EXEC, SCP_TO_TARGET, REBOOT, and CONFIG_BISECT and friends. Signed-off-by: Steven Rostedt commit dbc6d0aa8ae38cf9cfe39c6076cc5378ef4ca4a2 Author: Steven Rostedt Date: Mon Nov 8 17:18:37 2010 -0500 ktest: Added compare script to test ktest.pl to sample.conf Add a compare script that makes sure that all the options in sample.conf are used in ktest.pl, and all the options in ktest.pl are described in sample.conf. Signed-off-by: Steven Rostedt commit 0a05c769a9de554aefa773061c592c7054d5e7a0 Author: Steven Rostedt Date: Mon Nov 8 11:14:10 2010 -0500 ktest: Added config_bisect test type Added the ability to do a config_bisect. It starts with a bad config and does the following loop. Enable half the configs. if none of the configs to check are not enabled (caused by missing dependencies) enable the other half. Run the test if the test passes, remove the configs from the check but enabled them for further tests (to satisfy dependencies). else Remove any config that was not enabled, as we have found a new config that can cause a failure. loop till we have only one config left. Signed-off-by: Steven Rostedt commit e48c5293bde398e253f83fdd0247fb2bc71cc92f Author: Steven Rostedt Date: Tue Nov 2 14:35:37 2010 -0400 ktest/cleanups: Added version 0.2, ssh as options Updated to version 0.2. Now have SSH_EXEC options. Also added some cleanups for keeping track of success and reading the config file. Signed-off-by: Steven Rostedt commit 7a849cd93ad2cf7d32427f3dbf5f524d5f588d20 Author: Steven Rostedt Date: Mon Nov 8 16:49:25 2010 -0500 ktest: Output something easy to parse for failure or success Have a easy way to parse the log file for success or failure. KTEST RESULT: ... Suggested-by: Tim Bird Signed-off-by: Steven Rostedt commit 21a9679feadf6b215c4f932b0df5d252b4822c45 Author: Steven Rostedt Date: Mon Nov 8 16:45:50 2010 -0500 ktest: Allow a test case to undefine a default value Allow a test case in the config file to undefine a default value by specifying the option and equal sign but not assigning it a value: OPTION = Signed-off-by: Steven Rostedt commit 51ad1dd1034684e9c490eb41c17cde8ffb682ab1 Author: Steven Rostedt Date: Mon Nov 8 16:43:21 2010 -0500 ktest: Use $output_config instead of typing $outputdir/.config To help prevent typos, use $output_config as the reference to "$outputdir/.config". Signed-off-by: Steven Rostedt commit d1e2f22ad718c83ab19297e7717679c5ed17c020 Author: Steven Rostedt Date: Mon Nov 8 16:39:57 2010 -0500 ktest: Write to stdout if no log file is given If no LOG_FILE option is set, then write what would be logged to that file to standard output. Signed-off-by: Steven Rostedt commit 9386c6ab7a33044d9907b00fc80976292bb02c2d Author: Steven Rostedt Date: Mon Nov 8 16:35:48 2010 -0500 ktest: Use oldnoconfig instead of yes command Running the command "yes ''" through the make oldconfig may enable things we do not want enabled. If something is default enabled, the yes command with '' as an argument will enable it. Use oldnoconfig, which runs everything as if 'no' was used. Signed-off-by: Steven Rostedt commit dc89568884ae1b8b96ca6fffe83b404ae472750e Author: Steven Rostedt Date: Tue Nov 2 15:22:53 2010 -0400 ktest: Update the sample config file with more documentation Signed-off-by: Steven Rostedt commit a57419b366a20009c9363c3cdad2449dc2fa8b9c Author: Steven Rostedt Date: Tue Nov 2 15:13:54 2010 -0400 ktest: New TEST_START instead of using [], and use real SHA1s Change the config to use TEST_START where the options after a TEST_START automatically get the [] as it is read and they do not need to exist in the config file; TEST_START MIN_CONFIG = myconfig is the same as MIN_CONFIG[1] = myconfig The benefit is that you no longer need to keep track of test numbers with tests. Also process the commit ids that are passed to the options to get the actually SHA1 so it is no longer relative to the branch. Ie, saying HEAD will get the current SHA1 and then that will be used, and will work even if another branch is checked out. Signed-off-by: Steven Rostedt commit 576f627c817dff0b7081374287a77247325b9cc0 Author: Steven Rostedt Date: Tue Nov 2 14:58:38 2010 -0400 ktest: Add poweroff after halt and powercycle after reboot Added the options POWEROFF_AFTER_HALT to handle boxes that do not really shut off after a halt is called. Added POWERCYCLE_AFTER_REBOOT to force a power cycle for boxes that don't reboot but get stuck during the reboot. Signed-off-by: Steven Rostedt commit 8b37ca8cac46b2c108386e3901cc8611dc81c7aa Author: Steven Rostedt Date: Tue Nov 2 14:58:33 2010 -0400 ktest: Add POST_INSTALL to allow initrds to be created Add a POST_INSTALL option that runs after the build and install but before rebooting to the test kernel. This alls the user to run a script that will install an initrd (or anything else that may be special) before booting. An environment variable KERNEL_VERSION is set. Signed-off-by: Steven Rostedt commit a75fececff3cc1e86d74e98de634ea2ed1b47697 Author: Steven Rostedt Date: Tue Nov 2 14:58:27 2010 -0400 ktest: Added sample.conf, new %default option format Added sample.conf as a nice document to show new users. Use a %default hash to separate out the options that are default and allow us to complain about options being set twice. Signed-off-by: Steven Rostedt commit 7faafbd69639b53b6cc2d450c283d9cc12e62c70 Author: Steven Rostedt Date: Tue Nov 2 14:58:22 2010 -0400 ktest: Add open and close console and start stop monitor It is much better to keep the monitor running throughout a test than to constantly start and stop it. Some console readers will show everything that has happened before when opening the console, and by opening it several times, causes the old content to be read multiple times in a single test. Signed-off-by: Steven Rostedt commit 2b7d9b21426f10448cb047d1d7c3be05da848fd2 Author: Steven Rostedt Date: Tue Nov 2 14:58:15 2010 -0400 ktest: Added continuing on success, clear log and timeout Add option to continue after a test fails. Add option to reset the log at start of running ktest. Update default timeout to 2 minutes. Signed-off-by: Steven Rostedt commit d6ce2a0b33eb71f6862dfb6cbddd0e842f8132de Author: Steven Rostedt Date: Tue Nov 2 14:58:05 2010 -0400 ktest: Add reverse bisect, better logging, copyright Added the ability to do a reverse bisect. Better logging of running commands. Added the copyright statement. Signed-off-by: Steven Rostedt commit 6c5ee0be02f73ebd70eb50b84013e8830f08a6da Author: Steven Rostedt Date: Tue Nov 2 14:57:58 2010 -0400 ktest: Added patchcheck Added patchcheck functionality. It will checkout a given SHA1 and test that commit and all commits to another given SHA1. Signed-off-by: Steven Rostedt commit 1a5cfce344711a541aa63bdff81a58db35e20564 Author: Steven Rostedt Date: Tue Nov 2 14:57:51 2010 -0400 ktest: Added reboot on success Signed-off-by: Steven Rostedt commit 5a391fbff8755592eb080784ef32ff818d2daa44 Author: Steven Rostedt Date: Tue Nov 2 14:57:43 2010 -0400 ktest: Added better console, add test build Better reading of the console. Added running a script to do testing after build succeeds. Signed-off-by: Steven Rostedt commit 5f9b6ced04a4e9c3ee6b4d4042ac5935ef5a8dbd Author: Steven Rostedt Date: Tue Nov 2 14:57:33 2010 -0400 ktest: Bisecting, install modules, add logging Added bisecting, modules, logging of the output. Banners that show success. Signed-off-by: Steven Rostedt commit 75c3fda79e97b1e2c390e3623f19476e1e78ca0c Author: Steven Rostedt Date: Tue Nov 2 14:57:21 2010 -0400 ktest: New features reboot on error, make options REBOOT_ON_ERROR to reboot the box on error BUILD_OPTIONS to add options to the make build (like -j40) Added "useconfig:". Signed-off-by: Steven Rostedt commit 5c42fc5b975869e73bb8b6c279dd2da81eab5607 Author: Steven Rostedt Date: Tue Nov 2 14:57:01 2010 -0400 ktest: New features: noclean, dodie, poweroff on error and success Added dodie function to have a bit more control over die calls. BUILD_NOCLEAN to not run make mrproper or remove .config. POWEROFF_ON_{SUCCESS,ERROR} to turn off the power after tests. Skip backtrace calls that were done by the backtrace tests. Signed-off-by: Steven Rostedt commit 2545eb6198e7e1ec50daa0cfc64a4cdfecf24ec9 Author: Steven Rostedt Date: Tue Nov 2 15:01:32 2010 -0400 Initial start of ktest.pl Originally named autotest.pl, but renamed to ktest.pl now because the autotest name is used by other projects. Signed-off-by: Steven Rostedt commit edd2126aa8aab8a87db7cc480d5047e9280d7acf Author: Jiri Kosina Date: Thu Nov 18 16:28:43 2010 +0100 HID: wacom: make sysfs permissions more strict It's not really dangerous in this driver, but it's against general practice and worth fixing. Wacom uses the attribute for changing the reporting speed of the tablet (and this actually requires poking the device in the background) (still I wouldn't consider it a security issue though). udev is a proper place to handle this. Reported-by: Linus Torvalds Signed-off-by: Jiri Kosina commit c311598b29f09c5092747a2603700f96a7daec2a Author: Jiri Kosina Date: Thu Nov 18 16:27:07 2010 +0100 HID: prodikeys: make sysfs permissions more strict It's not really dangerous in this driver, but it's against general practice and worth fixing. Proper place for handling this correctly is udev. Reported-by: Linus Torvalds Signed-off-by: Jiri Kosina commit f658bcfb2607bf0808966a69cf74135ce98e5c2d Author: Hans Rosenfeld Date: Fri Oct 29 17:14:32 2010 +0200 x86, cacheinfo: Cleanup L3 cache index disable support Adaptions to the changes of the AMD northbridge caching code: instead of a bool in each l3 struct, use a flag in amd_northbridges.flags to indicate L3 cache index disable support; use a pointer to the whole northbridge instead of the misc device in the l3 struct; simplify the initialisation; dynamically generate sysfs attribute array. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit 9653a5c76c8677b05b45b3b999d3b39988d2a064 Author: Hans Rosenfeld Date: Fri Oct 29 17:14:31 2010 +0200 x86, amd-nb: Cleanup AMD northbridge caching code Support more than just the "Misc Control" part of the northbridges. Support more flags by turning "gart_supported" into a single bit flag that is stored in a flags member. Clean up related code by using a set of functions (amd_nb_num(), amd_nb_has_feature() and node_to_amd_nb()) instead of accessing the NB data structures directly. Reorder the initialization code and put the GART flush words caching in a separate function. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit eec1d4fa00c6552ae2fdf71d59f1eded7c88dd89 Author: Hans Rosenfeld Date: Fri Oct 29 17:14:30 2010 +0200 x86, amd-nb: Complete the rename of AMD NB and related code Not only the naming of the files was confusing, it was even more so for the function and variable names. Renamed the K8 NB and NUMA stuff that is also used on other AMD platforms. This also renames the CONFIG_K8_NUMA option to CONFIG_AMD_NUMA and the related file k8topology_64.c to amdtopology_64.c. No functional changes intended. Signed-off-by: Hans Rosenfeld Signed-off-by: Borislav Petkov commit 8477cedb49c69ce64b603d76c7776811eec0f9d7 Author: Lars-Peter Clausen Date: Thu Nov 11 19:00:53 2010 +0100 jz4740-battery: Check if platform_data is supplied Currently platform_data is dereferenced without checking whether it is actually set, which can lead to kernel crashes. This patch adds a check which will abort the drivers probe function gracefully if no platform_data is supplied. Signed-off-by: Lars-Peter Clausen Signed-off-by: Anton Vorontsov commit e1a85694e08d03efae9e08fdb292dfd4870837bc Author: Heikki Krogerus Date: Mon Nov 8 12:22:40 2010 +0200 isp1704_charger: Detect charger after probe If the device is booted up with cable connected, or the module is loaded after plugging in the cable, the notification has come and gone, so not relying on it at probe time. Instead this checks the VBUS level manually after probe. Signed-off-by: Heikki Krogerus Signed-off-by: Anton Vorontsov commit a4607d9f5cbae1aad7f86e8204b57d66c0e14e36 Author: Heikki Krogerus Date: Thu Nov 4 16:31:48 2010 +0200 isp1704_charger: Set isp->dev before anything needs it isp1704_test_ulpi() is the first place that needs isp->dev member, so it must be set before calling the function. Signed-off-by: Heikki Krogerus Signed-off-by: Anton Vorontsov commit bac43b20501058ab0728246acce3bb85f2e72648 Author: Heikki Krogerus Date: Thu Nov 4 16:31:47 2010 +0200 isp1704_charger: Detect HUB/Host chargers To avoid breaking high speed chirp handshaking with CDP chargers, no more then 500mA should be drawn. To make sure of this, utilizing current_max property. After the device has enumerated, it's safe to draw the maximum 1800mA as defined in the Battery Charging Specification. This can be also used with normal USB connection if the controller sends ENUMERATED notification with the milliamps as data. From now on the online property indicates VBUS, present property if there is a charger and current_max the milliamps possible to draw from VBUS. Signed-off-by: Heikki Krogerus Signed-off-by: Anton Vorontsov commit 746d8fb8c6933337c927f40c9ef90dcbddcfd39e Author: Ameya Palande Date: Thu Nov 4 16:31:46 2010 +0200 isp1704_charger: Correct length for storing model Model should have room to accommodate the trailing null byte, "isp170[4|7]\0". Signed-off-by: Ameya Palande Acked-by: Heikki Krogerus Signed-off-by: Anton Vorontsov commit 5070437cd99511f69ae561f2ab417142a47a85ec Author: Lars-Peter Clausen Date: Thu Oct 21 17:55:01 2010 +0200 power_supply: Add gpio charger driver This patch adds a simple driver for chargers indicating their online status through a GPIO pin. Signed-off-by: Lars-Peter Clausen Signed-off-by: Anton Vorontsov commit 8ec98fe0b4ffdedce4c1caa9fb3d550f52ad1c6b Author: Lars-Peter Clausen Date: Thu Nov 11 19:00:52 2010 +0100 jz4740-battery: Protect against concurrent battery readings We can not handle more then one ADC request at a time to the battery. The patch adds a mutex around the ADC read code to ensure this. Signed-off-by: Lars-Peter Clausen Cc: stable@kernel.org Signed-off-by: Anton Vorontsov commit 86af95039b69a90db15294eb1f9c147f1df0a8ea Author: Sven Neumann Date: Fri Nov 12 11:36:22 2010 +0100 ds2760_battery: Fix calculation of time_to_empty_now A check against division by zero was modified in commit b0525b48. Since this change time_to_empty_now is always reported as zero while the battery is discharging and as a negative value while the battery is charging. This is because current is negative while the battery is discharging. Fix the check introduced by commit b0525b48 so that time_to_empty_now is reported correctly during discharge and as zero while charging. Signed-off-by: Sven Neumann Acked-by: Daniel Mack Cc: stable@kernel.org [2.6.32..2.6.36] Signed-off-by: Anton Vorontsov commit 423478cde453eebdfcfebf4b8d378d8f5d49b853 Author: Frederic Weisbecker Date: Thu Nov 18 02:21:26 2010 +0100 tracing: Remove useless syscall ftrace_event_call declaration It is defined right after, which makes the declaration completely useless. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 53cf810b1934f08a68e131aeeb16267a778f43df Author: Frederic Weisbecker Date: Thu Nov 18 02:11:42 2010 +0100 tracing: Allow syscall trace events for non privileged users As for the raw syscalls events, individual syscall events won't leak system wide information on task bound tracing. Allow non privileged users to use them in such workflow. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit fe5542030dce3b951f9eaf3ecb9a7bc5fa7bfed1 Author: Frederic Weisbecker Date: Thu Nov 18 01:52:06 2010 +0100 tracing: Allow raw syscall trace events for non privileged users This allows non privileged users to use the raw syscall trace events for task bound tracing in perf. It is safe because raw syscall trace events don't leak system wide informations. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 1ed0c5971159974185653170543a764cc061c857 Author: Frederic Weisbecker Date: Thu Nov 18 01:46:57 2010 +0100 tracing: New macro to set up initial event flags value This introduces the new TRACE_EVENT_FLAGS() macro in order to set up initial event flags value. This macro must simply follow the definition of a trace event and take the event name and the flag value as parameters: TRACE_EVENT(my_event, ..... .... ); TRACE_EVENT_FLAGS(my_event, 1) This will set up 1 as the initial my_event->flags value. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 61c32659b12c44e62de32fbf99f7e4ca783dc38b Author: Frederic Weisbecker Date: Thu Nov 18 01:39:17 2010 +0100 tracing: New flag to allow non privileged users to use a trace event This adds a new trace event internal flag that allows them to be used in perf by non privileged users in case of task bound tracing. This is desired for syscalls tracepoint because they don't leak global system informations, like some other tracepoints. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Thomas Gleixner Cc: Steven Rostedt Cc: Li Zefan Cc: Jason Baron commit 9c0729dc8062bed96189bd14ac6d4920f3958743 Author: Soeren Sandmann Pedersen Date: Fri Nov 5 05:59:39 2010 -0400 x86: Eliminate bp argument from the stack tracing routines The various stack tracing routines take a 'bp' argument in which the caller is supposed to provide the base pointer to use, or 0 if doesn't have one. Since bp is garbage whenever CONFIG_FRAME_POINTER is not defined, this means all callers in principle should either always pass 0, or be conditional on CONFIG_FRAME_POINTER. However, there are only really three use cases for stack tracing: (a) Trace the current task, including IRQ stack if any (b) Trace the current task, but skip IRQ stack (c) Trace some other task In all cases, if CONFIG_FRAME_POINTER is not defined, bp should just be 0. If it _is_ defined, then - in case (a) bp should be gotten directly from the CPU's register, so the caller should pass NULL for regs, - in case (b) the caller should should pass the IRQ registers to dump_trace(), - in case (c) bp should be gotten from the top of the task's stack, so the caller should pass NULL for regs. Hence, the bp argument is not necessary because the combination of task and regs is sufficient to determine an appropriate value for bp. This patch introduces a new inline function stack_frame(task, regs) that computes the desired bp. This function is then called from the two versions of dump_stack(). Signed-off-by: Soren Sandmann Acked-by: Steven Rostedt Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Arjan van de Ven , Cc: Frederic Weisbecker , Cc: Arnaldo Carvalho de Melo , LKML-Reference: > Signed-off-by: Frederic Weisbecker commit 23ce17adb7fc33a4353abe4b57a03f555cced57b Author: Sekhar Nori Date: Tue Oct 12 11:58:02 2010 +0530 spi: davinci: kconfig: add manufacturer name to prompt string Add manufacturer name to the Kconfig prompt string and move the controller name to the begining of the prompt. This helps locate the driver easily among the list of existing drivers. While at it, also add information about being able to build the driver as module. Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 212d4b69652171d4474bc9dfc08e829737264632 Author: Sekhar Nori Date: Mon Oct 11 10:41:39 2010 +0530 spi: davinci: shorten variable names Shorten names of local variables and structure members where possible. Local variables: * 'davinci_spi' is being renamed 'dspi' * 'davinci_spi_dma' is being renamed 'dma' Structure members: * 'dma_{tx|rx}_channel' is being renamed '{tx|rx}_channel' since the structure containing them is already called 'davinci_spi_dma' * 'davinci_spi_dma' in 'davinci_spi' structure is being renamed 'dma' Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 0e0eae4d1cdff5fa6608bcc6f6990774dec2527d Author: Sekhar Nori Date: Fri Oct 8 14:04:22 2010 +0530 spi: davinci: remove unnecessary private data member 'region_size' Remove unnecesary private data member 'region_size' being used to store the size of SPI memory region. Instead, get the memory resource size directly from the platform data. Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 43abb11ba540e21346c6e7ab3211b48928501ea6 Author: Brian Niebuhr Date: Wed Oct 6 18:34:47 2010 +0530 spi: davinci: add EF Johnson Technologies copyright Add copyright for EF Johnson Technologies since the driver has been majorly overhauled by Brian. Signed-off-by: Brian Niebuhr Signed-off-by: Sekhar Nori commit 035540f6ea2394bdd9675552d31e1125cd0e402e Author: Brian Niebuhr Date: Wed Oct 6 18:32:40 2010 +0530 spi: davinci: add additional comments Add comments describing the platform data members and per-chip-select SPI configuration structure. Also, add some comments describing the what happens during the driver probe. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit d8c174cdeb6511aa307e6058468b68a9cc3990e4 Author: Brian Niebuhr Date: Wed Oct 6 18:47:16 2010 +0530 spi: davinci: setup the driver owner Setup the owner member of the platform driver to THIS_MODULE instead of leaving it NULL. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3f27b57c1684efbe11fcc9449df898b1d0feb753 Author: Brian Niebuhr Date: Wed Oct 6 18:25:43 2010 +0530 spi: davinci: enable and power-up SPI only when required Enable SPI only when active transfers are in progress. Keep it in local low power when not in use. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3409e408ab0d7171ae81d198110a1f293852959f Author: Brian Niebuhr Date: Wed Oct 6 18:13:31 2010 +0530 spi: davinci: remove non-useful "clk_internal" platform data The "clk_internal" platform data member which contols the CLKMOD bit in Global Control Register 1 is not useful since CLKMOD needs be set to 1 *always* to ensure master mode operation. Remove this platform data. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 87467bd9052725283b9a9f4b1b310fed8744fb1e Author: Brian Niebuhr Date: Wed Oct 6 17:03:10 2010 +0530 spi: davinci: let DMA operation be specified on per-device basis Let DMA operation be specified on a per-device basis instead of selecting it once during probe. A side effect of this is the need to combine the PIO and DMA buffer txrx_bufs routine. This is good since they anyway share some common functionality. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 6dbd29b27bd2627ba0025a6cff14381e69512cdf Author: Brian Niebuhr Date: Tue Oct 5 15:43:08 2010 +0530 spi: davinci: remove usage of additional completion variables for DMA The DMA code does not use the existing completion variable 'done' which is being used for interrupt mode transfers. Instead it uses two different completion variables specific to DMA mode transfers. Eliminate the usage of new completion variables for DMA mode and use the existing completion variable. [nsekhar@ti.com: To make this process easy, eliminate the two different DMA completion callback functions for tx and rx and use a single callback function instead] Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 9b189fd7584a1d8c68334dd1bc47b363877b314e Author: Brian Niebuhr Date: Tue Oct 5 11:38:41 2010 +0530 spi: davinci: handle DMA completion errors correctly Do not simply clean the DMA channel on a DMA completion error. Instead, use wcount and rcount members of davinci_spi to detecion non-completion of DMA and signal EIO to the application. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 523c37e7006522e778a1fd0aea2746ceb788572f Author: Brian Niebuhr Date: Mon Oct 4 17:35:34 2010 +0530 spi: davinci: fix EDMA CC errors at end of transfers Use a dummy param slot linked to itself to take care of the extra "sync event" that gets sent to EDMA controller after the last byte has been transferred. The dummy PaRAM slot that is linked to the actual DMA PaRAM slot "absorbs" this event and prevents a EDMA CC error to be asserted. Without this provision, the EDMA CC error would be asserted because the channel PaRAM would be empty after the transfer and EDMA would not know what to make out of the extra sync event. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 903ca25b219e28e3513ca4c2ff379fcdf19e057e Author: Sekhar Nori Date: Fri Oct 1 14:51:40 2010 +0530 spi: davinci: do not allocate DMA channels during SPI device setup Do not allocate (and de-allocate) SPI DMA channels during setup (and cleanup) for each SPI device. Instead, allocate the DMA channels once duing probe and use them for the life time of the driver. This makes sense since there are dedicated DMA channels meant for SPI use. This also helps remove the unnecessary DMA "sync_dev" variables being used to store DMA channel information. Also, the "use_dma" platform variable is now eliminated since it is possible to check if the platform supports DMA or not based upon whether DMA resources can be found or not. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit a4f4497b86a689aa8c827d4ebe0d00c4eba66f76 Author: Brian Niebuhr Date: Fri Oct 1 14:00:48 2010 +0530 spi: davinci: fix DMA event generation stoppage Do not stop SPI DMA event generation in either transmit or receive DMA event call back because the single setting affects both transmit and receive event generation. Depending on the order in which the callbacks happen, transmit or receive events can get unintentionally stalled. Instead, disable event generation once after both the transmit and receive DMA completes. While at it, remove the largely under-used function to set or clear DMA event generation. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 49fc3f497d7d409e9b0dc384fe7c173bccd3b1a1 Author: Brian Niebuhr Date: Fri Oct 1 11:22:23 2010 +0530 spi: davinci: use edma_write_slot() to setup EDMA PaRAM slot Currently a series of EDMA API calls are being made to setup various aspects of EDMA PaRAM slots for receive and transmit. Instead setup the PaRAM using a local structure and write once to the hardware using edma_write_slot() Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit e91c659bbcf2f47519260182a75f64ede34df3ca Author: Brian Niebuhr Date: Fri Oct 1 10:29:29 2010 +0530 spi: davinci: always start receive DMA In keeping with the full duplex nature of the SPI bus. Always start receive DMA along with transmit DMA. If there is no receive buffer provided with the transfer, use a temporary buffer to receive the data to be thrown away. [michael.williamson@criticallink.com: receive DMA size should be same as transfer length to avoid hang-up when transfer length is smaller than temporary rx buffer size (rx buffer not provided)] Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit d3f7141cbf4580b2f18f93940df29cf0c15e7ef5 Author: Brian Niebuhr Date: Wed Sep 29 12:31:54 2010 +0530 spi: davinci: do not use temporary buffer if no transmit data provided Remove usage of temporary buffer when no transmit data is provided. Instead, use the transmit register itself as the source of data. By choosing the transmit register itself as the source of data, this patch helps remove unnecessary accesses to memory when no real data is being transmitted. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit c29e3c60e75d1cc1262ac8af379738b6fd851f33 Author: Brian Niebuhr Date: Tue Sep 28 13:59:26 2010 +0530 spi: davinci: always start transmit DMA Due to the full duplex nature of the SPI bus, the SPI master on DaVinci needs transmit to be active even if the tranfer is only meant to collect receive data. The current code achieves this by using a temporary zeroed buffer to provide DMA data in case the transfer does not have a transmit buffer provided. However, the transmit DMA is started only if transmit buffer is provided rendering the temporary buffer unused. Instead the code relies on a write to SPIDAT1 register to trigger transmit operation. This however only sends two bytes of data. Fix this by starting transmit DMA always. This changes exposes a bug on DM355 where the CSHOLD bit in SPIDAT1 needs to be written to in between transfers. Handle that by introducing a "cshold_bug" platform data which is set to true for DM355. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 96fd881f22b44fc14772316a6b9231012393cda8 Author: Brian Niebuhr Date: Mon Sep 27 22:23:23 2010 +0530 spi: davinci: do not store DMA channel information per chip select Do not store DMA channel related information per chip-select since that information does not depend on the chip select. The same DMA channels can be used for transfers on all chip-selects since the transfer happens one-at-a-time. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b23a5d4691043e97bbfde8c2fb5b8fecdc400308 Author: Brian Niebuhr Date: Fri Sep 24 18:53:32 2010 +0530 spi: davinci: remove unnecessary call to davinci_spi_setup_transfer() Remove unnecessary call to davinci_spi_setup_transfer() at the end of davinci_spi_setup(). davinci_spi_setup_transfer() is registered as the setup_transfer callback for the bitbang layer and is called independently by the bitbang layer to setup the transfer before it begins. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit be88471b96cf3a0d7aea72d5ca9c6a95fb54bade Author: Brian Niebuhr Date: Fri Sep 3 12:15:28 2010 +0530 spi: davinci: remove unnecessary function davinci_spi_bufs_prep() The function davinci_spi_bufs_prep() is doing stuff that davinci_spi_setup() is doing. Eliminate it and move the work to davinci_spi_setup() Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit f34bd4cc68fb4548536cac56798d3fad41806724 Author: Brian Niebuhr Date: Fri Sep 3 11:56:35 2010 +0530 spi: davinci: configure the invariable bits in spipc0 only once Configure the data-in, data-out and clock functionality pins in SPIPC0 register only once during probe. No need to set these bits for each transfer. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit e0d205e9914476e96596c5339fa440fb314ef03b Author: Brian Niebuhr Date: Thu Sep 2 16:52:06 2010 +0530 spi: davinci: add support for interrupt mode Add support for SPI interrupt mode operation. Define a per chip-select "io type" variable which specifies if the transfers on this chip-select should happen in interrupt mode or polled mode. Introduce a new function davinci_spi_process_events() to help consolidate the code between interrupt mode processing and polled mode processing. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 839c996ca8dd56f9ea80d7fc0c8b18b01394c82a Author: Brian Niebuhr Date: Mon Aug 23 16:39:19 2010 +0530 spi: davinci: simplify poll mode transfers Use the fact that the get_tx and get_rx can now cope with NULL buffer pointers to simplify the poll mode transfer code. While at it, check for SPI errors every transfer rather than at the end of the whole transfer. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cf90fe73504764cbcc2552c7ea69b1866059db30 Author: Brian Niebuhr Date: Fri Aug 20 17:02:49 2010 +0530 spi: davinci: remove non-useful interrupt mode support The interrupt mode support as it stands is another version of poll mode. Even when interrupt mode is selected, the code tight loops on interrupt status register, rendering it totally useless. A completion variable is initialized, but never used. Remove this fake interrupt mode since users can anyway use poll mode with no functional difference. A usefully implemented interrupt mode support can be added later. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 47f44671c0dc92e2b77ff3dd843f742d12510477 Author: Brian Niebuhr Date: Mon Aug 23 16:34:13 2010 +0530 spi: davinci: remove unnecessary completion variable initialization The completion variable 'done' is unnecessarly initialized by the function davinci_spi_bufs_dma() where as it is not used for DMA transfers at all. Remove the unnecessary initialization. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 134e32b979f3f3987e84dcd5cc42040e21252e53 Author: Sekhar Nori Date: Fri Aug 20 16:27:08 2010 +0530 spi: davinci: do not treat Tx interrupt being set as error In davinci_spi_check_error(), Tx interrupt being set is treated as error. This function is only meant to flag bus error conditions and Tx interrupt being set at that point is not a bus error but rather a driver bug. Stop checking for Tx interrupt and flagging that as an IO error. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit f2bf4e849315c1573f996d082c53c6b686054da7 Author: Brian Niebuhr Date: Fri Aug 20 15:28:23 2010 +0530 spi: davinci: remove unnecessary 'count' variable in driver private data The variable count in DaVinci SPI driver's private data is largely unused and its minor use can easily be eliminated. Remove the variable. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit fab89ea330cabdaf29d82151de6d8f2369cc4da9 Author: Brian Niebuhr Date: Fri Aug 20 14:53:47 2010 +0530 spi: davinci: remove unnecessary disable of SPI In the davinci_spi_bufs_dma() function, SPI is briefly disabled before enabling it immediately back again. Remove this unnecessary disable. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 53d454a170e86594af1d27be820e678a582af751 Author: Brian Niebuhr Date: Thu Aug 19 17:04:25 2010 +0530 spi: davinci: check for NULL buffer pointer before using it In the davinci_spi_{tx|rx}_u{8|16}() functions, check for buffer pointer being valid before using it. While providing for better error checking, this change will help simplify code in the caller. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b7ab24a0da96c8fc6d551ea87e82692299df6ac6 Author: Brian Niebuhr Date: Thu Aug 19 16:42:42 2010 +0530 spi: davinci: simplify calculation of edma acount value The EDMA acount (called data_type in davinci_spi_bufs_dma()) is simply the bytes_per_word obtained in the transfer setup function. The current code calculates the acount value from bytes_per_word in a convoluted manner. Simplify the code. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 6321be60edac6037ea76e9beef375c6ae2961765 Author: Brian Niebuhr Date: Thu Aug 19 16:38:20 2010 +0530 spi: davinci: eliminate unnecessary update of davinci_spi->count The count member of davinci_spi is internal to the driver and is not shared with framework. Eliminate its unnecessary update. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cda987ebb86dfc757320bfa5c7b2afcd9d3ed30f Author: Brian Niebuhr Date: Thu Aug 19 16:16:28 2010 +0530 spi: davinci: eliminate the single member structure davinci_spi_slave The struct davinci_spi_slave has a single member. Eliminate it and store the per-chipselect data in struct davinci_spi directly. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit b6c4eeac5bc6a6bf769d7f170c507a1b78fd120a Author: Brian Niebuhr Date: Thu Aug 19 15:41:41 2010 +0530 spi: davinci: remove unused members of davinci_spi_slave Several members of struct davinci_spi_slave are unused in code. Remove such members. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7abbf23c5903e14b0cff1cdeab906eab164be767 Author: Brian Niebuhr Date: Thu Aug 19 15:07:38 2010 +0530 spi: davinci: add support for wait enable timeouts Just enabling WAITENA in SPIFMTn register waits for the enable signal from the slave indefinitely. Allow support for finite waiting by adding support for c2e delay (maximum time for addressed slave to respond) and t2e delay (maximum time for slave to respond after transmit data finished). While at it, modify the T2C and C2T defines by prepending the register name as is the convention followed for other register field elsewhere in the driver. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit fd764463fe28ac53371565f851240e74775fb1aa Author: Brian Niebuhr Date: Thu Aug 19 12:44:31 2010 +0530 spi: davinci: setup chip-select timers values only if timer enabled Setup chip-select timers values only if timer is enabled (timer_disbled in spi configuration is false). As a nice side effect, this patch removes code duplicated in davinci_spi_bufs_pio() and davinci_spi_bufs_dma(). Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 25f33512f6ae7e37d7b3d353d57d4d6d066033ce Author: Brian Niebuhr Date: Thu Aug 19 12:15:22 2010 +0530 spi: davinci: consolidate setup of SPIFMTn in one function Consolidate the setup of SPIFMTn register under davinci_spi_setup_transfer() simplifying the code and avoiding unnecessary reads and writes to the register. The two inline functions {set|clear}_fmt_bits() can be eliminated because of this. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 53a31b07c5aea4001bbb36ddd5ef2addffc7ccbd Author: Brian Niebuhr Date: Mon Aug 16 15:05:51 2010 +0530 spi: davinci: make chip-slect specific parameters really chip-select specific Some chip-select specific paramterers like wdelay, parity, usage of chip-select timers (and the actual timer values) are included in platform data forcing the same behaviour across all chip-selects. Create a new davinci_spi_config data structure which can be passed along using controller_data member of spi_device data structure on a per-device basis. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 472880c73da124b6cb5cbc31a36754aa62935afe Author: Brian Niebuhr Date: Mon Aug 16 10:28:53 2010 +0530 spi: davinci: remove 'wait_enable' platform data member The SPI_READY bit of struct spi_device:mode serves the purpose of letting the SPI master know if the slave can signal if it is ready for transfer or not. The 'wait_enable' platform data was duplicating this functionality. Use the framework provided method of indicating this capability. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7fe0092b1f55f58a749d68ace3a3597e8a2a9163 Author: Brian Niebuhr Date: Fri Aug 13 13:27:23 2010 +0530 spi: davinci: simplify prescalar calculation Simplify pre-scalar calculation and move it into a seprate function. Refuse to correct invalid pre-scalar values silently as this might lead to unexpected bugs and lower performance. Instead an error will force users to dig into the root-cause of the issue. While at it, remove some device specific checks on the maximum SPI frequency. As the driver supports the SPI interface implemented on various devices, it should only take care of core SPI limitations and leave the device specific handling to platform code. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 23853973d9b76eb8b3cf46157689bc6187e141d9 Author: Brian Niebuhr Date: Fri Aug 13 10:57:44 2010 +0530 spi: davinci: enable GPIO lines to be used as chip selects Sometimes, the chip selects provided by SPI module are muxed with other functionality and cannot be used in some designs. In such cases, it becomes convenient to use an available GPIO line as chip select. This patch enables the DaVinci SPI driver to treat specific GPIO lines as chip selects based on information provided in platform data. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit cfbc5d1d8fda9d337e912a03502cf77d29870a8e Author: Brian Niebuhr Date: Thu Aug 12 12:27:33 2010 +0530 spi: davinci: remove unnecessary data transmit on CS disable On TI DaVinci's SPI controller, the SPIDAT1 register which controls the chip slect status, also has data transmit register in the lower 16 bits. Writing to the whole 32-bits triggers an additional data transmit every time the chip select is disabled. While most SPI slaves cope-up with this, some cannot. This patch fixes this by doing a 16-bit write on the upper half of the SPIDAT1 register While at it, group the SPIGCR1 register related defines seperately from SPIDAT1 register defines. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 7978b8c385a86f0b5b9304e81a1dfb5dcaf21528 Author: Brian Niebuhr Date: Fri Aug 13 10:11:03 2010 +0530 spi: davinci: enable both activation and deactivation of chip-selects Let davinci_spi_chipselect() perform both activation and deactivation of chip selects. This lets spi_bitbang fully control chip select activation, as intended by the SPI API. With this change, the chip select activation code need not be duplicated in davinci_spi_bufs_{pio|dma}(). Also, keeping chip select active control is removed as a platform data and simply controlled using information from spi_bitbang on whether chip slect should be activated or de-activated. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 843a713bc53d04f8fac46ddd8693a2cc0422ca5e Author: Brian Niebuhr Date: Thu Aug 12 12:49:05 2010 +0530 spi: davinci: set chip-select mode in SPIDEF only once Quit writing the same constant value determining the chip-select mode when no transmissions are in progress in davinci_spi_chipelect(). Instead just setup the SPIDEF register once during probe. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 50356dd7c1f6338588af6a745649a718f16fe453 Author: Sekhar Nori Date: Fri Oct 8 15:27:26 2010 +0530 spi: davinci: remove unnecessary typecast The typecasting of SPI base address to davinci_spi_reg is unused. Remove it. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit 8e206f1cbd0d1387bf7d5e463ca880b43458e2ea Author: Sekhar Nori Date: Fri Aug 20 16:20:49 2010 +0530 spi: davinci: removed unused #defines Remove unused defines from code which should help in easy reading of code. Also, use the opportuinity to keep the SPIGCR1 register defines together. Tested-By: Michael Williamson Tested-By: Brian Niebuhr Signed-off-by: Sekhar Nori commit c3c475c2353f6d13a5c77c3b6203c0240339da7d Author: Brian Niebuhr Date: Fri Sep 3 16:19:09 2010 +0530 spi: davinci: remove unused variable 'pdata' The 'pdata' variable is unused in couple of routines. Remove such occurences. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 778e261ed678c3654386fc38bc6c50353ce04cc7 Author: Brian Niebuhr Date: Fri Sep 3 15:15:06 2010 +0530 spi: davinci: whitespace cleanup Cleanup unnecessary white space from various parts of the file. Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 3b740b10e9424f7ffb9baab1e6a3ff361cbf8ce3 Author: Brian Niebuhr Date: Fri Sep 3 14:50:07 2010 +0530 spi: davinci: fix checkpatch errors Fix the following checkpatch error: WARNING: unnecessary whitespace before a quoted newline + dev_info(&pdev->dev, "Controller at 0x%p \n", davinci_spi->base); Signed-off-by: Brian Niebuhr Tested-By: Michael Williamson Signed-off-by: Sekhar Nori commit 84e1c6bb38eb318e456558b610396d9f1afaabf0 Author: matthieu castet Date: Tue Nov 16 22:35:16 2010 +0100 x86: Add RO/NX protection for loadable kernel modules This patch is a logical extension of the protection provided by CONFIG_DEBUG_RODATA to LKMs. The protection is provided by splitting module_core and module_init into three logical parts each and setting appropriate page access permissions for each individual section: 1. Code: RO+X 2. RO data: RO+NX 3. RW data: RW+NX In order to achieve proper protection, layout_sections() have been modified to align each of the three parts mentioned above onto page boundary. Next, the corresponding page access permissions are set right before successful exit from load_module(). Further, free_module() and sys_init_module have been modified to set module_core and module_init as RW+NX right before calling module_free(). By default, the original section layout and access flags are preserved. When compiled with CONFIG_DEBUG_SET_MODULE_RONX=y, the patch will page-align each group of sections to ensure that each page contains only one type of content and will enforce RO/NX for each group of pages. -v1: Initial proof-of-concept patch. -v2: The patch have been re-written to reduce the number of #ifdefs and to make it architecture-agnostic. Code formatting has also been corrected. -v3: Opportunistic RO/NX protection is now unconditional. Section page-alignment is enabled when CONFIG_DEBUG_RODATA=y. -v4: Removed most macros and improved coding style. -v5: Changed page-alignment and RO/NX section size calculation -v6: Fixed comments. Restricted RO/NX enforcement to x86 only -v7: Introduced CONFIG_DEBUG_SET_MODULE_RONX, added calls to set_all_modules_text_rw() and set_all_modules_text_ro() in ftrace -v8: updated for compatibility with linux 2.6.33-rc5 -v9: coding style fixes -v10: more coding style fixes -v11: minor adjustments for -tip -v12: minor adjustments for v2.6.35-rc2-tip -v13: minor adjustments for v2.6.37-rc1-tip Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Acked-by: Arjan van de Ven Reviewed-by: James Morris Signed-off-by: H. Peter Anvin Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F914.9070106@free.fr> [ minor cleanliness edits, -v14: build failure fix ] Signed-off-by: Ingo Molnar commit 9437178f623a19af5951808d880a8599f66ac150 Author: Paul Turner Date: Mon Nov 15 15:47:10 2010 -0800 sched: Update tg->shares after cpu.shares write Formerly sched_group_set_shares would force a rebalance by overflowing domain share sums. Now that per-cpu averages are maintained we can set the true value by issuing an update_cfs_shares() following a tg->shares update. Also initialize tg se->load to 0 for consistency since we'll now set correct weights on enqueue. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.465521344@google.com> Signed-off-by: Ingo Molnar commit d6b5591829bd348a5fbe1c428d28dea00621cdba Author: Paul Turner Date: Mon Nov 15 15:47:09 2010 -0800 sched: Allow update_cfs_load() to update global load Refactor the global load updates from update_shares_cpu() so that update_cfs_load() can update global load when it is more than ~10% out of sync. The new global_load parameter allows us to force an update, regardless of the error factor so that we can synchronize w/ update_shares(). Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.377473595@google.com> Signed-off-by: Ingo Molnar commit 3b3d190ec3683d568fd2ebaead5e1ec7f97b6e37 Author: Paul Turner Date: Mon Nov 15 15:47:08 2010 -0800 sched: Implement demand based update_cfs_load() When the system is busy, dilation of rq->next_balance makes lb->update_shares() insufficiently frequent for threads which don't sleep (no dequeue/enqueue updates). Adjust for this by making demand based updates based on the accumulation of execution time sufficient to wrap our averaging window. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.291159744@google.com> Signed-off-by: Ingo Molnar commit c66eaf619c0c7937e9ded160ae83b5a7a6b19b56 Author: Paul Turner Date: Mon Nov 15 15:47:07 2010 -0800 sched: Update shares on idle_balance Since shares updates are no longer expensive and effectively local, update them at idle_balance(). This allows us to more quickly redistribute shares to another cpu when our load becomes idle. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.204191702@google.com> Signed-off-by: Ingo Molnar commit a7a4f8a752ec734b2eab904fc863d5dc873de338 Author: Paul Turner Date: Mon Nov 15 15:47:06 2010 -0800 sched: Add sysctl_sched_shares_window Introduce a new sysctl for the shares window and disambiguate it from sched_time_avg. A 10ms window appears to be a good compromise between accuracy and performance. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.112173964@google.com> Signed-off-by: Ingo Molnar commit 67e86250f8ea7b8f7da53ac25ea73c6bd71f5cd9 Author: Paul Turner Date: Mon Nov 15 15:47:05 2010 -0800 sched: Introduce hierarchal order on shares update list Avoid duplicate shares update calls by ensuring children always appear before parents in rq->leaf_cfs_rq_list. This allows us to do a single in-order traversal for update_shares(). Since we always enqueue in bottom-up order this reduces to 2 cases: 1) Our parent is already in the list, e.g. root \ b /\ c d* (root->b->c already enqueued) Since d's parent is enqueued we push it to the head of the list, implicitly ahead of b. 2) Our parent does not appear in the list (or we have no parent) In this case we enqueue to the tail of the list, if our parent is subsequently enqueued (bottom-up) it will appear to our right by the same rule. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234938.022488865@google.com> Signed-off-by: Ingo Molnar commit e33078baa4d30ad1d0e46d1f62b9e5a63a3e6ee3 Author: Paul Turner Date: Mon Nov 15 15:47:04 2010 -0800 sched: Fix update_cfs_load() synchronization Using cfs_rq->nr_running is not sufficient to synchronize update_cfs_load with the put path since nr_running accounting occurs at deactivation. It's also not safe to make the removal decision based on load_avg as this fails with both high periods and low shares. Resolve this by clipping history after 4 periods without activity. Note: the above will always occur from update_shares() since in the last-task-sleep-case that task will still be cfs_rq->curr when update_cfs_load is called. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.933428187@google.com> Signed-off-by: Ingo Molnar commit f0d7442a5924a802b66eef79b3708f77297bfb35 Author: Paul Turner Date: Mon Nov 15 15:47:03 2010 -0800 sched: Fix load corruption from update_cfs_shares() As part of enqueue_entity both a new entity weight and its contribution to the queuing cfs_rq / rq are updated. Since update_cfs_shares will only update the queueing weights when the entity is on_rq (which in this case it is not yet), there's a dependency loop here: update_cfs_shares needs account_entity_enqueue to update cfs_rq->load.weight account_entity_enqueue needs the updated weight for the queuing cfs_rq load[*] Fix this and avoid spurious dequeue/enqueues by issuing update_cfs_shares as if we had accounted the enqueue already. This was also resulting in rq->load corruption previously. [*]: this dependency also exists when using the group cfs_rq w/ update_cfs_shares as the weight of the enqueued entity changes without the load being updated. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.844900206@google.com> Signed-off-by: Ingo Molnar commit 9e3081ca61147b29f52fddb4f7c6b6b82ea5eb7a Author: Peter Zijlstra Date: Mon Nov 15 15:47:02 2010 -0800 sched: Make tg_shares_up() walk on-demand Make tg_shares_up() use the active cgroup list, this means we cannot do a strict bottom-up walk of the hierarchy, but assuming its a very wide tree with a small number of active groups it should be a win. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.754159484@google.com> Signed-off-by: Ingo Molnar commit 3d4b47b4b040c9d77dd68104cfc1055d89a55afd Author: Peter Zijlstra Date: Mon Nov 15 15:47:01 2010 -0800 sched: Implement on-demand (active) cfs_rq list Make certain load-balance actions scale per number of active cgroups instead of the number of existing cgroups. This makes wakeup/sleep paths more expensive, but is a win for systems where the vast majority of existing cgroups are idle. Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.666535048@google.com> Signed-off-by: Ingo Molnar commit 2069dd75c7d0f49355939e5586daf5a9ab216db7 Author: Peter Zijlstra Date: Mon Nov 15 15:47:00 2010 -0800 sched: Rewrite tg_shares_up) By tracking a per-cpu load-avg for each cfs_rq and folding it into a global task_group load on each tick we can rework tg_shares_up to be strictly per-cpu. This should improve cpu-cgroup performance for smp systems significantly. [ Paul: changed to use queueing cfs_rq + bug fixes ] Signed-off-by: Paul Turner Signed-off-by: Peter Zijlstra LKML-Reference: <20101115234937.580480400@google.com> Signed-off-by: Ingo Molnar commit 48c5ccae88dcd989d9de507e8510313c6cbd352b Author: Peter Zijlstra Date: Sat Nov 13 19:32:29 2010 +0100 sched: Simplify cpu-hot-unplug task migration While discussing the need for sched_idle_next(), Oleg remarked that since try_to_wake_up() ensures sleeping tasks will end up running on a sane cpu, we can do away with migrate_live_tasks(). If we then extend the existing hack of migrating current from CPU_DYING to migrating the full rq worth of tasks from CPU_DYING, the need for the sched_idle_next() abomination disappears as well, since idle will be the only possible thread left after the migration thread stops. This greatly simplifies the hot-unplug task migration path, as can be seen from the resulting code reduction (and about half the new lines are comments). Suggested-by: Oleg Nesterov Signed-off-by: Peter Zijlstra LKML-Reference: <1289851597.2109.547.camel@laptop> Signed-off-by: Ingo Molnar commit 92fd4d4d67b945c0766416284d4ab236b31542c4 Merge: fe7de49 e53beac Author: Ingo Molnar Date: Thu Nov 18 13:22:14 2010 +0100 Merge commit 'v2.6.37-rc2' into sched/core Merge reason: Move to a .37-rc base. Signed-off-by: Ingo Molnar commit 9da6345885e4f33437d74314f9db592da157d65d Author: Michal Simek Date: Fri Oct 22 15:48:58 2010 +1000 Revert "microblaze: Simplify syscall rutine" This reverts commit 0e41c90908881a1b8205c66a66becec7d8d4eb4a. Break jffs2 rootfs because the patch removes syscall calling from kernel space. Signed-off-by: Michal Simek commit 8cb473da3fe634fb30c1e5be8840b00f499103a8 Author: Michal Simek Date: Tue Nov 2 18:04:04 2010 +0100 microblaze: Fix initramfs Patch: initramfs: generalize initramfs_data.xxx.S variants (sha1 6ae64e428f74e7bacab898ef9665dda719ea6fde) requires hooks in linker script. Signed-off-by: Michal Simek commit 5bd5a452662bc37c54fb6828db1a3faf87e6511c Author: Matthieu Castet Date: Tue Nov 16 22:31:26 2010 +0100 x86: Add NX protection for kernel data This patch expands functionality of CONFIG_DEBUG_RODATA to set main (static) kernel data area as NX. The following steps are taken to achieve this: 1. Linker script is adjusted so .text always starts and ends on a page bound 2. Linker script is adjusted so .rodata always start and end on a page boundary 3. NX is set for all pages from _etext through _end in mark_rodata_ro. 4. free_init_pages() sets released memory NX in arch/x86/mm/init.c 5. bios rom is set to x when pcibios is used. The results of patch application may be observed in the diff of kernel page table dumps: pcibios: -- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400 ++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400 0x00000000-0xc0000000 3G pmd ---[ Kernel Mapping ]--- -0xc0000000-0xc0100000 1M RW GLB x pte +0xc0000000-0xc00a0000 640K RW GLB NX pte +0xc00a0000-0xc0100000 384K RW GLB x pte -0xc0100000-0xc03d7000 2908K ro GLB x pte +0xc0100000-0xc0318000 2144K ro GLB x pte +0xc0318000-0xc03d7000 764K ro GLB NX pte -0xc03d7000-0xc0600000 2212K RW GLB x pte +0xc03d7000-0xc0600000 2212K RW GLB NX pte 0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd 0xf7a00000-0xf7bfe000 2040K RW GLB NX pte 0xf7bfe000-0xf7c00000 8K pte No pcibios: -- data_nx_pt_before.txt 2009-10-13 07:48:59.000000000 -0400 ++ data_nx_pt_after.txt 2009-10-13 07:26:46.000000000 -0400 0x00000000-0xc0000000 3G pmd ---[ Kernel Mapping ]--- -0xc0000000-0xc0100000 1M RW GLB x pte +0xc0000000-0xc0100000 1M RW GLB NX pte -0xc0100000-0xc03d7000 2908K ro GLB x pte +0xc0100000-0xc0318000 2144K ro GLB x pte +0xc0318000-0xc03d7000 764K ro GLB NX pte -0xc03d7000-0xc0600000 2212K RW GLB x pte +0xc03d7000-0xc0600000 2212K RW GLB NX pte 0xc0600000-0xf7a00000 884M RW PSE GLB NX pmd 0xf7a00000-0xf7bfe000 2040K RW GLB NX pte 0xf7bfe000-0xf7c00000 8K pte The patch has been originally developed for Linux 2.6.34-rc2 x86 by Siarhei Liakh and Xuxian Jiang . -v1: initial patch for 2.6.30 -v2: patch for 2.6.31-rc7 -v3: moved all code into arch/x86, adjusted credits -v4: fixed ifdef, removed credits from CREDITS -v5: fixed an address calculation bug in mark_nxdata_nx() -v6: added acked-by and PT dump diff to commit log -v7: minor adjustments for -tip -v8: rework with the merge of "Set first MB as RW+NX" Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Signed-off-by: Matthieu CASTET Cc: Arjan van de Ven Cc: James Morris Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F82E.60601@free.fr> [ minor cleanliness edits ] Signed-off-by: Ingo Molnar commit 64edc8ed5ffae999d8d413ba006850e9e34166cb Author: matthieu castet Date: Tue Nov 16 22:30:27 2010 +0100 x86: Fix improper large page preservation This patch fixes a bug in try_preserve_large_page() which may result in improper large page preservation and improper application of page attributes to the memory area outside of the original change request. More specifically, the problem manifests itself when set_memory_*() is called for several pages at the beginning of the large page and try_preserve_large_page() erroneously concludes that the change can be applied to whole large page. The fix consists of 3 parts: 1. Addition of "required" protection attributes in static_protections(), so .data and .bss can be guaranteed to stay "RW" 2. static_protections() is now called for every small page within large page to determine compatibility of new protection attributes (instead of just small pages within the requested range). 3. Large page can be preserved only if attribute change is large-page-aligned and covers whole large page. -v1: Try_preserve_large_page() patch for Linux 2.6.34-rc2 -v2: Replaced pfn check with address check for kernel rw-data Signed-off-by: Siarhei Liakh Signed-off-by: Xuxian Jiang Reviewed-by: Suresh Siddha Cc: Arjan van de Ven Cc: James Morris Cc: Andi Kleen Cc: Rusty Russell Cc: Stephen Rothwell Cc: Dave Jones Cc: Kees Cook Cc: Linus Torvalds LKML-Reference: <4CE2F7F3.8030809@free.fr> Signed-off-by: Ingo Molnar commit e9229faf920aba47dd1ba6940b3ca138024543d3 Author: Tracey Dent Date: Sun Nov 7 09:46:28 2010 -0500 HID: usbhid: Clean up makefile (-y instead of -objs) Changed Makefile to use -y instead of -objs because -objs is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Jiri Kosina commit d47d612459300510215fc54bf1283f81710745df Author: Tracey Dent Date: Thu Nov 18 10:42:30 2010 +0100 HID: Clean up makefile (-y instead of -objs) Changed Makefile to use -y instead of -objs because -objs is deprecated and should now be switched. According to (documentation/kbuild/makefiles.txt). Signed-off-by: Tracey Dent Signed-off-by: Jiri Kosina commit 82148d1d0b2f369851f2dff5088f7840f9f16abf Author: Shérab Date: Sat Sep 25 06:06:57 2010 +0200 x86/platform: Add Eurobraille/Iris power off support The Iris machines from Eurobraille do not have APM or ACPI support to shut themselves down properly. A special I/O sequence is needed to do so. This modle runs this I/O sequence at kernel shutdown when its force parameter is set to 1. Signed-off-by: Shérab Acked-by: "H. Peter Anvin" [ did minor coding style edits ] Signed-off-by: Ingo Molnar commit 79250af2d5953b69380a6319b493862bf4ece972 Author: Kees Cook Date: Tue Nov 16 10:10:04 2010 -0800 x86: Fix included-by file reference comments Adjust the paths for files that are including verify_cpu.S. Reported-by: Yinghai Lu Signed-off-by: Kees Cook Acked-by: Pekka Enberg Cc: Alan Cox LKML-Reference: <1289931004-16066-1-git-send-email-kees.cook@canonical.com> Signed-off-by: Ingo Molnar commit 0421860a5a75b59a76b7a864a172eb090e3d0785 Merge: cf655c3 89ba4d1 Author: Paul Mundt Date: Thu Nov 18 17:35:56 2010 +0900 Merge branch 'rmobile/ag5' into rmobile-latest commit c44f242064093e640a068741b05ee6acdd49bc22 Author: Dmitry Torokhov Date: Mon Nov 15 01:39:57 2010 -0800 Input: gameport - convert to use common workqueue instead of a thread Instead of creating an exclusive thread to handle gameport events (which happen rarely), let's switch to common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov commit 8ee294cd9def0004887da7f44b80563493b0a097 Author: Dmitry Torokhov Date: Mon Nov 15 01:39:57 2010 -0800 Input: serio - convert to common workqueue instead of a thread Instead of creating an exclusive thread to handle serio events (which happen rarely), let's switch to using common workqueue. With the arrival of concurrency-managed workqueue infrastructure we are not concerned that our callers or callees also using workqueue (no deadlocks anymore) and it should reduce total number of threads in the system. Signed-off-by: Dmitry Torokhov commit ce16a474f6305dd631c885ba970d5746e4d5c803 Author: Chris Leech Date: Wed Nov 17 23:59:54 2010 -0800 Input: qt602240_ts - fix wrong sizeof in object table allocation The kcalloc call for the object table is using sizeof(struct qt602240_data) when it should be using sizeof(struct qt6602240_object), resulting in a larger allocation than is required. Signed-off-by: Chris Leech Signed-off-by: Dmitry Torokhov commit 8b5fce06f8795d9a7f8d1f03f743fc8befa66b3b Author: Dmitry Torokhov Date: Thu Nov 18 00:14:03 2010 -0800 Input: qt602240_ts - convert to using dev_pm_ops Signed-off-by: Dmitry Torokhov commit e3f0f0a6c11b049f1be603dcfec82d2a8643f5fd Author: Axel Lin Date: Wed Nov 17 23:59:34 2010 -0800 Input: xpad - ensure xpad->bulk_out is initialized before submitting urb As pointed out by Oliver Neukum: xpad->irq_in is currently submitted before xpad->bulk_out is allocated. That however is a race, because the callback for irq_in can call xpad360w_process_packet(), which will in turn submit the bulk URB. This patch moves initialization for xpad->bulk_out earlier, so we can ensure xpad->bulk_out is initialized before submitting urb. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 072b198a4ad48bd722ec6d203d65422a4698eae7 Author: Don Zickus Date: Fri Nov 12 11:22:24 2010 -0500 x86, nmi_watchdog: Remove all stub function calls from old nmi_watchdog Now that the bulk of the old nmi_watchdog is gone, remove all the stub variables and hooks associated with it. This touches lots of files mainly because of how the io_apic nmi_watchdog was implemented. Now that the io_apic nmi_watchdog is forever gone, remove all its fingers. Most of this code was not being exercised by virtue of nmi_watchdog != NMI_IO_APIC, so there shouldn't be anything to risky here. Signed-off-by: Don Zickus Cc: fweisbec@gmail.com Cc: gorcunov@openvz.org LKML-Reference: <1289578944-28564-3-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 5f2b0ba4d94b3ac23cbc4b7f675d98eb677a760a Author: Don Zickus Date: Fri Nov 12 11:22:23 2010 -0500 x86, nmi_watchdog: Remove the old nmi_watchdog Now that we have a new nmi_watchdog that is more generic and sits on top of the perf subsystem, we really do not need the old nmi_watchdog any more. In addition, the old nmi_watchdog doesn't really work if you are using the default clocksource, hpet. The old nmi_watchdog code relied on local apic interrupts to determine if the cpu is still alive. With hpet as the clocksource, these interrupts don't increment any more and the old nmi_watchdog triggers false postives. This piece removes the old nmi_watchdog code and stubs out any variables and functions calls. The stubs are the same ones used by the new nmi_watchdog code, so it should be well tested. Signed-off-by: Don Zickus Cc: fweisbec@gmail.com Cc: gorcunov@openvz.org LKML-Reference: <1289578944-28564-2-git-send-email-dzickus@redhat.com> Signed-off-by: Ingo Molnar commit 89ba4d12fca24d373e1b10fce498d68157bafaf0 Author: Paul Mundt Date: Thu Nov 18 16:47:02 2010 +0900 ARM: mach-shmobile: Add ag5evm defconfig. Signed-off-by: Paul Mundt commit 45bbaae0dcddc275594e23f108cb68869eae7433 Author: Paul Mundt Date: Thu Nov 18 16:07:27 2010 +0900 ARM: mach-shmobile: Split out entry-macros in to GIC and INTC variants. Presently the entry macros are all globbed together, this simply splits them out in to their insular variants. Future work such as the GIC generalization will replace some of these and tidy the abstraction up further. Signed-off-by: Paul Mundt commit 6d9598e24d50a8c72f48a3864327484a30aaee44 Author: Magnus Damm Date: Wed Nov 17 10:59:31 2010 +0000 ARM: mach-shmobile: Initial AG5 and AG5EVM support This patch adds initial support for Renesas SH-Mobile AG5. At this point the AG5 CPU support is limited to the ARM core, SCIF serial and a CMT timer together with L2 cache and the GIC. The AG5EVM board also supports Ethernet. Future patches will add support for GPIO, INTCS, CPGA and platform data / driver updates for devices such as IIC, LCDC, FSI, KEYSC, CEU and SDHI among others. The code in entry-macro.S will be cleaned up when the ARM IRQ demux code improvements have been merged. Depends on the AG5EVM mach-type recently registered but not yet present in arch/arm/tools/mach-types. As the AG5EVM board comes with 512MiB memory it is recommended to turn on HIGHMEM. Many thanks to Yoshii-san for initial bring up. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b2c0710c464ede15e1fc52fb1e7ee9ba54cea186 Author: Paul E. McKenney Date: Thu Sep 9 13:40:39 2010 -0700 rcu: move TINY_RCU from softirq to kthread If RCU priority boosting is to be meaningful, callback invocation must be boosted in addition to preempted RCU readers. Otherwise, in presence of CPU real-time threads, the grace period ends, but the callbacks don't get invoked. If the callbacks don't get invoked, the associated memory doesn't get freed, so the system is still subject to OOM. But it is not reasonable to priority-boost RCU_SOFTIRQ, so this commit moves the callback invocations to a kthread, which can be boosted easily. Signed-off-by: Paul E. McKenney Signed-off-by: Paul E. McKenney commit 6b6e39a6a8da7234c538d14c43d3583da8875f9c Author: Kay Sievers Date: Mon Nov 15 23:13:18 2010 +0100 driver-core: merge private parts of class and bus As classes and busses are pretty much the same thing, and we want to merge them together into a 'subsystem' in the future, let us share the same private data parts to make that merge easier. Signed-off-by: Kay Sievers Signed-off-by: Greg Kroah-Hartman commit 14c05aa399e30f343f25158c9adfc44631378a96 Merge: 319684b e53beac Author: Greg Kroah-Hartman Date: Wed Nov 17 13:47:26 2010 -0800 Driver core: Merge 2.6.37-rc2 into driver-core-next This resolves some build issues that were present in the older -rc1 tree that kept bothering me. Signed-off-by: Greg Kroah-Hartman commit 4f6838436915fdc281173bfd5bef6d8ab5cb1a7f Author: Dirk Brandewie Date: Wed Nov 17 07:43:09 2010 -0800 USB: ce4100: Add support for CE4100 EHCI IP block to EHCI driver This patch adds support for the EHCI IP block present on the Intel CE4100. Signed-off-by: Dirk Brandewie CC: David Brownell Signed-off-by: Greg Kroah-Hartman commit 2f15744c1d90ee2e82f8ae5724b44b1cdf31715c Author: Alan Stern Date: Wed Nov 17 10:56:01 2010 -0500 USB: fix leftover references to udev->autosuspend_delay This patch (as1436) takes care of leftover references to udev->autosuspend_delay that didn't get removed during the earlier conversion to the runtime-PM autosuspend API. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit aa02f172ac85f144d0baa248e27e34e165963f94 Author: Michal Nazarewicz Date: Wed Nov 17 17:09:47 2010 +0100 usb: gadget: g_fs: Fix compilation warning This commit fixes warning in f_fs.c introduced by "usb: gadget: f_fs: remove custom printk() wrappers": In file included from drivers/usb/gadget/g_ffs.c:64: drivers/usb/gadget/f_fs.c:30:1: warning: "pr_fmt" redefined Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 50a9432daeece6fc1309bef1dc0a7b8fde8204cb Author: Johannes Berg Date: Tue Nov 16 11:50:28 2010 -0800 mac80211: fix powersaving clients races The code to handle powersaving stations has a race: when the powersave flag is lifted from a station, we could transmit a packet that is being processed for TX at the same time right away, even if there are other frames queued for it. This would cause frame reordering. To fix this, lift the flag only under the appropriate lock that blocks TX. Additionally, the code to allow drivers to block a station while frames for it are on the HW queue is never re-enabled the station, so traffic would get stuck indefinitely. Fix this by clearing the flag for this appropriately. Finally, as an optimisation, don't do anything if the driver unblocks an already unblocked station. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 4bce22b9b84032c77c7e038b07b24fcc706dfc10 Author: Johannes Berg Date: Tue Nov 16 11:49:58 2010 -0800 mac80211: defines for AC numbers In many places we've just hardcoded the AC numbers -- which is a relic from the original mac80211 (d80211). Add constants for them so we know what we're talking about. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 488f6ba75b5deaa7e89d6cdac07e0f2120899b6f Author: Felix Fietkau Date: Tue Nov 16 19:20:28 2010 +0100 ath9k_hw: add support for reading EEPROM data from the internal OTP ROM Some of the new AR9003 cards do not come with an external EEPROM chip anymore. Calibration data on these cards is stored in the OTP ROM on the chip. This patch adds support for reading this data, and also adds support for different EEPROM chip sizes (512 bytes instead of 1K). Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2d42efc44e38d3a8b2bf30e34559036bb6541672 Author: Felix Fietkau Date: Sun Nov 14 15:20:13 2010 +0100 ath9k: store frame information used by aggregation inside the skb tx info Since the pointers after the rates in the tx info cannot be used anymore after frames have been queued, this area can be used to store information that was previously stored in the ath_buf. With these changes, we can delay the ath_buf assignment in the aggregation code until aggregates are formed. That will not only make it possible to simplify DMA descriptor setup to do less rewriting of uncached memory, but will also make it easier to move aggregation out of the core of the ath9k tx path. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 04caf863750bc7e042d1e8d57e5ce9d6326ab435 Author: Felix Fietkau Date: Sun Nov 14 15:20:12 2010 +0100 ath9k: more tx setup cleanups - remove the BUF_HT flag, and instead check for IEEE80211_TX_CTL_AMPDU before calling ath_tx_send_ampdu. - remove a few unused variables - calculate frame length before adding the frame padding - merge the misnamed ath_tx_start_dma function into ath_tx_start - remove an unused argument for assign_aggr_tid_seqno Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 71a3bf3e94b745467fc4c3451a294910f0369555 Author: Felix Fietkau Date: Sun Nov 14 15:20:11 2010 +0100 ath9k: block new AMPDU sessions if SC_OP_TXAGGR is not set This makes further tx path cleanups easier Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 28d167086227969fd6586953ee4ac682a3c394ff Author: Felix Fietkau Date: Sun Nov 14 15:20:10 2010 +0100 ath9k: clean up code duplication around ath_tx_start Merge initial processing for the CAB queue and regular tx. Also move ath_tx_cabq() to beacon.c and make it static. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c5992618259598ade82c386aa1595bf105e92d1f Author: Felix Fietkau Date: Sun Nov 14 15:20:09 2010 +0100 ath9k: remove bf_tx_aborted from struct ath_buf Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 76e4522177de81ac89ade01a394aeb3704a66f1b Author: Felix Fietkau Date: Sun Nov 14 15:20:08 2010 +0100 ath9k: remove bfs_frmlen from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit b572d0335fcb26e526f6ae087a9a09371b22e739 Author: Felix Fietkau Date: Sun Nov 14 15:20:07 2010 +0100 ath9k: remove bfs_nframes from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 269c44bc8415ad78fb4dc3de25e6de3420332e9f Author: Felix Fietkau Date: Sun Nov 14 15:20:06 2010 +0100 ath9k: remove bfs_al from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 3017047f564d5101009c8318b94bdacd3ca3312e Author: Felix Fietkau Date: Sun Nov 14 15:20:05 2010 +0100 ath9k: remove bfs_keyix from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 82259b77f6e55c5b81f5f4a2852f6216c196ef30 Author: Felix Fietkau Date: Sun Nov 14 15:20:04 2010 +0100 ath9k: remove bfs_paprd_timestamp from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 952cd693718d8ac796d5323fe7876241cf15ecfa Author: Felix Fietkau Date: Sun Nov 14 15:20:03 2010 +0100 ath9k: remove bfs_keytype from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 5daefbd061d9509644058b6886abe2b6672ee386 Author: Felix Fietkau Date: Sun Nov 14 15:20:02 2010 +0100 ath9k: remove bfs_tidno from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 2d3bcba0827013dfc60f727e7370dea00bc0638a Author: Felix Fietkau Date: Sun Nov 14 15:20:01 2010 +0100 ath9k: remove bfs_seqno from struct ath_buf_state Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9a6b82706317333a1fab5dcafa2c33b91253a7a2 Author: Felix Fietkau Date: Sun Nov 14 00:03:01 2010 +0100 ath9k: fix PA predistortion training frame setup Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit c5d0855acfa4d6801c4c45bc02ddddd959262050 Author: Felix Fietkau Date: Sat Nov 13 20:22:41 2010 +0100 ath9k_hw: set default values for radar pulse detection Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 387e68846413f3dcfc5a5afca9841430057e3340 Author: RA-Jay Hung Date: Sat Nov 13 19:13:53 2010 +0100 rt2x00: Modify rt2x00queue_remove_l2pad to make skb->data two-byte alignment When send out skb data to mac80211, orignal code will cause mac80211 unaligned access, so modify code to make mac80211 can natural access. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f8eaec659f8a7a4e0086fca7c5d5c5e0fbc76d1a Author: RA-Jay Hung Date: Sat Nov 13 19:12:54 2010 +0100 rt2x00: Fix header_length in rt2x00lib_txdone Put the assignment of header_length after pull out extra tx headroom Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit b43d63bd69ae5464a52bf1796e84097607917b2f Author: RA-Jay Hung Date: Sat Nov 13 19:11:46 2010 +0100 rt2x00: Fix rt2800 USB TX Path DMA issue rt2800usb chips need to add 1~3 bytes zero padding after each 802.11 header & payload, and at the end need to add 4 bytes zero padding whether doing TX bulk aggregation or not, TXINFO_W0_USB_DMA_TX_PKT_LEN in TXINFO must include 1-3 bytes padding after 802.11 header & payload but do not include 4 bytes end zero padding. In rt2800usb_get_tx_data_len do not consider multiple of the USB packet size case, sometimes this will cause USB DMA problem. Signed-off-by: RA-Jay Hung Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit ef8397cfb3a385bc57a32213d0e4a5b7903a9dc6 Author: Gertjan van Wingerde Date: Sat Nov 13 19:11:22 2010 +0100 rt2x00: Use ioremap for SoC devices instead of KSEG1ADDR. Make the code a bit more portable to architectures that do not support KSEG1ADDR. Signed-off-by: Gertjan van Wingerde Tested-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 72c7296e03e381b49958809915105b18b09fa7a3 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:54 2010 +0100 rt2x00: Remove unneccessary internal Kconfig symbols. CONFIG_RT2800PCI_PCI and CONFIG_RT2800PCI_SOC are strictly not needed as we can check the dependent symbols directly in the rest of Kconfig and the code, so clean up the Kconfig namespace a bit. Signed-off-by: Gertjan van Wingerde Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit a6a8d66ebaea1e78d779af221bd6f01c5cbe71f5 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:31 2010 +0100 rt2x00: Remove RT30XX Kconfig variables. Enabling of RT30xx devices via Kconfig variables was introduced when these devices weren't properly supported yet. Now that that they are properly supported and functional, we can remove these Kconfig variables for RT30xx devices and simply enable them whenever rt2800pci and/or rt2800usb is enabled. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 46af584d2ea86518c4cdf521903cd93ba6de2ec0 Author: Gertjan van Wingerde Date: Sat Nov 13 19:10:10 2010 +0100 rt2x00: Clean up Kconfig for RT2800 devices. General clean up of the Kconfig part for RT28XX devices. Also remove the indications of non functional support for rt27xx/rt28xx/rt30xx devices, as this is no longer true. They just work fine. Finally, remove the experimental indications for rt27xx/rt28xx/rt30xx devices as that is no longer true. Keep the experimental indications for rt33xx/rt35xx devices, though. Signed-off-by: Gertjan van Wingerde Acked-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f93bc9b3ce379800b30b3c2f4fc945ae35a80039 Author: Gertjan van Wingerde Date: Sat Nov 13 19:09:50 2010 +0100 rt2x00: Add initial support for RT3370/RT3390 devices. Modified from Eddy's patch by adding the RT3370 USB support as well. Signed-off-by: Gertjan van Wingerde Cc: Eddy Tsai Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit ae4ecb9f8f01eb9deffb5bd837dc90f4e646cd2d Author: Ivo van Doorn Date: Sat Nov 13 19:08:14 2010 +0100 rt2x00: Increase REGISTER_BUSY_COUNT For some hardware the REGISTER_BUSY_COUNT isn't sufficient, increase the REGISTER_BUSY_COUNT to 100 to catch most devices which have more problems with accessing the registers. For normal operating devices nothing would change as they will exit the loop early anyway. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Signed-off-by: John W. Linville commit 24aee93c37fe7fa2aa2381d3017be478e9c55c47 Author: Vinod Koul Date: Wed Nov 17 15:57:57 2010 +0000 sst: remove rest of aava bits and aava related code This removes the remaining bit of aava dependent and related bits from driver Signed-off-by: Vinod Koul Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 63fcf10db218a89cbd1e34c47540c3e28706cff1 Author: Yong Wang Date: Wed Nov 17 22:09:54 2010 +0800 staging: spectra: asynchronous init The spectra nand driver takes quite some time to initialize because it needs to scan the whole nand disk to find the latest block table. This patch initializes the spectra nand driver asynchronously so that other things in the kernel can initialize in parallel to the scanning operation. Signed-off-by: Yong Wang Signed-off-by: Greg Kroah-Hartman commit 6f5a416216fe2c39171326897e074d417df1082b Author: Yong Wang Date: Wed Nov 17 22:08:28 2010 +0800 staging: spectra: move all init logic into nand_pci_probe Currently there are some driver initialization logic that is not part of nand_pci_probe function. This will result in that part of driver initialization code executing even on platforms without the corresponding hardware which is always dangerous. Signed-off-by: Chuanxiao Dong Signed-off-by: Yong Wang Signed-off-by: Greg Kroah-Hartman commit 237a1a1aef91ab654988cb459d783ac0ee09d2ea Author: Dan Carpenter Date: Wed Nov 17 11:54:35 2010 +0300 Staging: ft1000-usb: freeing uninitialized pointer GCC complains that if (info->CardReady) is false we kfree() an uninitialized pointer. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 93760716840a3feada381786f2defbd47a8099de Author: Brett Rudley Date: Tue Nov 16 17:41:15 2010 -0800 staging: brcm80211: nicpci.c: replace osl based PCI calls with native linux pci calls Get rid of the private PCI access routines and replace with standard calls from linux/pci.h in nicpci.c (The private versions are still used in siutils.c... for now) Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit e69284f24320e2589dbd78bf531ffa18d097ae4c Author: Brett Rudley Date: Tue Nov 16 15:45:48 2010 -0800 staging: brcm80211: s/osl_t/struct osl_info/g Do the substitution (and then fix all the dang lines that were pushed past 80 columns.) Some of the touched lines triggered checkpatch warnings for completely unrelated reasons that were already there. Those will have to be addressed later. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit e6a12a07d0b06f8e614a212e26002e62071242e8 Author: Brett Rudley Date: Tue Nov 16 13:16:59 2010 -0800 staging: brcm80211: completely remove osl_pubinfo_t typedef Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 1070137de3e3b0f3fdfedc420a06a43d05a6e705 Author: Brett Rudley Date: Tue Nov 16 13:16:58 2010 -0800 staging: brcm80211: expose osl contents and start combining osl and pub_osl. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit dda0b38692a7298f433b92b1329867b1ecabb4bb Author: Vasiliy Kulikov Date: Sun Nov 14 07:06:08 2010 +0000 net: ipv4: tcp_probe: cleanup snprintf() use snprintf() returns number of bytes that were copied if there is no overflow. This code uses return value as number of copied bytes. Theoretically format string '%lu.%09lu %pI4:%u %pI4:%u %d %#x %#x %u %u %u %u\n' may be expanded up to 163 bytes. In reality tv.tv_sec is just few bytes instead of 20, 2 ports are just 5 bytes each instead of 10, length is 5 bytes instead of 10. The rest is an unstrusted input. Theoretically if tv_sec is big then copy_to_user() would overflow tbuf. tbuf was increased to fit in 163 bytes. snprintf() is used to follow return value semantic. Signed-off-by: Vasiliy Kulikov Signed-off-by: David S. Miller commit 9ea19481db31d614f729f346bdcf28e4e60ff14a Author: John Fastabend Date: Tue Nov 16 06:31:39 2010 +0000 net: zero kobject in rx_queue_release netif_set_real_num_rx_queues() can decrement and increment the number of rx queues. For example ixgbe does this as features and offloads are toggled. Presumably this could also happen across down/up on most devices if the available resources changed (cpu offlined). The kobject needs to be zero'd in this case so that the state is not preserved across kobject_put()/kobject_init_and_add(). This resolves the following error report. ixgbe 0000:03:00.0: eth2: NIC Link is Up 10 Gbps, Flow Control: RX/TX kobject (ffff880324b83210): tried to init an initialized object, something is seriously wrong. Pid: 1972, comm: lldpad Not tainted 2.6.37-rc18021qaz+ #169 Call Trace: [] kobject_init+0x3a/0x83 [] kobject_init_and_add+0x23/0x57 [] ? mark_lock+0x21/0x267 [] net_rx_queue_update_kobjects+0x63/0xc6 [] netif_set_real_num_rx_queues+0x5f/0x78 [] ixgbe_set_num_queues+0x1c6/0x1ca [ixgbe] [] ixgbe_init_interrupt_scheme+0x1e/0x79c [ixgbe] [] ixgbe_dcbnl_set_state+0x167/0x189 [ixgbe] Signed-off-by: John Fastabend Signed-off-by: David S. Miller commit 5811662b15db018c740c57d037523683fd3e6123 Author: Changli Gao Date: Fri Nov 12 18:43:55 2010 +0000 net: use the macros defined for the members of flowi Use the macros defined for the members of flowi to clean the code up. Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit dd68ad2235b4625e0dc928b2b4c614d265f976d3 Author: Philippe De Muyter Date: Sat Nov 13 08:43:29 2010 +0000 net: more Kconfig whitespace cleanup indentation for TSI108_ETH entry was too big. Signed-off-by: Philippe De Muyter Signed-off-by: David S. Miller commit b1323c8fa153f63e20d5a7fc0be72073c3beb05b Author: Joe Perches Date: Fri Nov 12 11:37:59 2010 +0000 drivers/net/can/sja1000: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit d8ee707114bc3615fd7be90eb942eba2dbe668ed Author: Joe Perches Date: Mon Nov 15 10:13:58 2010 +0000 drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit a31ff3880578c37fd5c71ee863c23897dacfa9f8 Author: Joe Perches Date: Mon Nov 15 10:13:57 2010 +0000 drivers/net/s2io.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 802aa9c058f2046f0a5683f04d7755c362734010 Author: Anirban Chakraborty Date: Tue Nov 16 14:09:06 2010 +0000 qlcnic: Bumped up driver version to 5.0.12 Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 706f23ada68746ed475488e7d2e2ca392fc4f731 Author: Sony Chacko Date: Tue Nov 16 14:08:46 2010 +0000 qlcnic: lro off message log from set rx checsum Log LRO off message while disabling rx checksum only when LRO is already enabled. Signed-off-by: Sony Chacko Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 2679a135e6452359cd807754617db0d05ad404e5 Author: Sritej Velaga Date: Tue Nov 16 14:08:23 2010 +0000 qlcnic: Add description for CN1000Q adapter Add description for CN1000Q adapter Signed-off-by: Sritej Velaga Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit c21fd48c22bd1a9c4a5286963086f246c782e47e Author: Rajesh Borundia Date: Tue Nov 16 14:08:06 2010 +0000 qlcnic: Fix for kdump In case of kdump environment the function may be in unknown state. Reset the function using PCI FLR before initializing it. Signed-off-by: Rajesh Borundia Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit 2abea2f0a5ab161facd865356d2e59b23204414e Author: Sucheta Chakraborty Date: Tue Nov 16 14:07:53 2010 +0000 qlcnic: Allow minimum bandwidth of zero Allow minimum bandwidth to be set zero Signed-off-by: Sucheta Chakraborty Signed-off-by: Anirban Chakraborty Signed-off-by: David S. Miller commit b382b191ea9e9ccefc437433d23befe91f4a8925 Author: Thomas Graf Date: Tue Nov 16 04:33:57 2010 +0000 ipv6: AF_INET6 link address family IPv6 already exposes some address family data via netlink in the IFLA_PROTINFO attribute if RTM_GETLINK request is sent with the address family set to AF_INET6. We take over this format and reuse all the code. Signed-off-by: Thomas Graf Cc: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 9f0f7272ac9506f4c8c05cc597b7e376b0b9f3e4 Author: Thomas Graf Date: Tue Nov 16 04:32:48 2010 +0000 ipv4: AF_INET link address family Implements the AF_INET link address family exposing the per device configuration settings via netlink using the attribute IFLA_INET_CONF. The format of IFLA_INET_CONF differs depending on the direction the attribute is sent. The attribute sent by the kernel consists of a u32 array, basically a 1:1 copy of in_device->cnf.data[]. The attribute expected by the kernel must consist of a sequence of nested u32 attributes, each representing a change request, e.g. [IFLA_INET_CONF] = { [IPV4_DEVCONF_FORWARDING] = 1, [IPV4_DEVCONF_NOXFRM] = 0, } libnl userspace API documentation and example available from: http://www.infradead.org/~tgr/libnl/doc-git/group__link__inet.html Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit ca7479ebbd9f7621646bf2792cb7143647f035bb Author: Thomas Graf Date: Tue Nov 16 04:31:20 2010 +0000 inet: Define IPV4_DEVCONF_MAX Define IPV4_DEVCONF_MAX to get rid of MAX - 1 notation. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit f8ff182c716c6f11ca3061961f5722f26a14e101 Author: Thomas Graf Date: Tue Nov 16 04:30:14 2010 +0000 rtnetlink: Link address family API Each net_device contains address family specific data such as per device settings and statistics. We already expose this data via procfs/sysfs and partially netlink. The netlink method requires the requester to send one RTM_GETLINK request for each address family it wishes to receive data of and then merge this data itself. This patch implements a new API which combines all address family specific link data in a new netlink attribute IFLA_AF_SPEC. IFLA_AF_SPEC contains a sequence of nested attributes, one for each address family which in turn defines the structure of its own attribute. Example: [IFLA_AF_SPEC] = { [AF_INET] = { [IFLA_INET_CONF] = ..., }, [AF_INET6] = { [IFLA_INET6_FLAGS] = ..., [IFLA_INET6_CONF] = ..., } } The API also allows for address families to implement a function which parses the IFLA_AF_SPEC attribute sent by userspace to implement address family specific link options. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller commit d67ef35fff67845c64d806c033cc7c569ccebfff Author: Jeremy Eder Date: Mon Nov 15 05:41:31 2010 +0000 clarify documentation for net.ipv4.igmp_max_memberships This patch helps clarify documentation for net.ipv4.igmp_max_memberships by providing a formula for calculating the maximum number of multicast groups that can be subscribed to, plus defining the theoretical limit. Signed-off-by: Jiri Pirko Signed-off-by: Jeremy Eder Signed-off-by: David S. Miller commit 3df94756fe9026c6386ebd10501c2df85df3dbee Merge: 84dab56 bedad0c Author: Mark Brown Date: Wed Nov 17 18:59:19 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 9920239c90d5f6dadfb44325abf3568a5e3fd827 Author: Joe Perches Date: Wed Nov 10 18:54:58 2010 +0000 drivers/isdn/hisax: Add printf format/argument verification and fix fallout Add __attribute__((format... to several functins Make formats and arguments match. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1f1aaf82825865a50cef0b4722607abb12aeee52 Author: Eric Paris Date: Tue Nov 16 11:52:57 2010 +0000 SELinux: return -ECONNREFUSED from ip_postroute to signal fatal error The SELinux netfilter hooks just return NF_DROP if they drop a packet. We want to signal that a drop in this hook is a permanant fatal error and is not transient. If we do this the error will be passed back up the stack in some places and applications will get a faster interaction that something went wrong. Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit ee58681195bf243bafc44ca53f3c24429d096cce Author: Eric Paris Date: Tue Nov 16 11:52:49 2010 +0000 network: tcp_connect should return certain errors up the stack The current tcp_connect code completely ignores errors from sending an skb. This makes sense in many situations (like -ENOBUFFS) but I want to be able to immediately fail connections if they are denied by the SELinux netfilter hook. Netfilter does not normally return ECONNREFUSED when it drops a packet so we respect that error code as a final and fatal error that can not be recovered. Based-on-patch-by: Patrick McHardy Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit da6836500414ae734cd9873c2d553db594f831e9 Author: Eric Paris Date: Tue Nov 16 11:52:38 2010 +0000 netfilter: allow hooks to pass error code back up the stack SELinux would like to pass certain fatal errors back up the stack. This patch implements the generic netfilter support for this functionality. Based-on-patch-by: Patrick McHardy Signed-off-by: Eric Paris Signed-off-by: David S. Miller commit 37d668004289d202f71dc5bfdadf6c18b34577a2 Author: Joe Perches Date: Mon Nov 15 11:12:33 2010 +0000 net/atm: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ece49153b601d95bcebd45a6394e370972f0b0a0 Author: Joe Perches Date: Mon Nov 15 11:12:31 2010 +0000 drivers/net: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 5f54cebb13cdb8dcd85036f8bee29f14db18b6e1 Author: Joe Perches Date: Mon Nov 15 11:12:30 2010 +0000 drivers/net/vxge: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Acked-by: Jon Mason Signed-off-by: David S. Miller commit 8739cfef1ab8bc02e1bf38c02399afe62f3a7800 Author: Joe Perches Date: Mon Nov 15 11:12:29 2010 +0000 drivers/net/usb: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b16fed0af8416ee0fe9af6c1977f7b05e7e7c9b2 Author: Joe Perches Date: Mon Nov 15 11:12:28 2010 +0000 drivers/net/qlge: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 4dd151876b6b81040121708ebc23c6cd1a3d5be8 Author: Joe Perches Date: Mon Nov 15 11:12:27 2010 +0000 drivers/net/qla3xxx.c: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a887e220760c12e00b0591d67987e26f6e270d71 Author: Joe Perches Date: Mon Nov 15 11:12:26 2010 +0000 drivers/net/pcmcia: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c04914af6861d62df303aeedbbe554972ce4e736 Author: Joe Perches Date: Mon Nov 15 11:12:25 2010 +0000 drivers/net/bonding: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a17531fa4c951f32ca4f90b04ca42cfb11924098 Author: Joe Perches Date: Mon Nov 15 11:12:24 2010 +0000 drivers/isdn/i4l: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit a1082bfe7d2d88d9626f5542dda9c0781394e91f Merge: 9d1e5e4 147b2c8 Author: David S. Miller Date: Wed Nov 17 09:56:04 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next-2.6 commit d3e1884bc585a43674d2cb0d3f0aeeb0ae43bc04 Author: Feng Tang Date: Wed Nov 17 12:11:24 2010 +0000 x86, mrst: Add explanation for using 1960 as the year offset for vrtc Explain the reason for the apparently odd choice of year offset so we don't get more questions about it. Signed-off-by: Feng Tang Signed-off-by: Alan Cox LKML-Reference: <20101117121050.9998.89348.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit ad02519a0d27da4a0a50cbc696e810c94e27c28e Author: Randy Dunlap Date: Mon Nov 15 10:14:06 2010 -0800 x86, mrst: Fix dependencies of "select INTEL_SCU_IPC" commit b9fc71f47 (x86, mrst: The shutdown for MRST requires the SCU IPC mechanism) introduced the following warning: warning: (X86_MRST && PCI && PCI_GOANY && X86_32 && X86_EXTENDED_PLATFORM && X86_IO_APIC) selects INTEL_SCU_IPC which has unmet direct dependencies (X86 && X86_PLATFORM_DEVICES && X86_MRST) which is due to the hierarchical menu structure. Select X86_PLATFORM_DEVICES as well. Originally-from: Randy Dunlap Signed-off-by: Thomas Gleixner LKML-Reference: <20101115101406.77e072ef.randy.dunlap@oracle.com> Cc: Alan Cox commit b9fc71f47dc060c588e5099638242fad44eeecbc Author: Alan Cox Date: Mon Nov 15 17:31:19 2010 +0000 x86, mrst: The shutdown for MRST requires the SCU IPC mechanism Fix the build failure reported by Randy. Reported-by: Randy Dunlap Signed-off-by: Alan Cox LKML-Reference: <20101115173110.6877.83958.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 032a6424aeea7333a8dafc8cc05dd10b09c62680 Author: Dan Murphy Date: Mon Nov 15 09:50:50 2010 -0600 OMAP: mux: Add __func__ macro to pr_xxx macros Removed mux: and added the __func__ macro to make debugging easier. Signed-off-by: Dan Murphy Signed-off-by: Benoit Cousson Cc: Tony Lindgren commit fc63de829bbfa3945ffd6327bd3dc88f4e643642 Author: sricharan Date: Mon Nov 8 19:26:11 2010 +0530 OMAP4: pandaboard: Select CBL & CBS package and initialize mux The mux framework allows the change of pad configuration by drivers when needed. Prior to this the mux framework has to be initialised with all the mux parameters specific to the board. The mux init is already present in the board file for SDP. Adding the mux init for panda boards. Signed-off-by: sricharan Acked-by: Anand Gadiyar Signed-off-by: Benoit Cousson Cc: Santosh Shilimkar commit 6fea7b0a7ad9b79aca09df4c42773927db6934ed Author: Benoit Cousson Date: Mon Sep 27 10:50:33 2010 +0200 OMAP4: sdp4430: Select CBS package for ES2 Select the CBS package if SDP4430 is enabled during config. Use the proper package (CBL or CBS) based on chip revision. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Santosh Shilimkar Cc: Anand Gadiyar commit a7722d8796c3431163943c30af7a90d87c43180a Author: Benoit Cousson Date: Fri Sep 24 16:56:59 2010 +0200 OMAP4: mux: Add CBS package data for OMAP4430 ES2 Please note that the full muxmodes are re-defined for ES2 instead of using the subset. There are 81 differences among 204 pins. The subset fixup will have to iterate over the whole list for each subset entry, which can lead to an important number of iteration. On the other hand, it will take much more memory at boot time. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Santosh Shilimkar Cc: Anand Gadiyar commit fb6bf6320e33af5bd6ac788f27245f9162bc5215 Author: Benoit Cousson Date: Tue Aug 10 17:43:15 2010 +0200 OMAP4: sdp4430: Select CBL package for ES1 and initialize mux Select the CBL package if SDP4430 is enabled during config. Initialize the mux framework during the board init. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit a041a52c4d2b82e25de2267bce5f4dc3d2179b2a Author: Benoit Cousson Date: Tue Aug 10 17:27:48 2010 +0200 OMAP4: mux: Add CBL package data for OMAP4430 ES1 Add data for OMAP4430 generated from HW pinout & register database. The data set is split in two partitions for both core and wkup. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit 112485e9c543b17fc08daea56c7a558b415d06af Author: Benoit Cousson Date: Mon Aug 16 10:55:35 2010 +0200 OMAP: mux: Add support for control module split in several partitions Starting on OMAP4, the pin mux configuration is located in two different partitions of the control module (CODE_PAD and WKUP_PAD). The first one is inside the core power domain whereas the second one is inside the wakeup. - Add the capability to add any number of partition during board init time depending of Soc partitioning. - Add some init flags as well in order to avoid explicit Soc version check inside the mux core code. - Add a comment with mux0 mode on top of omap_mux/board/ if the current mux mode is not the default one. Thanks to Tony Lindgren for the following improvements: - Add omap_mux_get for getting the partition data so platform level device code can use it. - Fix the rx51 board code to use the new API. - Do not store the partition for each mux entry. Look up the partition for debugfs instead. Thanks to Dan Murphy for testing on OMAP4 and reporting a couple of bugs. Thanks to Anand Gadiyar for testing on OMAP3 zoom and bug report. Signed-off-by: Benoit Cousson Signed-off-by: Tony Lindgren Tested-by: Murphy Dan Cc: Paul Walmsley Cc: Kevin Hilman Cc: Santosh Shilimkar Cc: Anand Gadiyar commit 1cbb3a9a132969ed1ffeaecff2f910619d4470ae Author: Benoit Cousson Date: Tue Aug 10 17:33:01 2010 +0200 OMAP: mux: Replace printk with pr_xxx macros Replace all the printk(KERN_XXX... with pr_xxx macros. Signed-off-by: Benoit Cousson Cc: Tony Lindgren Cc: Paul Walmsley Cc: Kevin Hilman commit 194ee8e89cc02d8bea8a0b837271f79ca0c72873 Author: Uwe Kleine-König Date: Thu Nov 11 15:32:21 2010 +0100 ARM: mx25: dynamically allocatate imx-fb devices Signed-off-by: Uwe Kleine-König commit e7c74b343091e0c6b7bb67c12f9f7fb345aa6a50 Author: Uwe Kleine-König Date: Thu Nov 11 11:57:21 2010 +0100 ARM: mx25: dynamically allocate imxdi_rtc devices Signed-off-by: Uwe Kleine-König commit ab9cee4b2167f8bf01d85b537df5b9cbe342c780 Author: Uwe Kleine-König Date: Thu Nov 11 11:35:33 2010 +0100 ARM: mx25: dynamically allocate imx-keypad devices The mxc-keypad device seems to be the result of an early and partial merge of the keypad driver. It's unused and there is no corresponding driver available, so just remove it. Cc: Alberto Panizzo Signed-off-by: Uwe Kleine-König commit d485c7e71675abdd6133128e596b41284c2ee7b5 Author: Uwe Kleine-König Date: Thu Nov 11 10:52:33 2010 +0100 ARM: mx25: move registration of gpios to plat-mxc/gpio.c To use common macros to define the gpio ports for imx{1,21,25,27} the existing ones had to made more general and a few more base address defines were necessary. Signed-off-by: Uwe Kleine-König commit 5f3d1092a949b33d01c95b7f5e5a83672629f131 Author: Uwe Kleine-König Date: Wed Nov 10 22:15:45 2010 +0100 ARM: mx25: dynamically allocate mxc_pwm devices Signed-off-by: Uwe Kleine-König commit 224b8c83641c2f31e3efc9bc5956636cc42cadf7 Author: Uwe Kleine-König Date: Wed Nov 10 21:50:07 2010 +0100 ARM: mx25: dynamically allocate fsl-usb2-udc devices Signed-off-by: Uwe Kleine-König commit 2c20b9f19add2248dc867f1f78dcef1eb0944543 Author: Uwe Kleine-König Date: Wed Nov 10 21:27:55 2010 +0100 ARM: mx25: dynamically allocate mxc-ehci devices According to the reference manual of the i.MX25 the host controller uses an offset of 0x200 not 0x400 as was specified in the resources for mxc_usbh2. Needs-Testing: yes Signed-off-by: Uwe Kleine-König commit e9f0bafb4f3d32d0bc0ea7e946d667a68bae59ce Author: Uwe Kleine-König Date: Wed Nov 10 10:51:38 2010 +0100 ARM: imx: move registration of gpios to plat-mxc/gpio.c This finally gets rid of mach-imx/devices.c. Signed-off-by: Uwe Kleine-König commit 3a6f52a79fc0ce1c8b950c628bcf101f8652e957 Author: Uwe Kleine-König Date: Wed Nov 10 10:22:02 2010 +0100 ARM: imx: remove now empty devices.h Signed-off-by: Uwe Kleine-König commit 9f871469893a6d87c6cddf412f82ebf588fd4eca Author: Uwe Kleine-König Date: Wed Nov 10 10:11:23 2010 +0100 ARM: imx: dynamically allocate imx21-hcd devices Signed-off-by: Uwe Kleine-König commit 3f880141b8d12cdbb5faf0b9941ee50ac515ea1e Author: Uwe Kleine-König Date: Wed Nov 10 09:58:56 2010 +0100 ARM: imx: dynamically allocate imx-keypad devices Signed-off-by: Uwe Kleine-König commit bd455ed36c487b949068182bfee478b785ee090b Author: Uwe Kleine-König Date: Tue Nov 9 17:52:14 2010 +0100 ARM: imx: dynamically allocate fsl-usb2-udc devices Signed-off-by: Uwe Kleine-König commit 2eb42d5c287f5e883a4b3ebe668ba880caa351e5 Author: Uwe Kleine-König Date: Fri Nov 5 18:52:09 2010 +0100 ARM: imx: dynamically allocate mxc-ehci devices Signed-off-by: Uwe Kleine-König commit 9d3d945a8d5be2c915f646e8dff8422486a77030 Author: Uwe Kleine-König Date: Fri Nov 5 17:26:09 2010 +0100 ARM: imx: dynamically register mxc-mmc devices ... plus a trivial simplification of mx21ads_sdhc_init() Signed-off-by: Uwe Kleine-König commit c194daad0e0de94ed5e03aa723eb56b4a3ae9738 Author: Alberto Panizzo Date: Mon Nov 1 18:00:03 2010 +0100 ARM: mx3/mach-pcm037_eet: Fix section mismatch for eet_init_devices() This function should be marked as __init because it is used only in the init phase. This fix the compiler warning: LD arch/arm/mach-mx3/built-in.o WARNING: arch/arm/mach-mx3/built-in.o(.text+0x1328): Section mismatch in reference from the function eet_init_devices() to the (unknown reference) .init.rodata:(unknown) The function eet_init_devices() references the (unknown reference) __initconst (unknown). This is often because eet_init_devices lacks a __initconst annotation or the annotation of (unknown) is wrong. Signed-off-by: Alberto Panizzo Signed-off-by: Uwe Kleine-König commit bf182bcc6e726cce2f02b699bd0fba787734554f Author: Uwe Kleine-König Date: Fri Nov 5 15:01:16 2010 +0100 ARM: imx: dynamically allocate mxc_pwm devices Signed-off-by: Uwe Kleine-König commit c06246576a6e71b72ecc6b4b39a5c8eaf45dc2ed Author: Uwe Kleine-König Date: Fri Nov 5 11:22:37 2010 +0100 ARM: mx3: enable SPI_IMX for better compile coverage SPI_IMX defaults to m for i.MX machines. So enabling SPI is enough. Signed-off-by: Uwe Kleine-König commit ad851bffba6afd6468f96a6180cc4a14e9ebee38 Author: Uwe Kleine-König Date: Thu Nov 4 17:07:48 2010 +0100 ARM: imx: dynamically register imx-fb devices Signed-off-by: Uwe Kleine-König commit fc40d0191943fa995f5359b5c23aa7c3dea69d7b Author: Uwe Kleine-König Date: Thu Nov 4 12:02:35 2010 +0100 ARM: imx: change the way flexcan devices are registered Group soc specific data in a global struct instead of repeating it for each call to imxXX_add_flexcanX. The structs holding the actual data are placed in .init.constdata and so don't do much harm. Compared to the previous approach this reduces code size to call imx_add_flexcan. Signed-off-by: Uwe Kleine-König commit e0a1961df8ad898b661cf0adcf3519254f135a44 Author: Uwe Kleine-König Date: Thu Nov 4 10:09:10 2010 +0100 ARM: imx: dynamically allocate imx2-wdt devices Currently there is no platform data used in the driver. In case this changes and for consistency NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König commit b2997cb12b302ee6d233808e32214d00afdcf128 Author: Uwe Kleine-König Date: Tue Nov 2 17:50:55 2010 +0100 ARM: imx: dynamically allocate mx2-camera device Signed-off-by: Uwe Kleine-König commit 3bde75b5370bd69fd7f07a8e254bef05b1b5b219 Author: Uwe Kleine-König Date: Tue Nov 2 16:42:27 2010 +0100 ARM: imx/gpio: remove some useless casts Signed-off-by: Uwe Kleine-König commit 9bb39b3f600101b09cbb35e0a0deb9d56c4fe67f Author: Uwe Kleine-König Date: Tue Nov 2 11:59:08 2010 +0100 ARM: imx: dynamically allocate mx1-camera device Signed-off-by: Uwe Kleine-König commit 6332c1071811a1d588cfc93330d87a57a7460a1b Author: Uwe Kleine-König Date: Tue Nov 2 11:56:54 2010 +0100 ARM: imx: allow specifying a dma mask when creating a platform device Signed-off-by: Uwe Kleine-König commit e08300043ee4e2df10be551b76e126d6c02f26cc Author: Uwe Kleine-König Date: Tue Nov 2 10:03:51 2010 +0100 ARM: imx: dynamically allocate imx_udc device This is only available for mx1 machines with no in-tree user. Signed-off-by: Uwe Kleine-König commit 300f86da1787c680598ea441aaa602a1664fba86 Author: Uwe Kleine-König Date: Fri Oct 29 11:50:36 2010 +0200 ARM: imx: remove unused devices all these don't have a driver and are not added in any machine file. Signed-off-by: Uwe Kleine-König commit ae71a5622253708aa08df231e6415fe7a1e96b10 Author: Uwe Kleine-König Date: Fri Oct 29 10:56:07 2010 +0200 ARM: imx: dynamically allocate mxc_w1 devices Currently there is no platform data used in the driver. In case this changes NULL is passed unused to the soc specific functions. Signed-off-by: Uwe Kleine-König commit d96801b2ca47cfeddadede7a1998e1fe0eab095c Author: Uwe Kleine-König Date: Fri Oct 22 09:20:52 2010 +0200 ARM: imx: remove deprecated symbols as all users are gone now Signed-off-by: Uwe Kleine-König commit ac401427c05a6a371950a1cdfaec75f72bffb9b5 Author: Uwe Kleine-König Date: Tue Oct 26 09:42:54 2010 +0200 ARM: imx/debug-macro: rework using the new io mapping macro This gets rid of the last user of IMX_NEEDS_DEPRECATED_SYMBOLS. Signed-off-by: Uwe Kleine-König commit a99631489bbd1b4647b82d0822b6a3942e2dd731 Author: Uwe Kleine-König Date: Mon Oct 25 15:44:25 2010 +0200 ARM: imx: change static io mapping to use a function Now only the virtual addresses [0xf4000000, 0xf5ffffff] are used for static per-SoC mappings. The few mappings of whole chip selects are moved accordingly. The now wrong defines for virtual base addresses are removed. Signed-off-by: Uwe Kleine-König commit cf3a6aba2f8402d4e45f7f263a0e69f779cd1bdc Author: Uwe Kleine-König Date: Mon Oct 25 15:54:58 2010 +0200 ARM: imx: remove last explicit users of virtual base address defines This allows changing the mapping without the need to adapt all users. While at it remove some unneeded casts to void __iomem *, this is already taken care for in the IO_ADDRESS macros Signed-off-by: Uwe Kleine-König commit 08ff97b5214143c3bd47add6ec49097cb848120a Author: Uwe Kleine-König Date: Mon Oct 25 15:38:09 2010 +0200 ARM: imx: use MXxy_IO_P2V macros to setup static mappings This makes less code rely on the virtual constants. To further simplify code and reduce the needed boilerplate when defining the static mappings a new helper macro is defined in mach/hardware.h. Signed-off-by: Uwe Kleine-König commit f5d7a13b18706c3328c6aac3bf782a13cabf255a Author: Uwe Kleine-König Date: Mon Oct 25 11:40:30 2010 +0200 ARM: imx: refactor the io mapping macro This makes it more assembler friendly and allows it to be used in situation that need an unsigned long and not a pointer. Also the naming is clearer. IOMEM is introduced without IMX_ prefix as it is used this way in more than one ARM subarch and it might become globally available soon. Signed-off-by: Uwe Kleine-König commit 9651b7db59893e796dfdd170485543b9863be9d8 Author: Uwe Kleine-König Date: Fri Oct 22 14:49:45 2010 +0200 ARM: mx3: fix the last users of IMX_NEEDS_DEPRECATED_SYMBOLS Signed-off-by: Uwe Kleine-König commit 147b2c8cb4f3e16aafc87096365a913d01ee3a21 Author: Dongdong Deng Date: Tue Nov 16 19:50:15 2010 -0800 e1000e: add netpoll support for MSI/MSI-X IRQ modes With enabling CONFIG_PCI_MSI, e1000e could work in MSI/MSI-X IRQ mode, and netpoll controller didn't deal with those IRQ modes on e1000e. This patch add the handling MSI/MSI-X IRQ modes to netpoll controller, so that netconsole could work with those IRQ modes. Signed-off-by: Dongdong Deng Signed-off-by: Jeff Kirsher commit 1b98c2bb63a4b415d8d894d001b6d0256409e0d9 Author: Bruce Allan Date: Tue Nov 16 19:50:14 2010 -0800 e1000e: 82574 intermittently fails to initialize with manageability f/w The driver can fail initializing the hardware when manageability firmware is performing concurrent MDIO operations because the hardware semaphore scheme to prevent concurrent operations between software and firmware is incorrect for 82574/82583. Instead of using the SWSM register, the driver should be using the EXTCNF_CTRL register. A software mutex is also added to prevent simultaneous software threads from performing similar concurrent accesses. Signed-off-by: Bruce Allan Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit d478eb44f7a6b53256ae399fa7e597525b4034ee Author: Bruce Allan Date: Tue Nov 16 19:50:13 2010 -0800 e1000e: 82571 SerDes link handle null code word from partner SerDes Link detection on certain 82571 mezzanine cards can fail when the link is forced, the link partner does not recognize forced link and the link partner sends null code words. Detect the null code words and return to auto-negotiation state which causes the link partner to begin responding with valid code words. Within a reasonable interval the link will finally settle as forced by both partners. Signed-off-by: Bruce Allan Signed-off-by: Jeff Kirsher commit b1d670f10e8078485884f0cf7e384d890909aeaa Author: Greg Rose Date: Tue Nov 16 19:41:36 2010 -0800 Remove extra struct page member from the buffer info structure declaration. Reported-by: Andi Kleen Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit eca2a33c985eb19dd0ca4b37d66c7fb5d8b76308 Author: Julian Stecklina Date: Tue Nov 16 19:41:36 2010 -0800 igbvf: Remove some dead code in igbvf Removed unused variable in igbvf. Signed-off-by: Julian Stecklina Acked-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 2c20ebbaed7f3f21506629ee931941a9bba199ab Author: Greg Rose Date: Tue Nov 16 19:41:35 2010 -0800 igbvf: Update version and Copyright Update version string and copyright notice Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 5d426ad1af31ac27d7c2222f20eec9d0a8aeac42 Author: Greg Rose Date: Tue Nov 16 19:27:19 2010 -0800 ixgbevf: Fix Oops The driver is calling netif_carrier_off and netif_tx_stop_all_queues before the netdevice is registered which causes an Oops. Move call to netif_carrier_off after the netdevice is registered and remove call to netif_tx_stop_all_queues because there aren't any TX queues yet. Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit e2ddeba95c09d0d44719ff005e915dc06ff46571 Author: Eric Dumazet Date: Tue Nov 16 19:27:18 2010 -0800 ixgbe: refactor ixgbe_alloc_queues() I noticed ring variable was initialized before allocations, and that memory node management was a bit ugly. We also leak memory in case of ring allocations error. Signed-off-by: Eric Dumazet Signed-off-by: Jeff Kirsher commit b93a22260f6f4bcf6c92c54de8530a97d3e921f0 Author: Don Skidmore Date: Tue Nov 16 19:27:17 2010 -0800 ixgbe: add support for x540 MAC This patch adds support for the x540 MAC which is the next MAC in the 82598/82599 line. Signed-off-by: Don Skidmore Signed-off-by: Jeff Kirsher commit fe15e8e1c78521e0b4e375d6ed415b82265419c9 Author: Don Skidmore Date: Tue Nov 16 19:27:16 2010 -0800 ixgbe: add MAC and PHY support for x540 Adds the new x540.c file and Aquantia 1202 PHY for X540 support. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit a391f1d51244b8274920a33c5d11aeebec3aa68f Author: Don Skidmore Date: Tue Nov 16 19:27:15 2010 -0800 ixgbe: make silicon specific functions generic The new MAC type X540 shares much of the same functionality of some silicon specific functions. To reduce duplicate code, made these functions generic. Signed-off-by: Don Skidmore Tested-by: Stephen Ko Signed-off-by: Jeff Kirsher commit 9b55bb038468a7b504ccdc1d956952598ae1b85b Author: Yi Zou Date: Tue Nov 16 19:27:14 2010 -0800 ixgbe: make sure FCoE DDP user buffers are really released by the HW When invalidating the DDP context is invalidated, the HW may not be done with the user buffer right away. In which case, we poll the FCBUFF register to check if the buffer valid bit is cleared or not, if not, we wait for max 100us that is guaranteed by the HW. Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 8ca371e484e2e5ceb9b90fdb83d8d251017d852b Author: Yi Zou Date: Tue Nov 16 19:27:13 2010 -0800 ixgbe: invalidate FCoE DDP context when no error status is available The hw automatically invalidates the context if DDP is successful or there is error detected. In case there is no error status available from the hw, initializing the per context error status to be 1 allows the DDP context to be still invalidated via the upper layer call to ddp_put(). Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit a41c059741570779c0254a3a1aa4da3baa463d7c Author: Yi Zou Date: Tue Nov 16 19:27:13 2010 -0800 ixgbe: avoid doing FCoE DDP when adapter is DOWN or RESETTING There is no point to allow incoming DDP requests from the upper layer stack if the adapter is going down or being reset. Signed-off-by: Yi Zou Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c84d324c770dc81acebc1042163da33c8ded2364 Author: John Fastabend Date: Tue Nov 16 19:27:12 2010 -0800 ixgbe: rework Tx hang detection to fix reoccurring false Tx hangs The Tx hang logic has been known to detect false hangs when the device is receiving pause frames or has delayed processing for some other reason. This patch makes the logic more robust and resolves these known issues. The old logic checked to see if the device was paused by querying the HW then the hang logic was aborted if the device was currently paused. This check was racy because the device could have been in the pause state any time up to this check. The other operation of the hang logic is to verify the Tx ring is still advancing the old logic checked the EOP timestamp. This is not sufficient to determine the ring is not advancing but only infers that it may be moving slowly. Here we add logic to track the number of completed Tx descriptors and use the adapter stats to check if any pause frames have been received since the previous Tx hang check. This way we avoid racing with the HW register and do not detect false hangs if the ring is advancing slowly. This patch is primarily the work of Jesse Brandeburg. I clean it up some and fixed the PFC checking. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit e3de4b7bdfd2c06884c95cfb4ad4d64be046595e Author: Alexander Duyck Date: Tue Nov 16 19:27:11 2010 -0800 ixgbe: Resolve null function pointer accesses on 82598 w/ multi-speed fiber This change resolves some null function pointer accesses on 82598 when a multi-speed fiber module is inserted into the adapter. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 2274543f15133165b855b9a4a1503b2c1268c6cf Author: Alexander Duyck Date: Tue Nov 16 19:27:10 2010 -0800 ixgbe: populate the ring->q_vector pointer during ring mapping The q_vector back pointer was not being set in the rings so it would not have been possible to determine the parent q_vector of the ring. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d0759ebb051972f8557a19aa13cf02fc314856e9 Author: Alexander Duyck Date: Tue Nov 16 19:27:09 2010 -0800 ixgbe: cleanup ixgbe_map_rings_to_vectors This change cleans up some of the items in ixgbe_map_rings_to_vectors. Specifically it merges the two for loops and drops the unnecessary vectors parameter. It also moves the vector names into the q_vectors themselves. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 125601bf03a13e24d3785ccbc3a25ad401c92772 Author: Alexander Duyck Date: Tue Nov 16 19:27:08 2010 -0800 ixgbe: simplify math and improve stack use of ixgbe_set_itr functions This change is meant to improve the stack utilization and simplify the math used in ixgbe_set_itr_msix. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit bf29ee6c4819a86ba0209281550b230889b8ebe6 Author: Alexander Duyck Date: Tue Nov 16 19:27:07 2010 -0800 ixgbe: cleanup unclear references to reg_idx There are a number of places where we use the variable j to contain the register index of the ring. Instead of using such a non-descriptive variable name it is better that we name it reg_idx so that it is clear what the variable contains. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 9d6b758f428d2ad9ca4208d5c4d4cdbd4261b0d8 Author: Alexander Duyck Date: Tue Nov 16 19:27:06 2010 -0800 ixgbe: cleanup unnecessary return value in ixgbe_cache_ring_rss This change is just to cleanup some confusing logic in ixgbe_cache_ring_rss which can be simplified by adding a conditional with return to the start of the call. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 673ac60461082e07be58b23f237d651c2605ce60 Author: Alexander Duyck Date: Tue Nov 16 19:27:05 2010 -0800 ixgbe: Cleanup DCB logic, whitespace, and comments in ixgbe_ethtool.c This change address a few whitespace issues in DCB #ifdefs, adds a comment calling out the DCB specific registers, and nests an if statement inline with a number of if statements related to flow control. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 50d6c681d0c38208e494f0c6302ef13d21dababa Author: Alexander Duyck Date: Tue Nov 16 19:27:05 2010 -0800 ixgbe: add WOL support for backplane adapters This change adds support for certain 82599 based Mezzanine adapters. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit e2b4e216b7e9da09175c76887c754489681533b9 Author: Alexander Duyck Date: Tue Nov 16 19:27:04 2010 -0800 ixgbe: cleanup ixgbe_set_tx_csum ethtool flags configuration This change makes it so that we always disable SCTP regardless of mac type since we shouldn't need to check mac type before disabling a feature that isn't supported on a given piece of hardware. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit bd50817859e7e82ba6e4adc75ebd8ac19459d8a4 Author: Alexander Duyck Date: Tue Nov 16 19:27:03 2010 -0800 ixgbe: change mac_type if statements to switch statements This change replaces a number of if/elseif/else statements with switch statements to support the addition of future devices to the ixgbe driver. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit aa80175a539a47fd11e2fbf1696a29f7a2652930 Author: Alexander Duyck Date: Tue Nov 16 19:27:02 2010 -0800 ixgbe: cleanup use of ixgbe_rsc_count and RSC_CB This change cleans up the use of rsc_count and changes it to a boolean since the actual numerical value is used nowhere in the Rx cleanup path. I am also moving the skb count into the RSC_CB path since it is much easier to track it there than when it is passed as a parameter to various function calls. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit ee9e0f0b40c4fb4ad71d677c094d518db42f7076 Author: Alexander Duyck Date: Tue Nov 16 19:27:01 2010 -0800 ixgbe: cleanup ATR filter setup function This change cleans up the ixgbe_atr filter setup function so that it uses fewer items from the stack. Since the code is only applicable to IPv4 w/ TCP it makes sense to just use the pointers based on the headers themselves instead of copying them to temp variables and then writing those to the filters. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c267fc166a3308c45c7f0ad2ddd6fc696caaeb80 Author: Alexander Duyck Date: Tue Nov 16 19:27:00 2010 -0800 ixgbe: cleanup ixgbe_clean_rx_irq The code for ixgbe_clean_rx_irq was much more tangled up than it needed to be in terms of logic statements and unused variables. This change untangles much of that and drops several unused variables such as cleaned which was being returned but never checked. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 32aa77a4fc06bd1116f83c25bf0389a3e9b80533 Author: Alexander Duyck Date: Tue Nov 16 19:26:59 2010 -0800 ixgbe: change vector numbering so that queues end up on correct CPUs This changes the numbering scheme slightly. Previously the ordering was coming out like this: Rx-2 Rx-1 Rx-0 TxRx-0 Which would drop two queues on CPU 0. This change makes it so that the ordering is like this: Rx-3 Rx-2 Rx-1 TxRx-0 This means that each CPU will have it's own Rx queue, and only CPU 0 will have the Tx queue. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit b953799ee29075afd30afe4c0fb65f278b088f69 Author: Alexander Duyck Date: Tue Nov 16 19:26:58 2010 -0800 ixgbe: reorder Tx cleanup so that if adapter will reset we don't rearm The code as it existed could re-arm the queues when it was requesting a HW reset due to a TX hang. Instead of doing that this change makes it so that we will just exit if the hardware is believed to be hung. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 80fba3f4341b1c98430bee620b507d3f5b7086cd Author: Alexander Duyck Date: Tue Nov 16 19:26:57 2010 -0800 ixgbe: Disable RSC when ITR setting is too high to allow RSC RSC will flush its descriptors every time the interrupt throttle timer expires. In addition there are known issues with RSC when the rx-usecs value is set too low. As such we are forced to clear the RSC_ENABLED bit and reset the adapter when the rx-usecs value is set too low. However we do not need to clear the NETIF_F_LRO flag because it is used to indicate that the user wants to leave the LRO feature enabled, and in fact with this change we will now re-enable RSC as soon as the rx-usecs value is increased and the flag is still set. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 73c4b7cdd25a8a769baf6dae5bc498400a9ddd93 Author: Alexander Duyck Date: Tue Nov 16 19:26:57 2010 -0800 ixgbe: cleanup race conditions in link setup This change makes it so that we perform link setup with interrupts disabled. If the SFP has not been detected previously we will schedule the SFP detection task to run in order to detect link. By doing this we avoid the possibility of interrupts firing in the middle of our link setup during ixgbe_up_complete. In addition this change makes it so that the multi-speed fiber setup and SFP setup are not mutually exclusive. The addresses issues seen in which a link would only come up at 1G on some multi-speed fiber modules. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 7d637bcc8f461f19e1d018078792ec0cd9b07b1d Author: Alexander Duyck Date: Tue Nov 16 19:26:56 2010 -0800 ixgbe: add a state flags to ring This change adds a set of state flags to the rings that allow them to independently function allowing for features like RSC, packet split, and TX hang detection to be done per ring instead of for the entire device. This is accomplished by re-purposing the flow director reinit_state member and making it a global state instead since a long for a single bit flag is a bit wasteful. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 33cf09c9586a0dce472ecd2aac13e8140c9ed1a1 Author: Alexander Duyck Date: Tue Nov 16 19:26:55 2010 -0800 ixgbe: move CPU variable from ring into q_vector, add ring->q_vector This is the start of work to sort out what belongs in the rings and what belongs in the q_vector. Items like the CPU variable for make much more sense in the q_vector since the CPU is a per-interrupt thing rather than a per ring thing. I also added a back-pointer from the ring to the q_vector. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c60fbb00f0400792adf873dbacd431885653b77d Author: Alexander Duyck Date: Tue Nov 16 19:26:54 2010 -0800 ixgbe: move adapter into pci_dev driver data instead of netdev This change moves an adapter pointer into the private portion of the pci_dev instead of a pointer to the netdev. The reason for this change is because in most cases we just want the adapter anyway. In addition as we start moving toward multiple netdevs per port we may want to move the adapter pointer out of the netdevs entirely. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 01fa7d905fe9a5b045615fbde19e6c0f78063206 Author: Alexander Duyck Date: Tue Nov 16 19:26:53 2010 -0800 ixgbe: remove residual code left over from earlier combining of TXDCTL Missed some code that was left floating around in the DCB configuration for the TXDCTL register. As a result the register was being messed with in two different spots when we only needed to do the change once. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 5f5ae6fc86083526088e2c2ca4454e0f44f1e0cb Author: Alexander Duyck Date: Tue Nov 16 19:26:52 2010 -0800 ixgbe: move ixgbe_clear_interrupt_scheme to before pci_save_state The main reason for this change is to keep the suspend/resume logic matched up. The clear_interrupt_scheme function will disable MSI-X which will effect the PCIe configuration space. Therefore we will want to do it before we save state to avoid having the interrupt state restored by pci_restore_state, and then trying to re-enable MSI/MSI-X interrupts via ixgbe_setup_interrupt_scheme. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit fc77dc3cc15144bbaf18203e9ef7a3e1beedfc3f Author: Alexander Duyck Date: Tue Nov 16 19:26:51 2010 -0800 ixgbe: add a netdev pointer to the ring structure This change places a netdev pointer directly into the ring structure. This way we can avoid having to determine which netdev we are supposed to be using and can just access the one on the ring directly. As a result of this change further collapse of the code is possible by dropping the adapter from ixgbe_alloc_rx_buffers, and the netdev pointer from ixgbe_xmit_frame_ring_adv and ixgbe_maybe_stop_tx. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 5b7da51547cc3ab5461e45a8ee0ca73051416fda Author: Alexander Duyck Date: Tue Nov 16 19:26:50 2010 -0800 ixgbe: combine some stats into a union to allow for Tx/Rx stats overlap This change moved some of the RX and TX stats into separate structures and them placed those structures in a union in order to help reduce the size of the ring structure. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit b6ec895ecd32c0070c3b2b17918c030275cd834d Author: Alexander Duyck Date: Tue Nov 16 19:26:49 2010 -0800 ixgbe: move device pointer into the ring structure This change is meant to simplify DMA map/unmap by providing a device pointer. As a result the adapter pointer can be dropped from many of the calls. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 84ea2591e4a24775c2735511a1cc3cf88edd249d Author: Alexander Duyck Date: Tue Nov 16 19:26:49 2010 -0800 ixgbe: drop ring->head, make ring->tail a pointer instead of offset This change drops ring->head since it is not used in any hot-path and can easily be determined using IXGBE_[RT]DH(ring->reg_idx). It also changes ring->tail into a true pointer so we can avoid unnecessary pointer math to find the location of the tail. In addition I also dropped the setting of head and tail in ixgbe_clean_[rx|tx]_ring. The only location that should be setting the head and tail values is ixgbe_configure_[rx|tx]_ring and that is only while the queue is disabled. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit d5f398ed73522b9f76861af6553775c5851de0d0 Author: Alexander Duyck Date: Tue Nov 16 19:26:48 2010 -0800 ixgbe: cleanup ixgbe_alloc_rx_buffers This change re-orders alloc_rx_buffers to make better use of the packet split enabled flag. The new setup should require less branching in the code since now we are down to fewer if statements since we either are handling packet split or aren't. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 8ad494b0e59950e2b4e587c32cb67a2452795ea0 Author: Alexander Duyck Date: Tue Nov 16 19:26:47 2010 -0800 ixgbe: move GSO segments and byte count processing into ixgbe_tx_map This change simplifies the work being done by the TX interrupt handler and pushes it into the tx_map call. This allows for fewer cache misses since the TX cleanup now accesses almost none of the skb members. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 4c0ec6544a0cd5e3eed08df2c14cf98185098abe Author: Alexander Duyck Date: Tue Nov 16 19:26:46 2010 -0800 ixgbe: remove unnecessary re-init of adapter on Rx-csum change There is no need to reset the adapter when changing the Rx checksum settings. Since the only change is a software flag we can disable it without needing to reset the entire adapter. Signed-off-by: Alexander Duyck Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 80ab193dce048e7b7afa43c99e69f508167e29ab Author: John Fastabend Date: Tue Nov 16 19:26:45 2010 -0800 ixgbe: DCB: credit max only needs to be gt TSO size for 82598 The maximum credits per traffic class only needs to be greater then the TSO size for 82598 devices. The 82599 devices do not have this requirement so only do this test for 82598 devices. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 16b61beb39f2446460f93c08d4d263dc24f22dd8 Author: John Fastabend Date: Tue Nov 16 19:26:44 2010 -0800 ixgbe: DCB set PFC high and low water marks per data sheet specs Currently the high and low water marks for PFC are being set conservatively for jumbo frames. This means the RX buffers are being underutilized in the default 1500 MTU. This patch fixes this so that the water marks are set as described in the data sheet considering the MTU size. The equation used is, RTT * 1.44 + MTU * 1.44 + MTU Where RTT is the round trip time and MTU is the max frame size in KB. To avoid floating point arithmetic FC_HIGH_WATER is defined ((((RTT + MTU) * 144) + 99) / 100) + MTU This changes how the hardware field fc.low_water and fc.high_water are used. With this change they are no longer storing the actual low water and high water markers but are storing the required head room in the buffer. This simplifies the logic and we do not need to account for the size of the buffer when setting the thresholds. Testing with iperf and 16 threads showed a slight uptick in throughput over a single traffic class .1-.2Gbps and a reduction in pause frames. Without the patch a 30 second run would show ~10-15 pause frames being transmitted with the patch ~2-5 are seen. Test were run back to back with 82599. Note RXPBSIZE is in KB and low and high water marks fields are also in KB. However the FCRT* registers are 32B granularity and right shifted 5 into the register, (((rx_pbsize - water_mark) * 1024) / 32) << 5 is the most explicit conversion here we simplify (rx_pbsize - water_mark) * 32 << 5 = (rx_pbsize - water_mark) << 10 This patch updates the PFC thresholds and legacy FC thresholds. Signed-off-by: John Fastabend Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit 66c87bd50ddae681ebedfda0d75e6e73ecd29ce7 Author: Greg Rose Date: Tue Nov 16 19:26:43 2010 -0800 ixgbevf: Update Version String and Copyright Notice Update version string and copyright notice. Signed-off-by: Greg Rose Tested-by: Emil Tantilov Signed-off-by: Jeff Kirsher commit 1a51502bddca7ac1e921d918b741ffd2bec149ed Author: Eric Dumazet Date: Tue Nov 16 19:26:42 2010 -0800 ixgbe: delay rx_ring freeing "cat /proc/net/dev" uses RCU protection only. Its quite possible we call a driver get_stats() method while device is dismantling and freeing its data structures. So get_stats() methods must be very careful not accessing driver private data without appropriate locking. In ixgbe case, we access rx_ring pointers. These pointers are freed in ixgbe_clear_interrupt_scheme() and set to NULL, this can trigger NULL dereference in ixgbe_get_stats64() A possible fix is to use RCU locking in ixgbe_get_stats64() and defer rx_ring freeing after a grace period in ixgbe_clear_interrupt_scheme() Signed-off-by: Eric Dumazet Reported-by: Tantilov, Emil S Tested-by: Ross Brattain Signed-off-by: Jeff Kirsher commit c08512c761e7b9eaaab0e9167a389393f268e93c Author: Alan Stern Date: Mon Nov 15 15:57:58 2010 -0500 USB: improve uses of usb_mark_last_busy This patch (as1434) cleans up the uses of usb_mark_last_busy() in usbcore. The function will be called when a device is resumed and whenever a usage count is decremented. A call that was missing from the hub driver is added: A hub is used whenever one of its ports gets suspended (this prevents hubs from suspending immediately after their last child). In addition, the call to disable autosuspend support for new devices by default is moved from usb_detect_quirks() (where it doesn't really belong) into usb_new_device() along with all the other runtime-PM initializations. Finally, an extra pm_runtime_get_noresume() is added to prevent new devices from autosuspending while they are being registered. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit fcc4a01eb8661226e80632327673f67bf6a5840b Author: Alan Stern Date: Mon Nov 15 15:57:51 2010 -0500 USB: use the runtime-PM autosuspend implementation This patch (as1428) converts USB over to the new runtime-PM core autosuspend framework. One slightly awkward aspect of the conversion is that USB devices will now have two suspend-delay attributes: the old power/autosuspend file and the new power/autosuspend_delay_ms file. One expresses the delay time in seconds and the other in milliseconds, but otherwise they do the same thing. The old attribute can be deprecated and then removed eventually. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 6ddf27cdbc218a412d7e993fdc08e30eec2042ce Author: Ming Lei Date: Mon Nov 15 15:57:30 2010 -0500 USB: make usb_mark_last_busy use pm_runtime_mark_last_busy Since the runtime-PM core already defines a .last_busy field in device.power, this patch uses it to replace the .last_busy field defined in usb_device and uses pm_runtime_mark_last_busy to implement usb_mark_last_busy. Signed-off-by: Ming Lei Reviewed-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 045cac6b3b067a9286dabfb789f67ae4f433f88b Author: Alan Stern Date: Mon Nov 15 15:57:07 2010 -0500 USB: use sysfs_merge_group for power attributes This patch (as1426) makes use of the new sysfs_merge_group() and sysfs_unmerge_group() routines to simplify the handling of power attributes for USB devices. Signed-off-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 63defa73c8c1193c1273474440c30d34c2524597 Author: Ming Lei Date: Mon Nov 15 15:56:54 2010 -0500 USB: use the no_callbacks flag for interfaces Call pm_runtime_no_callbacks to set no_callbacks flag for USB interfaces. Since interfaces cannot be power-managed separately from their parent devices, there's no reason for the runtime-PM core to invoke any callbacks for them. Signed-off-by: Ming Lei Reviewed-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit f646cf94520e22cb11eb5d2e9a35b33bfe4bea1b Author: Toshiharu Okada Date: Thu Nov 11 18:27:57 2010 +0900 USB device driver of Topcliff PCH This patch adds the USB device driver of EG20T(Topcliff) PCH. EG20T PCH is the platform controller hub that is going to be used in Intel's upcoming general embedded platform. All IO peripherals in EG20T PCH are actually devices sitting on AMBA bus. EG20T PCH has USB device I/F. Using this I/F, it is able to access system devices connected to USB device. Signed-off-by: Toshiharu Okada Acked-by: Michał Nazarewicz Signed-off-by: Greg Kroah-Hartman commit d8df0b611c66db3b7afd0678213979209616681a Author: Michal Nazarewicz Date: Fri Nov 12 14:29:29 2010 +0100 usb: gadget: f_fs: remove custom printk() wrappers This commit removes custom printk() wrappers from the f_fs.c file. They served little purpose above what pr_*() family of macros provides. Only FVDBG() has been left but renamed to pr_vdebug() to match other uses. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 5ab54cf7acf418573c9204371cf1ab3497c451ee Author: Michal Nazarewicz Date: Fri Nov 12 14:29:28 2010 +0100 usb: gadget: FunctionFS: fix typos and coding style This commit changes FunctionFS as to make it more compliant with coding style as well as fixes several typos. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 7189ba939ea0e74f73d7b30573b849c732835fc5 Author: Joe Perches Date: Fri Nov 12 13:38:02 2010 -0800 drivers/uwb: Use printf extension %pR for struct resource Using %pR standardizes the struct resource output. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit cc7e6056f440796e028629d6d79a26fa20d457e8 Author: Joe Perches Date: Sun Nov 14 19:04:49 2010 -0800 drivers/usb/gadget: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit ce7eb32fc24a7380f55924360fa0c96297aa237e Author: Joe Perches Date: Mon Nov 15 12:14:01 2010 -0800 drivers/usb/host/uhci-hcd.c: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c8c38de9d8002578599222296b90696745ac0fe3 Author: Deepak Sikri Date: Wed Nov 10 14:33:18 2010 +0530 USB host: Adding USB ehci & ohci support for spear platform This patch adds support for ehci and ohci controller in the SPEAr platform. Changes since V2: added clear_tt_buffer_complete in ehci_spear_hc_driver Signed-off-by: Deepak Sikri Signed-off-by: Viresh Kumar Signed-off-by: Greg Kroah-Hartman commit 28d9cc7f21da6a70fc8c1516fa0ee5588572eb92 Author: Mohammed Shafi Shajakhan Date: Sat Nov 13 20:58:27 2010 +0530 ath9k_htc: Use macro for caldata array size The calibration data variable size is based on the number of channels available in the ath9k driver. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ef1b21f7eb074a8c8ddfea70ed70e988545c8d54 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:07 2010 +0100 iwlwifi: kill elapsed_jiffies Subtract of jiffies is fine even if one variable overwrap. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 70f3876f09ccf1f2819aee6caee9266b2c4b1622 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:06 2010 +0100 iwlagn: simplify iwlagn_tx_skb We can simplify length calculation in iwlagn_tx_skb, that function is enough complex, without fuzz it more than necessary. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2cb7865648e44647a976875428c9dfd9d5553221 Author: Stanislaw Gruszka Date: Fri Nov 12 08:47:05 2010 +0100 iwl3945: remove unused len_org variable Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8f0729b16ae354f9db89394fc1d2d65003455d56 Author: Felix Fietkau Date: Thu Nov 11 15:07:23 2010 +0100 mac80211: add support for setting the ad-hoc multicast rate Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 885a46d0f7942d76c2f3860acb45f75237d3bb42 Author: Felix Fietkau Date: Thu Nov 11 15:07:22 2010 +0100 cfg80211: add support for setting the ad-hoc multicast rate Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit a619a4c0e1fd4e8c360c63d0df3fa0a401107d69 Author: Juuso Oikarinen Date: Thu Nov 11 08:50:18 2010 +0200 mac80211: Add function to get probe request template for current AP Chipsets with hardware based connection monitoring need to autonomically send directed probe-request frames to the AP (in the event of beacon loss, for example.) For the hardware to be able to do this, it requires a template for the frame to transmit to the AP, filled in with the BSSID and SSID of the AP, but also the supported rate IE's. This patch adds a function to mac80211, which allows the hardware driver to fetch this template after association, so it can be configured to the hardware. Signed-off-by: Juuso Oikarinen Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 4e8c14e9587c38f4cce8049c766935629fdb8d46 Author: Felix Fietkau Date: Thu Nov 11 03:18:38 2010 +0100 ath9k_hw: add a private op for configuring radar pulse detection Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 82b873afe83c81d9b1273a816bbdacb266f71a52 Author: Felix Fietkau Date: Thu Nov 11 03:18:37 2010 +0100 ath9k: clean up tx buffer setup Merge ath_tx_send_normal and ath_tx_send_ht_normal. Move the paprd state initialization and sequence number assignment to reduce the number of redundant checks. This not only simplifies buffer allocation error handling, but also removes a small inconsistency in the buffer HT flag. This flag should only be set if the frame is also a QoS data frame. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 61117f01e79f7c0da86c23535bed757370f5885f Author: Felix Fietkau Date: Thu Nov 11 03:18:36 2010 +0100 ath9k: remove the tx info padding byte abuse Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f0c255a07fe8a4d450cce6355a22b73ee0e9e6e0 Author: Felix Fietkau Date: Thu Nov 11 03:18:35 2010 +0100 ath9k: handle tx underrun in the driver instead of rate control Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 1d666d8e05edf5891a7a4bd84a25f493f01dc71a Author: Felix Fietkau Date: Thu Nov 11 03:18:34 2010 +0100 ath9k: remove the unnecessary private xretry tx flag Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 7afbb2f07028183f50ae4f7ce4dab1f32b36cf48 Author: Ben Greear Date: Wed Nov 10 11:43:51 2010 -0800 ath5k: Cleanup opmode setting logic. An earlier review suggested moving the code in a small method that was only called once inline. This patch accomplishes that. Signed-off-by: Ben Greear Acked-by: Bruno Randolf Signed-off-by: John W. Linville commit 6ee63f55c7754462a45315ac93027a1df60667c9 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:16 2010 -0800 ath9k_hw: Fix low throughput issue with AR93xx TX underruns were noticed when RTS/CTS preceded aggregates. This issue was noticed in ar93xx family of chipsets only. The workaround involves padding the RTS or CTS length up to the min packet length of 256 bytes required by the hardware by adding delimiters to the fist descriptor of the aggregate. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 39ec2997c374b528cdbf65099b6d6b8593a67f7f Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:15 2010 -0800 ath9k: Fix bug in delimiter padding computation There is a roundng error in delimiter padding computation which causes severe throughput drop with some of AR9003. signed-off-by: Felix Fietkau Signed-off-by: Vasanthakumar Thiagarajan Cc:stable@kernel.org Signed-off-by: John W. Linville commit bc2068020bfa976efd425f3be590f58a012fd747 Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:14 2010 -0800 ath9k_hw: Add helper function for interpolation Also round off interpolated values this would improve power accuracy by 0.5dB in some cases. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 15cbbc44cc4abaaebc37caf0ec9410a3f83d1deb Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:13 2010 -0800 ath9k_hw: Improve power control accuracy for AR9003 It is done for 5Ghz by adding three temperature slopes. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit f4475a6e52fce8d951a96c763f36b835bf89fdec Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:12 2010 -0800 ath9k_hw: Enable strong signal detection for AR9003 Attenuation from eeprom is configured into attenuator control register. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 52a0e2477dac2106bc1688cbe9615cdafc9deb7d Author: Vasanthakumar Thiagarajan Date: Wed Nov 10 05:03:11 2010 -0800 ath9k_hw: Fix XPABIAS level configuration for AR9003 Improper configuration of 0x16288 and 0x16290 would affect transmission. Cc:stable@kernel.org Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 3092354970381fb8b6439fb4def0c34632277ae9 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:10 2010 -0800 ath9k_hw: add eeprom templates for ar9003 family chipsets We are currently using the default eeprom default and it doesn't work properly for all ar9003 family chipsets. So add eeprom templates for different versisons and select the eeprom table based on the template version programmed in the eeprom. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit 3ceb801bffb62bc486f9662cd4dbca2cbdc6f5c7 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:09 2010 -0800 ath9k_hw: Fix paprd training frame failure. paprd training frame fails in some rates. Fix the rate mask. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ef5a6a7573b7a12ced67dae155be8a909bc245d6 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:08 2010 -0800 ath9k_hw: Initialize 2GHz CTL properly. The last 2GHz CTL was not being initialized, so power was being set to 0 instead of 30dbm. Initialize to 30 like other CTLs. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit b3dd6bc1f052ef3a754fa866743e4fda38522811 Author: Senthil Balasubramanian Date: Wed Nov 10 05:03:07 2010 -0800 ath9k_hw: Add new member into the eeprom structure. Add eeprom base extension structures which are needed for AR938x caliberation changes and gain calculation. Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit a9d85fbd3e5f7a0679e6276953cd23ac7bb72789 Author: Senthil Balasubramanian Date: Thu Nov 11 00:40:33 2010 -0800 ath9k_hw: Fix a reset failure on AR9382 (2x2). AR9382 needs to be configured for the correct chain mask before running AGC/TxIQ caliberation. Otherwise reset would fail. Signed-off-by: Senthil Balasubramanian Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 72a801103f07182c0a4f3a761caa62b4ab8eb4e5 Author: Bruno Randolf Date: Wed Nov 10 12:51:01 2010 +0900 ath5k: Add support for antenna configuration Support setting the antenna configuration via cfg/mac80211. At the moment only allow the simple pre-defined configurations we already have (fixed antenna A/B or diversity), but more advanced settings are possible to implement. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 15d967532148a5fcda075282b82a271b6595a386 Author: Bruno Randolf Date: Wed Nov 10 12:50:56 2010 +0900 mac80211: Add antenna configuration Allow antenna configuration by calling driver's function for it. We disallow antenna configuration if the wiphy is already running, mainly to make life easier for 802.11n drivers which need to recalculate HT capabilites. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit afe0cbf87500f0585d217deb8c6fd329793a7957 Author: Bruno Randolf Date: Wed Nov 10 12:50:50 2010 +0900 cfg80211: Add nl80211 antenna configuration Allow setting of TX and RX antennas configuration via nl80211. The antenna configuration is defined as a bitmap of allowed antennas to use. This API can be used to mask out antennas which are not attached or should not be used for other reasons like regulatory concerns or special setups. Separate bitmaps are used for RX and TX to allow configuring different antennas for receiving and transmitting. Each bitmap is 32 bit long, each bit representing one antenna, starting with antenna 1 at the first bit. If an antenna bit is set, this means the driver is allowed to use this antenna for RX or TX respectively; if the bit is not set the hardware is not allowed to use this antenna. Using bitmaps has the benefit of allowing for a flexible configuration interface which can support many different configurations and which can be used for 802.11n as well as non-802.11n devices. Instead of relying on some hardware specific assumptions, drivers can use this information to know which antennas are actually attached to the system and derive their capabilities based on that. 802.11n devices should enable or disable chains, based on which antennas are present (If all antennas belonging to a particular chain are disabled, the entire chain should be disabled). HT capabilities (like STBC, TX Beamforming, Antenna selection) should be calculated based on the available chains after applying the antenna masks. Should a 802.11n device have diversity antennas attached to one of their chains, diversity can be enabled or disabled based on the antenna information. Non-802.11n drivers can use the antenna masks to select RX and TX antennas and to enable or disable antenna diversity. While covering chainmasks for 802.11n and the standard "legacy" modes "fixed antenna 1", "fixed antenna 2" and "diversity" this API also allows more rare, but useful configurations as follows: 1) Send on antenna 1, receive on antenna 2 (or vice versa). This can be used to have a low gain antenna for TX in order to keep within the regulatory constraints and a high gain antenna for RX in order to receive weaker signals ("speak softly, but listen harder"). This can be useful for building long-shot outdoor links. Another usage of this setup is having a low-noise pre-amplifier on antenna 1 and a power amplifier on the other antenna. This way transmit noise is mostly kept out of the low noise receive channel. (This would be bitmaps: tx 1 rx 2). 2) Another similar setup is: Use RX diversity on both antennas, but always send on antenna 1. Again that would allow us to benefit from a higher gain RX antenna, while staying within the legal limits. (This would be: tx 0 rx 3). 3) And finally there can be special experimental setups in research and development even with pre 802.11n hardware where more than 2 antennas are available. It's good to keep the API simple, yet flexible. Signed-off-by: Bruno Randolf -- v7: Made bitmasks 32 bit wide and rebased to latest wireless-testing. Signed-off-by: John W. Linville commit 0e67d6cb753643fc076a90fa9309301b3fbfb8db Author: Joe Perches Date: Tue Nov 9 16:35:19 2010 -0800 drivers/net/wireless/b43legacy/main.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5b736d42bc51fe893fd7d4ceac34c727d23135e1 Author: Joe Perches Date: Tue Nov 9 16:35:18 2010 -0800 drivers/net/wireless/b43/main.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 7e559ec31c5625cf85bcb1ae0eb9f8f2a8da4a29 Author: Joe Perches Date: Tue Nov 9 16:35:17 2010 -0800 drivers/net/wireless/ath/debug.c: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: John W. Linville commit 5cb56af29be8d12f74afcb2c1de91e51a577bd52 Author: Jussi Kivilinna Date: Tue Nov 9 19:25:56 2010 +0200 rndis_wlan: workaround poor scanning with BCM4320a BCM4320a devices seem to sometimes do scanning pretty poorly. This can be workaround by issuing new scan every second, while not yet connected. By this new scanning method device catches beacons much faster. Fixes bug #20822. Reported-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit b5257c952dda24df7078c74b7b811b44c6e49206 Author: Jussi Kivilinna Date: Tue Nov 9 19:25:47 2010 +0200 rndis_wlan: workaround device not returning bss for currently connected AP BCM4320a devices do not return bss for currently connected AP in bss-list, althought this is required by NDIS specs. Missing bss leads to warning at net/wireless/sme.c:__cfg80211_connect_result(), WARN_ON(!bss). Workaround this by crafting bss manually with information we can read from device. Workaround is only used when device bss-list does not return current bss, and so is only used with BCM4320a devices and not newer BCM4320b ones. Fixes bug #20152. Reported-by: Luís Picciochi Signed-off-by: Jussi Kivilinna Signed-off-by: John W. Linville commit f23a478075659db8a4fd62fa6e264a8bb052cc5b Author: Arik Nemtsov Date: Mon Nov 8 11:51:06 2010 +0200 mac80211: support hardware TX fragmentation offload The lower driver is notified when the fragmentation threshold changes and upon a reconfig of the interface. If the driver supports hardware TX fragmentation, don't fragment packets in the stack. Signed-off-by: Arik Nemtsov Signed-off-by: John W. Linville commit ca4a0831917d6541b45f03542257fcb20dc9cf4a Author: Rafał Miłecki Date: Wed Nov 3 23:28:45 2010 +0100 ssb: return -ENOMEM on alloc fail (instead of CRC check's result) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 54435f9ec837cf0bb0ea02a2bb6362a6aaef5250 Author: Rafał Miłecki Date: Wed Nov 3 22:06:26 2010 +0100 ssb: workarounds: be verbose about hacking SPROM revision, don't duplicate code Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d1f9e41d1d739cd4393840d35e7554f4a439a4f1 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:53 2010 -0800 mwl8k: use const struct fw pointers throughout This eliminates compiler warnings by doing things how the firmware class expects. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 99020471001dbbd6edf61f105368cb6667cc683d Author: Brian Cavagnolo Date: Fri Nov 12 17:23:52 2010 -0800 mwl8k: make initial firmware load asynchronous Introduce a firmware loading state machine to manage the process of loading firmware asynchronously and completing initialization upon success. The state machine attempts to load the preferred firmware image. If that fails, and if an alternative firmware image is available, it will attempt to load that one. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 952a0e963fb02e50f4afbf502f7d468a8fe2b0fa Author: Brian Cavagnolo Date: Fri Nov 12 17:23:51 2010 -0800 mwl8k: add API version checking for AP firmware The AP firmware specifies an API version in the GET_HW_SPEC command response. Currently, the driver only supports AP firmware for the 8366, and only supports API v1. In the future, if higher API version firmwares emerge (possibly for different chips), different ops can be selected based on the reported API version. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 0863ade8d6bde1d151f75720d999ff27f9fe3533 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:50 2010 -0800 mwl8k: choose proper firmware image as directed by user The mwl8k can operate in AP or STA mode, depending on the firmware image that is loaded. By default, STA firmware is loaded. Allow the user to override this default mode at module load time. This saves an unnecessary firmware reload for users only interested in AP mode. Also, the firmware image can be swapped to meet the user's add_interface request. For example, suppose the STA firmware is loaded, no STA interface has been added, and the user adds an AP interface. In this case, the AP firmware will be loaded to meet the request. Based on contributions from Pradeep Nemavat , Yogesh Powar , and Lennert Buytenhek . Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 3cc7772c0a3cc193fa9873816168bd34d4f16837 Author: Brian Cavagnolo Date: Fri Nov 12 17:23:49 2010 -0800 mwl8k: factor out firmware loading and hw init code This is in preparation for supporting different fw images for different interface types, and for supporting asynchronous firmware loading. Based on a patch from Pradeep Nemavat and Yogesh Powar Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit 41fdf0974d9eb81215cb578211a6d8f8a022a9eb Author: Nishant Sarmukadam Date: Fri Nov 12 17:23:48 2010 -0800 mwl8k: rf_tx_power cmd not supported by AP firmware APIv1 APIv1 AP firmware does not support the RF_TX_POWER command. It supports the similar TX_POWER command. Signed-off-by: Pradeep Nemavat Signed-off-by: Nishant Sarmukadam Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit a1fe24b0fd8bf16b4e551ae3fb785bfc574b9ffb Author: Brian Cavagnolo Date: Fri Nov 12 17:23:47 2010 -0800 mwl8k: revert unnecessary modification of tx descriptor This reverts change 783391c443728febc669e40597193308460e7b4f. The stabilized AP v1 firmware uses the same tx descriptor as the STA firmware. Signed-off-by: Brian Cavagnolo Signed-off-by: John W. Linville commit ae63a33ec9b598b3454cf0d29077fa17b616c42a Author: Deepak Saxena Date: Sun Oct 31 13:40:33 2010 +0000 libertas: EHS_REMOVE_WAKEUP is not always supported Certain firmware versions, particularly the 8388 found on the XO-1, do not support the EHS_REMOVE_WAKEUP command that is used to disable WOL. Sending this command to the card will return a failure that would get propagated up the stack and cause suspend to fail. Instead, fall back to an all-zero wakeup mask. This fixes http://dev.laptop.org/ticket/9967 Signed-off-by: Deepak Saxena Signed-off-by: Daniel Drake [includes fixups by Paul Fox] Signed-off-by: John W. Linville commit cf43298864fdfd687202db8c736473522bfceb98 Author: Daniel Drake Date: Sun Oct 31 13:40:12 2010 +0000 libertas: don't block usb8388 suspend if no wakeup conditions are set This hunk added by commit 66fceb69b72f seems erroneous. We don't want to prevent suspend of the whole system if no wakeup params are set. In the case of the usb8388 we do want to keep the card powered up even if there are no wakeup params. This is because it will continue acting as a mesh node. If the mesh is disabled, it would indeed make more sense to power down the card during suspend, as the equivalent hunk does for the SD interface. But that's a separate task; for now just restore the previous behaviour. Signed-off-by: Daniel Drake Acked-by: Dan Williams Signed-off-by: John W. Linville commit 83abd0d897ad3b7d064c8d8594ec5cc8520d6646 Author: Alan Cox Date: Fri Nov 12 10:46:23 2010 +0000 serial: ifx6x60: Fix missing include for msleep Noted by Stephen Rothwell Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8ddbe5edfb33e2186a5c83925d657914f643e09a Author: Alan Cox Date: Thu Nov 11 22:28:58 2010 +0000 serial: ifx6x60: The IFX requires SPI Correct the KConfig as noted by Greg. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit e44dcb6c377529805bbaae505d5b333daab69111 Author: Wolfram Sang Date: Fri Nov 12 19:47:47 2010 +0100 serial: mpc52xx: make printout for type more generic The printout for the type should be just "5xxx", so 512x users won't wonder why they have a mpc52xx-type UART. Signed-off-by: Wolfram Sang Cc: Grant Likely Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 597c606f560cf7ef6029152fa7574bddbfb0252f Author: Jiri Slaby Date: Thu Nov 4 16:20:21 2010 +0100 parisc: cleanup console handling * use newly added for_each_console for iterating consoles * add proper console locking * do not initialize tmp twice * no need to declare console_drivers, it's already done in console.h Signed-off-by: Jiri Slaby Acked-by: Kyle McMartin Cc: Helge Deller Cc: "James E.J. Bottomley" Cc: linux-parisc@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 23308ba54dcdb54481163bfb07dd8aeca76a7a2e Author: Jiri Slaby Date: Thu Nov 4 16:20:24 2010 +0100 console: add /proc/consoles It allows users to see what consoles are currently known to the system and with what flags. It is based on Werner's patch, the part about traversing fds was removed, the code was moved to kernel/printk.c, where consoles are handled and it makes more sense to me. Signed-off-by: Jiri Slaby [cleanups] Signed-off-by: "Dr. Werner Fink" Cc: Al Viro Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 281e66057757ddf32ffe679a08f9634fa9f70a7a Author: Jiri Slaby Date: Thu Nov 4 16:20:22 2010 +0100 VIDEO: xen-fb, switch to for_each_console Use newly added for_each_console for iterating consoles. Signed-off-by: Jiri Slaby Cc: Jeremy Fitzhardinge Cc: Chris Wright Cc: virtualization@lists.osdl.org Cc: xen-devel@lists.xensource.com Cc: linux-fbdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman commit 3dfbd044d0d99cad2fe50e4f6c79845703fa0558 Author: Jiri Slaby Date: Thu Nov 4 16:20:23 2010 +0100 TTY: include termios.h in tty_driver.h We reference termios and termiox in tty_driver.h, but we do not include linux/termios.h where these are defined. Add the #include properly. Otherwise when we include tty_driver.h, we get compile errors. Signed-off-by: Jiri Slaby Cc: Alan Cox Cc: Greg KH Signed-off-by: Greg Kroah-Hartman commit a75d946f42ae1771424a9582129fc5182ff48a1b Author: Jiri Slaby Date: Thu Nov 4 16:20:20 2010 +0100 console: move for_each_console to linux/console.h Move it out of printk.c so that we can use it all over the code. There are some potential users which will be converted to that macro in next patches. Signed-off-by: Jiri Slaby Signed-off-by: Greg Kroah-Hartman commit 2e3161390130f50fdbb4b989c667f42e5008107f Author: Dan Carpenter Date: Sat Nov 13 11:24:22 2010 +0300 Staging: bcm: signedness bug in InitCardAndDownloadFirmware() status is used to store negative error codes throughout. The only place where this is a runtime bug is if create_worker_threads() fails. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit f05321cca53da7c7abad4bc726699e9f27bf4922 Author: Dan Carpenter Date: Sat Nov 13 07:37:49 2010 +0300 Staging: bcm: signedness bug in StoreSFParam() wrm() returns negative error codes so "ret" needs to be signed here. There was place where wrm() returned positive EACCES instead of negative -EACCES so I fixed that as well. Also a few checkpatch.pl issues. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 0ebce2696305c3f49f54f3af25cb966ef1b24f71 Author: Randy Dunlap Date: Sat Nov 13 08:44:35 2010 -0800 staging: fix iio/gyro typos, build errors Typo causes build errors. Did anyone even build this driver? Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 59a126418b96e9f5337d431e6024a8d50bbd6e4e Author: Dan Carpenter Date: Sat Nov 13 12:05:32 2010 +0300 Staging: iio/dds: double locking bugs This is a static checker patch and I don't have this hardware. This code is unusual because while I've often seen a double lock, this is the first time I've seen code that takes a lock 11 times in a row. I feel like I must have missed something. But I've looked very carefully I don't see any way the original code is correct. Does spi_sync() somehow release the lock in a way that I can't see? Even if it does, the locking would still be wrong. Signed-off-by: Dan Carpenter Acked-by: Michael Hennerich Acked-by: Cliff Cai Signed-off-by: Greg Kroah-Hartman commit a1a26e492c4a90466cb3e064ccf69db4dd66d63a Author: Dan Carpenter Date: Sat Nov 13 11:34:16 2010 +0300 Staging: cptm1217: move free under dereference We dereference "ts" in the printk so move the kfree() down a line. Signed-off-by: Dan Carpenter Acked-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 62af33ec6e73d658720ea1190861c8c0609a94b3 Author: Randy Dunlap Date: Thu Nov 11 10:44:22 2010 -0800 staging/easycap: make module params private/static, fix build The easycap driver has module parameters (bars, gain, & debug) with global scope that intrude on the kernel namespace and cause build problems. Change the names of them to be driver-specific and make 2 of them static. drivers/built-in.o:(.bss+0x97c00): multiple definition of `debug' ld: Warning: size of symbol `debug' changed from 58 in arch/x86/built-in.o to 4 in drivers/built-in.o Signed-off-by: Randy Dunlap Cc: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit a65e659d97bc652b2e14a63beaf9efbf5d4e18b2 Author: Randy Dunlap Date: Fri Nov 12 14:47:02 2010 -0800 staging: fix ste_rmi4 build, depends on INPUT The synaptics_i2c_rmi4 driver uses input_*() interfaces, so it should depend on INPUT to fix its build errors: ERROR: "input_event" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_free_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_register_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_set_abs_params" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_allocate_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! ERROR: "input_unregister_device" [drivers/staging/ste_rmi4/synaptics_i2c_rmi4.ko] undefined! Signed-off-by: Randy Dunlap Cc: naveen.gaddipati@stericsson.com, js.ha@stericsson.com Signed-off-by: Greg Kroah-Hartman commit 44d4a4f784d0e1a50b3f1fc52bd6a661846abdc5 Author: David Brown Date: Fri Nov 12 13:49:53 2010 -0800 msm: make constant unsigned long to correct format warning Define VMALLOC_END as an unsigned long to match expected type. Eliminates a warning: arch/arm/mm/init.c: In function 'mem_init': arch/arm/mm/init.c:606: warning: format '%08lx' expects type 'long unsigned int', but argument 12 has type 'unsigned int' Signed-off-by: David Brown Signed-off-by: Daniel Walker commit d2c5d2145f127fffb7498bee943a480de66910ff Author: David Brown Date: Fri Nov 12 13:49:52 2010 -0800 msm: smd: ifdef adjustment to remove unused variables Put some variables inside of the same ifdef as the code that uses them. arch/arm/mach-msm/smd_debug.c: In function 'smsm_print_sleep_info': arch/arm/mach-msm/smd_debug.c:274: warning: unused variable 'int_info' arch/arm/mach-msm/smd_debug.c:273: warning: unused variable 'gpio' Signed-off-by: David Brown [dwalker@codeaurora.org: changed the commit text a little.] Signed-off-by: Daniel Walker commit 5d1394bb6b781df8148565783b0671f9b11500b7 Author: David Brown Date: Fri Nov 12 13:49:51 2010 -0800 msm: sirc: remove some unused variables Eliminate some unreferenced variables. arch/arm/mach-msm/sirc.c:43: warning: 'save_type' defined but not used arch/arm/mach-msm/sirc.c:44: warning: 'save_polarity' defined but not used Signed-off-by: David Brown [dwalker@codeaurora.org: changed the commit text a little.] Signed-off-by: Daniel Walker commit 9be58f317d79278afc23186d861ada774cf386ea Author: David Brown Date: Fri Nov 12 13:49:27 2010 -0800 msm: smd: Reduce driver log chatter The MSM smd driver logs numerous messages during startup that are useful for debug purposes. Change some of these to pr_debug() to match their purpose, and remove others that aren't really useful. Cc: Brian Swetland Cc: Arve Hjønnevåg Signed-off-by: David Brown Signed-off-by: Daniel Walker commit defc19cebc7f700cb05226f0c4496b9d50c84643 Author: Tushar Mehta Date: Tue Nov 16 12:13:50 2010 +0530 Staging: autofs: fix coding style issue in dirhash.c This is a patch to the dirhash.c file that fixes up a number of issues found by the checkpatch.pl tool Signed-off-by: Tushar Mehta Signed-off-by: Greg Kroah-Hartman commit 0ff36f69bd3e7846557880fe934dd0cdeee6a29e Author: Brandon Philips Date: Mon Nov 15 11:55:33 2010 -0800 staging: hv: add explanation of no-op set_multicast_list I was going to remove netvsc_set_multicast_list() so I think it is worth adding a comment since it isn't immediately clear why you would want this. Signed-off-by: Brandon Philips Acked-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit e33196e108197e4a1f1a5331dc7740ad9263f4f5 Author: Joe Perches Date: Mon Nov 15 13:12:32 2010 -0800 drivers/staging: Remove unnecessary casts of netdev_priv Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 345594d6ef696b8ad4b96cffe462c6cde2f27292 Author: Joe Perches Date: Mon Nov 15 12:14:00 2010 -0800 drivers/staging: Remove unnecessary casts of pci_get_drvdata Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 859171ca92f2865453b4b2e17bf679c67044a833 Author: Joe Perches Date: Sun Nov 14 19:04:48 2010 -0800 drivers/staging: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit ae0d9ebaffe47ed553e715ab5243660c33b6338c Author: Mike Rapoport Date: Sun Nov 14 13:36:23 2010 +0200 staging: brcm80211: brcmfmac: remove PXA SDIO controller binding Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman commit 5b93a8b8e0514ebacb49a50c67a8846139bcd1bd Author: Mike Rapoport Date: Sun Nov 14 13:36:21 2010 +0200 staging: brcm80211: remove unused osl_pkt{get,free}_static Signed-off-by: Mike Rapoport Signed-off-by: Greg Kroah-Hartman commit a1dc08b7d95817faea5e6a358e22c6185b84163a Author: Brett Rudley Date: Fri Nov 12 18:10:17 2010 -0800 staging: brcm80211: get rid of last bit of pci configspace workaround. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit baebc160c12ba88baf201d35ecc22f1e250aad3f Author: Brett Rudley Date: Fri Nov 12 15:28:30 2010 -0800 staging: brcm80211: simplify pci_config_read/write osl routines. Start simplifying osl with goal of purging it entirely. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit f96c377ead5ed308f0cf18b9156f86fdf207a288 Author: Nicolas Kaiser Date: Sat Nov 13 19:43:27 2010 +0100 staging: comedi: fix typo in error message Fix typo in error message of dux commands allocation. Signed-off-by: Nicolas Kaiser Signed-off-by: Greg Kroah-Hartman commit e08e02faff68d33c938fd0322c0f8318a25ddb39 Author: Emilio G. Cota Date: Fri Nov 12 11:15:54 2010 +0000 staging: vme: ca91cx42: mark the registers' base address pointer as __iomem Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit e20cbcf199e2c3e4a4822e890726c49b70a4d280 Author: Emilio G. Cota Date: Fri Nov 12 11:15:47 2010 +0000 staging: vme: tsi148: mark the registers' base address pointer as __iomem Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 0599726793d6dca6bd171cd4e497f9aac21e8f0c Author: Emilio G. Cota Date: Fri Nov 12 11:15:40 2010 +0000 staging: vme: mark struct vme_master_resource's base address pointer as __iomem Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 1a85f2073d99080ea70962f767edca479c768b6e Author: Emilio G. Cota Date: Fri Nov 12 11:15:34 2010 +0000 staging: vme_user: mark user-space buffers with __user Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 0a81a0f768e5bb0c32db6e44440c5b7c1b4658e7 Author: Emilio G. Cota Date: Fri Nov 12 11:15:27 2010 +0000 staging: vme_user: remove __iomem marking from kern_buf and derivates kern_buf is not iomem; it comes from kmalloc and is directly dereferenced. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit c949231838006d7de4ad38be38d9e112826862da Author: Emilio G. Cota Date: Fri Nov 12 11:15:21 2010 +0000 staging: vme_user: use an unsigned int for counting the number of kparams unsigned int is what struct kparam_array internally uses. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit b9cc293486e27f4d29a9813da6ebcb8574071dfa Author: Emilio G. Cota Date: Fri Nov 12 11:15:14 2010 +0000 staging: vme_user: declare private variables as static Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit efbb979d1b31638a95d76b5acf65cf00a3213fe4 Author: Emilio G. Cota Date: Fri Nov 12 11:15:07 2010 +0000 staging: vme: ca91cx42: declare static functions as such Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 5ade6c4d79377efc371ac89db07e4f6594d1286a Author: Emilio G. Cota Date: Fri Nov 12 11:15:00 2010 +0000 staging: vme: tsi148: declare static functions as such Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 84295e0b243cba070fcfe8be825c39827ea022e6 Author: Emilio G. Cota Date: Fri Nov 12 11:14:54 2010 +0000 staging: vme: tsi148: remove unreachable line Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit a82ad05ecd9dbd909509a332d3aa5f4ac439a054 Author: Emilio G. Cota Date: Fri Nov 12 11:14:47 2010 +0000 staging: vme: tsi148: fix warning in free_irq The cookie passed to request_irq isn't the same as the one passed to free_irq, which results in the following warning: [ 63.243533] WARNING: at kernel/irq/manage.c:899 __free_irq+0x9b/0x17d() [ 63.243533] Hardware name: [ 63.243533] Trying to free already-free IRQ 17 [ 63.243533] Modules linked in: vme_tsi148(-) vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: scsi_wait_scan] [ 63.243533] Pid: 2013, comm: rmmod Not tainted 2.6.35 #2 [ 63.243533] Call Trace: [ 63.243533] [] warn_slowpath_common+0x80/0x98 [ 63.243533] [] warn_slowpath_fmt+0x41/0x43 [ 63.243533] [] __free_irq+0x9b/0x17d [ 63.243533] [] free_irq+0x33/0x4e [ 63.243533] [] tsi148_irq_exit+0x6b/0x70 [vme_tsi148] [...] [ 63.243533] ---[ end trace bbf92311d969efb4 ]--- Fix it by passing the same cookie to both functions. Signed-off-by: Emilio G. Cota [martyn.welch@ge.com: modified to remove checkpatch warnings] Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit b12ef0b1f5d0358bc13cc716155d6e9b5584af48 Author: Emilio G. Cota Date: Fri Nov 12 11:14:40 2010 +0000 staging: vme: tsi148: remove double freeing of the IRQ in .remove tsi148_irq_exit is called twice in .remove, which causes an oops. Remove the second call, which apart from being redundant cannot possibly work; the CR/CSR space has been already unmapped. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit b558ba2f356c28269de179c4f7f6f179a4fa6a1d Author: Emilio G. Cota Date: Fri Nov 12 11:14:34 2010 +0000 staging: vme: tsi148: use list_for_each_safe when deleting resources in .remove This fixes an oops when removing the module. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit db6d8fc5596ef866e64e9a7eef96bacdc6e51e11 Author: Emilio G. Cota Date: Fri Nov 12 11:14:27 2010 +0000 staging: vme: fix bogus clearing of the bus number in vme_free_bus_num Signed-off-by: Emilio G. Cota Signed-off-by: Greg Kroah-Hartman commit c0779fd01df76b3097cc77e3a404e8bb067e5628 Author: Emilio G. Cota Date: Fri Nov 12 11:14:20 2010 +0000 staging: vme_user: remove unreachable line Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 55db50205adaf14db1bda07d0931b647b794de2f Author: Emilio G. Cota Date: Fri Nov 12 11:14:14 2010 +0000 staging: vme_user: return the appropriate error code when module_init fails When init_module fails, 0 is returned anyway; the module is then installed and oopses when we try to remove it: [ 3236.368009] WARNING: at drivers/base/driver.c:262 driver_unregister+0x36/0x6f() [ 3236.368012] Hardware name: [ 3236.368014] Unexpected driver unregister! [ 3236.368016] Modules linked in: vme_user(-) vme_tsi148 vme e1000e iTCO_wdt iTCO_vendor_support [last unloaded: vme] [ 3236.368027] Pid: 16162, comm: rmmod Not tainted 2.6.35 #2 [ 3236.368029] Call Trace: [ 3236.368037] [] warn_slowpath_common+0x80/0x98 [ 3236.368044] [] ? __try_stop_module+0x0/0x58 [ 3236.368049] [] warn_slowpath_fmt+0x41/0x43 [ 3236.368054] [] ? __try_stop_module+0x0/0x58 [ 3236.368059] [] driver_unregister+0x36/0x6f [ 3236.368066] [] vme_unregister_driver+0xd/0xf [vme] [ 3236.368072] [] vme_user_exit+0x10/0x1e [vme_user] [ 3236.368076] [] sys_delete_module+0x1ba/0x226 [ 3236.368082] [] ? do_page_fault+0x25d/0x28a [ 3236.368088] [] system_call_fastpath+0x16/0x1b [ 3236.368092] ---[ end trace cab6d88ebc44c1de ]--- The appended fixes it by returning the appropriate error code in module_init whenever something goes wrong, thus cancelling the insertion of the module. Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 886953e9b70bcb6913716b49bdf21b69450a7cd6 Author: Emilio G. Cota Date: Fri Nov 12 11:14:07 2010 +0000 staging: vme: style: convert '&(foo)' to '&foo' done with find . -name '*.c' | xargs perl -p -i -e 's/&\(([^()]+)\)/&$1/g' Signed-off-by: Emilio G. Cota Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 9d1e5e40d6cac4bf7008e04c202d71918455ca11 Author: Eric Dumazet Date: Wed Nov 3 05:56:38 2010 +0000 mpc52xx: cleanup locking commit 1e4e0767ecb1 (Fix locking on fec_mpc52xx driver) assumed IRQ are enabled when an IRQ handler is called. It is not the case anymore (IRQF_DISABLED is deprecated), so we can use regular spin_lock(), no need for spin_lock_irqsave(). Signed-off-by: Eric Dumazet Tested-by: Jean-Michel Hautbois Cc: Asier Llano Cc: Grant Likely Signed-off-by: David S. Miller commit 7f55f13c2ca82f6d998502df70f24deb550e5e0c Author: Steven Rostedt Date: Thu Nov 11 11:29:25 2010 -0500 staging: ft1000: Copy from user into correct data While doing a ktest.pl I used a MIN_CONFIG that had STAGING enabled, and a randconfig with CONFIG_DEBUG_STRICT_USER_COPY_CHECKS enabled caught the following bug: In file included from /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess.h:571:0, from /home/rostedt/work/autotest/nobackup/linux-test.git/include/linux/poll.h:14, from /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:32: In function 'copy_from_user', inlined from 'ft1000_ChIoctl' at /home/rostedt/work/autotest/nobackup/linux-test.git/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c:702:36: /home/rostedt/work/autotest/nobackup/linux-test.git/arch/x86/include/asm/uaccess_32.h:212:26: error: call to 'copy_from_user_overflow' declared with attribute error: copy_from_user() buffer size is not provably correct Looking at the code it was obvious what the problem was. The pointer dpram_data was being allocated but the address was being written to. Looking at the comment above the code shows that it use to write into an element of that pointer where the '&' is appropriate. But now that it writes to the pointer itself, we need to remove the '&' otherwise we write over the pointer and not into the data it points to. Signed-off-by: Steven Rostedt Cc: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e72115bce326dc893bc1db96db72059a6a08148c Author: Marek Belisko Date: Fri Nov 12 10:27:44 2010 +0100 staging: ft1000: Fix error goto statements. With commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 there was intruduced error which lead to stopping uninitialized kthread which leads to kernel panics. This patch fix problems with common entry point in correct way. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit b178bb3dfc30d9555bdd2401e95af98e23e83e10 Author: Eric Dumazet Date: Tue Nov 16 05:56:04 2010 +0000 net: reorder struct sock fields Right now, fields in struct sock are not optimally ordered, because each path (RX softirq, TX completion, RX user, TX user) has to touch fields that are contained in many different cache lines. The really critical thing is to shrink number of cache lines that are used at RX softirq time : CPU handling softirqs for a device can receive many frames per second for many sockets. If load is too big, we can drop frames at NIC level. RPS or multiqueue cards can help, but better reduce latency if possible. This patch starts with UDP protocol, then additional patches will try to reduce latencies of other ones as well. At RX softirq time, fields of interest for UDP protocol are : (not counting ones in inet struct for the lookup) Read/Written: sk_refcnt (atomic increment/decrement) sk_rmem_alloc & sk_backlog.len (to check if there is room in queues) sk_receive_queue sk_backlog (if socket locked by user program) sk_rxhash sk_forward_alloc sk_drops Read only: sk_rcvbuf (sk_rcvqueues_full()) sk_filter sk_wq sk_policy[0] sk_flags Additional notes : - sk_backlog has one hole on 64bit arches. We can fill it to save 8 bytes. - sk_backlog is used only if RX sofirq handler finds the socket while locked by user. - sk_rxhash is written only once per flow. - sk_drops is written only if queues are full Final layout : [1] One section grouping all read/write fields, but placing rxhash and sk_backlog at the end of this section. [2] One section grouping all read fields in RX handler (sk_filter, sk_rcv_buf, sk_wq) [3] Section used by other paths I'll post a patch on its own to put sk_refcnt at the end of struct sock_common so that it shares same cache line than section [1] New offsets on 64bit arch : sizeof(struct sock)=0x268 offsetof(struct sock, sk_refcnt) =0x10 offsetof(struct sock, sk_lock) =0x48 offsetof(struct sock, sk_receive_queue)=0x68 offsetof(struct sock, sk_backlog)=0x80 offsetof(struct sock, sk_rmem_alloc)=0x80 offsetof(struct sock, sk_forward_alloc)=0x98 offsetof(struct sock, sk_rxhash)=0x9c offsetof(struct sock, sk_rcvbuf)=0xa4 offsetof(struct sock, sk_drops) =0xa0 offsetof(struct sock, sk_filter)=0xa8 offsetof(struct sock, sk_wq)=0xb0 offsetof(struct sock, sk_policy)=0xd0 offsetof(struct sock, sk_flags) =0xe0 Instead of : sizeof(struct sock)=0x270 offsetof(struct sock, sk_refcnt) =0x10 offsetof(struct sock, sk_lock) =0x50 offsetof(struct sock, sk_receive_queue)=0xc0 offsetof(struct sock, sk_backlog)=0x70 offsetof(struct sock, sk_rmem_alloc)=0xac offsetof(struct sock, sk_forward_alloc)=0x10c offsetof(struct sock, sk_rxhash)=0x128 offsetof(struct sock, sk_rcvbuf)=0x4c offsetof(struct sock, sk_drops) =0x16c offsetof(struct sock, sk_filter)=0x198 offsetof(struct sock, sk_wq)=0x88 offsetof(struct sock, sk_policy)=0x98 offsetof(struct sock, sk_flags) =0x130 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c31504dc0d1dc853dcee509d9999169a9097a717 Author: Eric Dumazet Date: Mon Nov 15 19:58:26 2010 +0000 udp: use atomic_inc_not_zero_hint UDP sockets refcount is usually 2, unless an incoming frame is going to be queued in receive or backlog queue. Using atomic_inc_not_zero_hint() permits to reduce latency, because processor issues less memory transactions. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 213b15ca818adf7766cd7162c2159a6ecdd3bab8 Author: Eric Dumazet Date: Thu Nov 11 09:42:45 2010 +0000 vlan: remove ndo_select_queue() logic Now vlan are lockless, we dont need special ndo_select_queue() logic. dev_pick_tx() will do the multiqueue stuff on the real device transmit. Suggested-by: Jesse Gross Signed-off-by: Eric Dumazet Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 Author: Eric Dumazet Date: Wed Nov 10 23:42:00 2010 +0000 vlan: lockless transmit path vlan is a stacked device, like tunnels. We should use the lockless mechanism we are using in tunnels and loopback. This patch completely removes locking in TX path. tx stat counters are added into existing percpu stat structure, renamed from vlan_rx_stats to vlan_pcpu_stats. Note : this partially reverts commit 2e59af3dcbdf (vlan: multiqueue vlan device) Signed-off-by: Eric Dumazet Cc: Patrick McHardy Signed-off-by: David S. Miller commit 8ffab51b3dfc54876f145f15b351c41f3f703195 Author: Eric Dumazet Date: Wed Nov 10 21:14:04 2010 +0000 macvlan: lockless tx path macvlan is a stacked device, like tunnels. We should use the lockless mechanism we are using in tunnels and loopback. This patch completely removes locking in TX path. tx stat counters are added into existing percpu stat structure, renamed from rx_stats to pcpu_stats. Note : this reverts commit 2c11455321f37 (macvlan: add multiqueue capability) Note : rx_errors converted to a 32bit counter, like tx_dropped, since they dont need 64bit range. Signed-off-by: Eric Dumazet Cc: Patrick McHardy Cc: Ben Greear Cc: Ben Hutchings Acked-by: Patrick McHardy Signed-off-by: David S. Miller commit 491acf0032c08a74a4c88032ca1c03b498bfec37 Merge: 06fc884 e53beac Author: Greg Kroah-Hartman Date: Tue Nov 16 10:44:50 2010 -0800 Staging: Merge 2.6.37-rc2 into staging-next This was necessary in order to resolve some conflicts that happened between -rc1 and -rc2 with the following files: drivers/staging/bcm/Bcmchar.c drivers/staging/intel_sst/intel_sst_app_interface.c All should be resolved now. Signed-off-by: Greg Kroah-Hartman commit 133dc4c39c57eeef2577ca5b4ed24765b7a78ce2 Author: Ingo Molnar Date: Tue Nov 16 18:45:39 2010 +0100 perf: Rename 'perf trace' to 'perf script' Free the perf trace name space and rename the trace to 'script' which is a better match for the scripting engine. Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 0e3125c755445664f00ad036e4fc2cd32fd52877 Author: Neil Horman Date: Tue Nov 16 10:26:47 2010 -0800 packet: Enhance AF_PACKET implementation to not require high order contiguous memory allocation (v4) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Version 4 of this patch. Change notes: 1) Removed extra memset. Didn't think kcalloc added a GFP_ZERO the way kzalloc did :) Summary: It was shown to me recently that systems under high load were driven very deep into swap when tcpdump was run. The reason this happened was because the AF_PACKET protocol has a SET_RINGBUFFER socket option that allows the user space application to specify how many entries an AF_PACKET socket will have and how large each entry will be. It seems the default setting for tcpdump is to set the ring buffer to 32 entries of 64 Kb each, which implies 32 order 5 allocation. Thats difficult under good circumstances, and horrid under memory pressure. I thought it would be good to make that a bit more usable. I was going to do a simple conversion of the ring buffer from contigous pages to iovecs, but unfortunately, the metadata which AF_PACKET places in these buffers can easily span a page boundary, and given that these buffers get mapped into user space, and the data layout doesn't easily allow for a change to padding between frames to avoid that, a simple iovec change is just going to break user space ABI consistency. So I've done this, I've added a three tiered mechanism to the af_packet set_ring socket option. It attempts to allocate memory in the following order: 1) Using __get_free_pages with GFP_NORETRY set, so as to fail quickly without digging into swap 2) Using vmalloc 3) Using __get_free_pages with GFP_NORETRY clear, causing us to try as hard as needed to get the memory The effect is that we don't disturb the system as much when we're under load, while still being able to conduct tcpdumps effectively. Tested successfully by me. Signed-off-by: Neil Horman Acked-by: Eric Dumazet Acked-by: Maciej Żenczykowski Reported-by: Maciej Żenczykowski Signed-off-by: David S. Miller commit 020f01ebd04f3429c32586d90598c9f59e54ca7d Author: Joe Perches Date: Tue Nov 9 14:35:16 2010 +0000 drivers/isdn/mISDN: Use printf extension %pV Using %pV reduces the number of printk calls and eliminates any possible message interleaving from other printk calls. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 3654654f7aa79a37dde130afb7409c55b11807e7 Author: Jan Engelhardt Date: Tue Nov 16 09:52:32 2010 -0800 netlink: let nlmsg and nla functions take pointer-to-const args The changed functions do not modify the NL messages and/or attributes at all. They should use const (similar to strchr), so that callers which have a const nlmsg/nlattr around can make use of them without casting. While at it, constify a data array. Signed-off-by: Jan Engelhardt Signed-off-by: David S. Miller commit 9d82ca98f71fd686ef2f3017c5e3e6a4871b6e46 Author: John Fastabend Date: Mon Nov 15 20:29:21 2010 +0000 ipv6: fix missing in6_ifa_put in addrconf Fix ref count bug introduced by commit 2de795707294972f6c34bae9de713e502c431296 Author: Lorenzo Colitti Date: Wed Oct 27 18:16:49 2010 +0000 ipv6: addrconf: don't remove address state on ifdown if the address is being kept Fix logic so that addrconf_ifdown() decrements the inet6_ifaddr refcnt correctly with in6_ifa_put(). Reported-by: Stephen Hemminger Signed-off-by: John Fastabend Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit b5e4156743c5d42b736936be7a9ee8d72e0e4ac9 Merge: 6b35308 b1d771e Author: David S. Miller Date: Tue Nov 16 09:17:12 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 3143a2bf18d12545f77dafa5b9f7fee83b001223 Author: Chris Wilson Date: Tue Nov 16 15:55:10 2010 +0000 drm/i915: Convert (void)I915_READ to POSTING_READ ... and so hide the flushes from tracing. Signed-off-by: Chris Wilson commit 9e2e7422d059f9b98c3a0810df92a1ff660ade2f Author: Wey-Yi Guy Date: Fri Nov 12 13:52:37 2010 -0800 iwlwifi: set STATUS_READY before commit_rxon Have the STATUS_READY bit set before commit_rxon call to avoid fail to send tx power to uCode. Signed-off-by: Wey-Yi Guy commit 6163a3735aad19bdb8d02b3362d3a2d7d2eb78d5 Author: Shanyu Zhao Date: Fri Nov 12 13:48:13 2010 -0800 iwlagn: check change before commit RXON cmd When setting rxon chain and filter, no need to commit RXON when the chain flag is not changed. This reduces the number of RXON commands we send down to uCode. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy commit 21a5b3c6b19a8b8972ccdd55389be28a8b7c9180 Author: Wey-Yi Guy Date: Wed Nov 10 13:32:59 2010 -0800 iwlagn: use SKU information in the EEPROM EEPROM contain the SKU information for the device, use it. Signed-off-by: Wey-Yi Guy commit f4115d46599464a49a3055d33d499d97ac81fccb Author: Shanyu Zhao Date: Wed Nov 10 18:25:58 2010 -0800 iwlagn: update QoS before commit associated RXON RXON command without association bit can clear the QoS info in the uCode. Therefore, before sending the associated RXON, we need to send the QoS command just in case. Signed-off-by: Shanyu Zhao Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit efe54db8233a4b41e68cbe67ca2e30c48532078a Author: Johannes Berg Date: Wed Nov 10 18:25:49 2010 -0800 iwlagn: fix PAN slot timing wrt. DTIM When the DTIM is not 1, then the slot timing is in some cases required to be calclulated based on the DTIM interval instead of the beacon interval, fix that. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 2b5f7a679c2ae34407f6cc9387e77b563578bfdc Author: Johannes Berg Date: Wed Nov 10 18:25:48 2010 -0800 iwlagn: reprogram AP STA after assoc Instead of unconditionally sending unassoc RXON, before any assoc RXON, re-send only the AP STA entry which is required after the BSSID has been programmed into the device to set up internal filters in the microcode properly. This fixes some issues that we correlated with sending a lot of RXON commands to the device. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 893654de3ff41a4f5037397d06a3f853bbbb3484 Author: Johannes Berg Date: Wed Nov 10 18:25:47 2010 -0800 iwlagn: avoid crash if vif is not assigned For reasons that aren't entirely clear to me, we sometimes get here during hardware reset without the interface being set. Don't crash, but keep a warning. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit cfa1da7e9133be9280990b2a64fa7696924c8d9a Author: Johannes Berg Date: Wed Nov 10 18:25:46 2010 -0800 iwlagn: fix PAN queues Currently, when a PAN queue needs to be stopped, we erroneously stop queue number 5 (for example) with mac80211 -- which doesn't even exist! To avoid that problem, recalculate the swq_id for all queues when setting up the queues, and don't use the default identity mapping that is acceptable for devices which don't support PAN. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit ea9b307f8e859186a6791e0d508c5993448ac900 Author: Johannes Berg Date: Wed Nov 10 18:25:45 2010 -0800 iwlwifi: always build swq_id as virtual queue ID Previously, we used the swq_id's mechanism to have AC and HW queue different only for aggregation queues. To be able to fix a bug with iPAN simply always build the swq_id as ac | (hwq << 2) and remove the flag bit. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 549a04e092e5e043df82fd0541f3b67ab488359b Author: Johannes Berg Date: Wed Nov 10 18:25:44 2010 -0800 iwlwifi: pass txq to wake/stop queue Instead of passing the txq->swq_id, pass the txq struct directly to make sure that in the future nobody will pass an invalid number. Only three places actually change from using the txq_id or the skb's queue_mapping to now using txq->swq_id as well. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 4bea9b990205e4a3d432d9d6c29687215618a306 Author: Johannes Berg Date: Wed Nov 10 18:25:43 2010 -0800 iwlagn: remove a bogus AGG_OFF check Even if this check were to happen, using the txq_id here (which is a HW queue) would lead to confusion in mac80211. Luckily, it doesn't seem like this can ever happen. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 8d56396ac3926412dd97dcb9dd8d0cef556b908e Author: Johannes Berg Date: Wed Nov 10 18:25:42 2010 -0800 iwlagn: remove unused variable swq_id Simply remove the unused variable swq_id. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 76f379cec6df6c9c5c9dbf7377d1bbbb0bf3fd5f Author: Johannes Berg Date: Wed Nov 10 18:25:41 2010 -0800 iwlagn: fix some naming regarding FIFOs Some variables are misnamed in the FIFO setup code, fix that. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy commit 564b344c10b694d433cef5b89f8ff8ac5e33898d Author: Wey-Yi Guy Date: Tue Nov 9 09:21:34 2010 -0800 iwlwifi: change default led mode for different devices Set the default led mode for different devices. For the newer devices such as 6000g2a, 6000g2b and newer, the default led mode is On/Off instead of blinking. The led_mode still can be control through module parameter 0: system default 1: On/Off 2: blinking Signed-off-by: Wey-Yi Guy commit 05433df23cf16a9ccbdd35964aba781cdf455034 Author: Wey-Yi Guy Date: Mon Nov 8 12:37:20 2010 -0800 iwlagn: change default ACK/CTS MASK setting for WiFi/BT coex Change the default BT_KILL_ACK_MASK and BT_KILL_CTS_MASK for BT coex Signed-off-by: Wey-Yi Guy commit 66e863a527f9ed3a871797862aaf0d62b0954813 Author: Wey-Yi Guy Date: Mon Nov 8 14:54:37 2010 -0800 iwlagn: support dynamic aggregation for BT coex Use dynamic aggregation threshold if bt traffic load is high to reduce the impact on aggregated frame. Signed-off-by: Wey-Yi Guy commit 95a5ede3ee9269e175bfe0e6f5a4a5fd2914ed6a Author: Wey-Yi Guy Date: Mon Nov 8 14:55:43 2010 -0800 iwlagn: set dynamic aggregation threshold for BT Setting the max/min/def value for BT dynamic aggregation threshold. Signed-off-by: Wey-Yi Guy commit 8829c9e2ec144baeb3cee599e1e653a396ad521b Author: Wey-Yi Guy Date: Wed Nov 10 11:05:38 2010 -0800 iwlagn: used frame count info in compressed ba packet For newer devices, uCode provide both "number of frames sent" and "number of frames acked" information inside the compressed_ba packet. So instead of figure the success/failure information through the bitmap, use those information which is much betrer approach. Signed-off-by: Wey-Yi Guy commit 2f55ac072f5344519348c0c94b3d2f4cca46847b Author: Lionel Debroux Date: Tue Nov 16 14:14:02 2010 +0100 suspend: constify platform_suspend_ops While at it, fix two checkpatch errors. Several non-const struct instances constified by this patch were added after the introduction of platform_suspend_ops in checkpatch.pl's list of "should be const" structs (79404849e90a41ea2109bd0e2f7c7164b0c4ce73). Patch against mainline. Inspired by hunks of the grsecurity patch, updated for newer kernels. Signed-off-by: Lionel Debroux Acked-by: Ingo Molnar Signed-off-by: Jiri Kosina commit acc2472ed33fc5e72482cc3b3b846077d97c2f8b Author: Lionel Debroux Date: Tue Nov 16 14:14:02 2010 +0100 backlight: constify backlight_ops backlight_device_register has been expecting a const "ops" argument, and using it as such, since 9905a43b2d563e6f89e4c63c4278ada03f2ebb14. Let's make the remaining backlight_ops instances const. Inspired by hunks of the grsecurity patch, updated for newer kernels. Signed-off-by: Lionel Debroux Acked-by: Ingo Molnar Signed-off-by: Jiri Kosina commit 073ef1f6e508688392580e4f35dcad9aabd1e100 Author: Lionel Debroux Date: Tue Nov 9 21:48:49 2010 +0100 hibernation: constify platform_hibernation_ops Patch against mainline. Changes since v1: added one hunk; no longer adding "const" qualifier to pointers in platform_hibernation_ops after seeing b4144e4f6e3b448d322095ca08af393682a69e33. Signed-off-by: Jiri Kosina commit d07335e51df0c6dec202d315fc4f1f7e100eec4e Author: Mike Snitzer Date: Tue Nov 16 12:52:38 2010 +0100 block: Rename "block_remap" tracepoint to "block_bio_remap" to clarify the event. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Mike Snitzer Signed-off-by: Jens Axboe commit 84dab5671bff4516781c14f4fba5a1e2be13be1e Author: Mark Brown Date: Fri Nov 12 15:28:42 2010 +0000 ASoC: Use DAPM context rather than CODEC when constructing sequences DAPM widgets may be associated with non-CODEC devices so compare based on the DAPM context rather than the CODEC pointer. Signed-off-by: Mark Brown Acked-by: Jarkko Nikula Acked-by: Liam Girdwood commit ce0df3d79a1b305cb39ea15a07235b5a6c3435b6 Author: Axel Lin Date: Tue Nov 16 16:11:37 2010 +0800 ASoC: Fix incorrect kfree in wm8962_probe error path We allocated memory for wm8962 in wm8962_i2c_probe, and will free the memory in either wm8962_i2c_probe error path or wm8962_i2c_remove. Thus we should not call kfree(wm8962) in wm8962_probe, otherwise we have double free of wm8962. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 01cbea3293929acecef6785b7ea5be547dc039bc Author: Axel Lin Date: Tue Nov 16 16:10:41 2010 +0800 ASoC: Fix incorrect kfree in wm8731_probe error path We allocated memory for wm8731 in wm8731_spi_probe / wm8731_i2c_probe, and will free the memory in either wm8731_spi_probe / wm8731_i2c_probe error path or wm8731_spi_remove / wm8731_i2c_remove. Thus we should not call kfree(wm8731) in wm8731_probe, otherwise we have double free of wm8731. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 4ab867d276b83582f15c61270de1cc178df95659 Author: Axel Lin Date: Tue Nov 16 16:09:41 2010 +0800 ASoC: Fix incorrect kfree in aic3x_probe error path We allocated memory for aic3x in aic3x_i2c_probe, and will free the memory in either aic3x_i2c_probe error path or aic3x_i2c_remove. Thus we should not call kfree(aic3x) in aic3x_probe, otherwise we have double free of aic3x. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 50d0ac2e1e98efa89f6dc167977b1a0d46d5e48e Author: Axel Lin Date: Tue Nov 16 16:08:51 2010 +0800 ASoC: Fix incorrect kfree in ad193x_probe error path We allocated memory for ad193x in ad193x_spi_probe, and will free the memory in either ad193x_spi_probe error path or ad193x_spi_remove. Thus we should not call kfree(ad193x) in ad193x_probe, otherwise we have double free of ad193x. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit af353d8a134d6147e29a3371015d2eef8d7f0657 Author: Axel Lin Date: Tue Nov 16 16:08:00 2010 +0800 ASoC: Fix incorrect kfree in ad1836_probe error path We allocated memory for ad1836 in ad1836_spi_probe, and will free the memory in either ad1836_spi_probe error path or ad1836_spi_remove. Thus we should not call kfree(ad1836) in ad1836_probe, otherwise we have double free of ad1836. Signed-off-by: Axel Lin Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5fbf85639287b6ea287f4f5e5e7e36608f0f60bd Merge: a020563 bdc85df Author: Jens Axboe Date: Tue Nov 16 10:10:12 2010 +0100 Merge branch 'for-2.6.38/rc2-holder' into for-2.6.38/core commit a02056349cdea2252cd2b21643ebf025e83a29f2 Merge: 34db1d5 e53beac Author: Jens Axboe Date: Tue Nov 16 10:09:42 2010 +0100 Merge branch 'v2.6.37-rc2' into for-2.6.38/core commit 27d29dc4be07aafae270992f8d6e400f8912a33d Merge: 936fc42 640dcfa 4232f60 Author: Paul Mundt Date: Tue Nov 16 16:25:35 2010 +0900 Merge branches 'rmobile/fbdev' and 'common/fbdev-edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit 936fc42831aa351974b707c00b9e67ac81cd530f Merge: 12ddf37 0ad83f6 Author: Paul Mundt Date: Tue Nov 16 16:25:03 2010 +0900 Merge branch 'fbdev/edid' commit 6d72ad35f1bfaf6e52ca7133cb51ce0e36f17528 Author: Paul Mundt Date: Tue Nov 16 16:10:20 2010 +0900 ARM: mach-shmobile: Tidy up the Kconfig bits. Presently each one of the CPUs manually selects the same feature set, and there's a reasonable expectation that none of these will change for future CPUs in the SH-Mobile / R-Mobile family, so we move those over to the top-level ARCH_SHMOBILE. While we're at it, all of the CPUs support optional GPIOs via the PFC, do not have I/O ports, and expect sparse IRQ, so we bring the configuration in line across the board. This more or less brings the ARM-based parts in sync with their SH counterparts. Signed-off-by: Paul Mundt commit 96f8d864afd646e4a52ea55462b7d83e3b94fd5c Author: Paul Mundt Date: Tue Nov 16 14:00:24 2010 +0900 fbdev: move udlfb out of staging. udlfb has undergone a fair bit of cleanup recently and is effectively at the point where it can be liberated from staging purgatory and promoted to a real driver. The outstanding cleanups are all minor, with some of them dependent on drivers/video headers, so these will be done incrementally from udlfb's new home. Requested-by: Bernie Thompson Signed-off-by: Paul Mundt commit 6b35308850e1679741e8b646cfb7bb3ab5369888 Author: David S. Miller Date: Mon Nov 15 20:15:03 2010 -0800 net: Export netif_get_vlan_features(). ERROR: "netif_get_vlan_features" [drivers/net/xen-netfront.ko] undefined! Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit c996d8b9a8f37bd1b4dd7823abc42780b20998f8 Author: Michael Witten Date: Mon Nov 15 19:55:34 2010 +0000 Docs/Kconfig: Update: osdl.org -> linuxfoundation.org Some of the documentation refers to web pages under the domain `osdl.org'. However, `osdl.org' now redirects to `linuxfoundation.org'. Rather than rely on redirections, this patch updates the addresses appropriately; for the most part, only documentation that is meant to be current has been updated. The patch should be pretty quick to scan and check; each new web-page url was gotten by trying out the original URL in a browser and then simply copying the the redirected URL (formatting as necessary). There is some conflict as to which one of these domain names is preferred: linuxfoundation.org linux-foundation.org So, I wrote: info@linuxfoundation.org and got this reply: Message-ID: <4CE17EE6.9040807@linuxfoundation.org> Date: Mon, 15 Nov 2010 10:41:42 -0800 From: David Ames ... linuxfoundation.org is preferred. The canonical name for our web site is www.linuxfoundation.org. Our list site is actually lists.linux-foundation.org. Regarding email linuxfoundation.org is preferred there are a few people who choose to use linux-foundation.org for their own reasons. Consequently, I used `linuxfoundation.org' for web pages and `lists.linux-foundation.org' for mailing-list web pages and email addresses; the only personal email address I updated from `@osdl.org' was that of Andrew Morton, who prefers `linux-foundation.org' according `git log'. Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit 1f4f067f99cbb2af7af7a67bd025a9fb58b5156c Author: Vasanthy Kolluri Date: Mon Nov 15 08:09:55 2010 +0000 enic: Fix build warnings Fix data type of argument passed to pci_alloc_consistent and pci_free_consistent routines. Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang Signed-off-by: David S. Miller commit ce5a121304af02d02489e86efb6ae26a67f95e52 Author: Alan Cox Date: Mon Nov 15 07:30:42 2010 +0000 hso: Fix unused variable warning Fallout from the TIOCGICOUNT work Signed-off-by: Alan Cox Signed-off-by: David S. Miller commit ec1e5610c00c7f5bc530d2aadd47faa473b90a30 Author: Eric Dumazet Date: Mon Nov 15 06:38:14 2010 +0000 bridge: add RCU annotations to bridge port lookup br_port_get() renamed to br_port_get_rtnl() to make clear RTNL is held. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit b5ed54e94d324f17c97852296d61a143f01b227a Author: stephen hemminger Date: Mon Nov 15 06:38:13 2010 +0000 bridge: fix RCU races with bridge port The macro br_port_exists() is not enough protection when only RCU is being used. There is a tiny race where other CPU has cleared port handler hook, but is bridge port flag might still be set. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 61391cde9eefac5cfcf6d214aa80c77e58b1626b Author: stephen hemminger Date: Mon Nov 15 06:38:12 2010 +0000 netdev: add rcu annotations to receive handler hook Suggested by Eric's bridge RCU changes. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit a386f99025f13b32502fe5dedf223c20d7283826 Author: Eric Dumazet Date: Mon Nov 15 06:38:11 2010 +0000 bridge: add proper RCU annotation to should_route_hook Add br_should_route_hook_t typedef, this is the only way we can get a clean RCU implementation for function pointer. Move route_hook to location where it is used. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e80516880019aa1f7c5c410276edfea9575ec89f Author: Eric Dumazet Date: Mon Nov 15 06:38:10 2010 +0000 bridge: add RCU annotation to bridge multicast table Add modern __rcu annotatations to bridge multicast table. Use newer hlist macros to avoid direct access to hlist internals. Signed-off-by: Eric Dumazet Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 8a22c99a80b0926585cfcbcc423ee2c49c1fd820 Author: Joe Perches Date: Sun Nov 14 17:05:00 2010 +0000 net/ipv6/mcast.c: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit d577f1ccdd8ae8bfbe6063eb2ba2a350259e9031 Author: Joe Perches Date: Sun Nov 14 17:04:58 2010 +0000 include/net/caif/cfctrl.h: Remove unnecessary semicolons Signed-off-by: Joe Perches Acked-by: Sjur Braendeland Signed-off-by: David S. Miller commit c59504ebc5baa628706d10c2d3c7e1f4bc3c2147 Author: Joe Perches Date: Sun Nov 14 17:04:57 2010 +0000 include/linux/if_macvlan.h: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 779bb41d4bd111d5631d58d1bf2d00b5c4389c80 Author: Joe Perches Date: Sun Nov 14 17:04:37 2010 +0000 drivers/net/cnic.c: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e81a1ba815666ec02ef5bf0e17cf256c88d233b3 Author: Joe Perches Date: Sun Nov 14 17:04:33 2010 +0000 drivers/net/ixgbe: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 1d51c4185bb369cb39ed8cc20b331508e47b35b2 Author: Joe Perches Date: Sun Nov 14 17:04:32 2010 +0000 drivers/net/e1000e: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6f38ad93e4882e84c1cc113736db7dc9252dcf11 Author: Joe Perches Date: Sun Nov 14 17:04:31 2010 +0000 drivers/net/bnx2x: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit ad65ffd12dccf6d1031298eacc060327751084da Author: Joe Perches Date: Sun Nov 14 17:04:26 2010 +0000 drivers/isdn: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 6c1b6c6b873d66d353ef47a054156dfde3f4c075 Merge: fe82224 7e87fe8 Author: David S. Miller Date: Mon Nov 15 10:59:49 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit fe8222406c8277a21172479d3a8283d31c209028 Author: Tom Herbert Date: Tue Nov 9 10:47:38 2010 +0000 net: Simplify RX queue allocation This patch move RX queue allocation to alloc_netdev_mq and freeing of the queues to free_netdev (symmetric to TX queue allocation). Each kobject RX queue takes a reference to the queue's device so that the device can't be freed before all the kobjects have been released-- this obviates the need for reference counts specific to RX queues. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit ed9af2e839c06c18f721da2c768fbb444c4a10e5 Author: Tom Herbert Date: Tue Nov 9 10:47:30 2010 +0000 net: Move TX queue allocation to alloc_netdev_mq TX queues are now allocated in alloc_netdev_mq and freed in free_netdev. Signed-off-by: Tom Herbert Signed-off-by: David S. Miller commit cc9ff19da9bf76a2f70bcb80225a1c587c162e52 Author: Timo Teräs Date: Wed Nov 3 04:41:38 2010 +0000 xfrm: use gre key as flow upper protocol info The GRE Key field is intended to be used for identifying an individual traffic flow within a tunnel. It is useful to be able to have XFRM policy selector matches to have different policies for different GRE tunnels. Signed-off-by: Timo Teräs Signed-off-by: David S. Miller commit bdc85df7a8417b9893443ff5520804699416b6f3 Author: Vivek Goyal Date: Mon Nov 15 19:37:36 2010 +0100 blk-cgroup: Allow creation of hierarchical cgroups o Allow hierarchical cgroup creation for blkio controller o Currently we disallow it as both the io controller policies (throttling as well as proportion bandwidth) do not support hierarhical accounting and control. But the flip side is that blkio controller can not be used with libvirt as libvirt creates a cgroup hierarchy deeper than 1 level. //libvirt/qemu/ o So this patch will allow creation of cgroup hierarhcy but at the backend everything will be treated as flat. So if somebody created a an hierarchy like as follows. root / \ test1 test2 | test3 CFQ and throttling will practically treat all groups at same level. pivot / | \ \ root test1 test2 test3 o Once we have actual support for hierarchical accounting and control then we can introduce another cgroup tunable file "blkio.use_hierarchy" which will be 0 by default but if user wants to enforce hierarhical control then it can be set to 1. This way there should not be any ABI problems down the line. o The only not so pretty part is introduction of extra file "use_hierarchy" down the line. Kame-san had mentioned that hierarhical accounting is expensive in memory controller hence they keep it off by default. I suspect same will be the case for IO controller also as for each IO completion we shall have to account IO through hierarchy up to the root. if yes, then it probably is not a very bad idea to introduce this extra file so that it will be used only when somebody needs it and some people might enable hierarchy only in part of the hierarchy. o This is how basically memory controller also uses "use_hierarhcy" and they also allowed creation of hierarchies when actual backend support was not available. Signed-off-by: Vivek Goyal Acked-by: Balbir Singh Reviewed-by: Gui Jianfeng Reviewed-by: Ciju Rajan K Tested-by: Ciju Rajan K Signed-off-by: Jens Axboe commit e1f2d8c2cc61d2b9472efe44e8a2b098336914b4 Author: David S. Miller Date: Mon Nov 15 10:37:30 2010 -0800 vlan: Fix build warning in vlandev_seq_show() net/8021q/vlanproc.c: In function 'vlandev_seq_show': net/8021q/vlanproc.c:283:20: warning: unused variable 'fmt' Signed-off-by: David S. Miller commit b1d771ee33c6e4006676002b9d74abf45b71d3d6 Author: Christian Lamparter Date: Fri Oct 29 23:11:23 2010 +0200 carl9170: use generic sign_extend32 This patch replaces the handcrafted sign extension cruft with a generic bitop function. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 7919a57bc608140aa8614c19eac40c6916fb61d2 Author: Andreas Herrmann Date: Mon Aug 30 19:04:01 2010 +0000 bitops: Provide generic sign_extend32 function This patch moves code out from wireless drivers where two different functions are defined in three code locations for the same purpose and provides a common function to sign extend a 32-bit value. Signed-off-by: Andreas Herrmann Signed-off-by: John W. Linville commit e4b3fdb80021bc0a3239bfc2a873a6d7c6ac52a1 Author: Grazvydas Ignotas Date: Thu Nov 4 00:13:49 2010 +0200 wl1251: use wl12xx_platform_data to pass data Make use the newly added method to pass platform data for wl1251 too. This allows to eliminate some redundant code. Cc: Ohad Ben-Cohen Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Acked-by: Luciano Coelho Acked-by: Tony Lindgren Signed-off-by: John W. Linville commit 1d4b89f2970f9ea0902d0a3bc1090f3c770b5080 Author: Grazvydas Ignotas Date: Mon Nov 8 15:29:36 2010 +0200 wl1251: add runtime PM support for SDIO Add runtime PM support, similar to how it's done for wl1271. This allows to power down the card when the driver is loaded but network is not in use. Cc: Ohad Ben-Cohen Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit cb7bbc7a5535ab2333915b83391e1d846a0914df Author: Grazvydas Ignotas Date: Thu Nov 4 00:13:47 2010 +0200 wl1251: add power callback to wl1251_if_operations Call interface specific power callback before calling board specific one. Also allow that callback to fail. This is how it's done for wl1271 and will be used for runtime_pm support. Signed-off-by: Grazvydas Ignotas Acked-by: Kalle Valo Signed-off-by: John W. Linville commit f81c1f48384d398dbe8f6c5b10377c7158086791 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:50 2010 -0800 iwlagn: enable shadow register For 6000 series devices and up, enable automatic update MAC's register for better power usage in PSP mode Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 6fe8efb2211fe61caa7b0e1c36c521670b8a10a9 Author: Shanyu Zhao Date: Wed Nov 10 09:56:49 2010 -0800 iwlwifi: disable disconnected antenna for advanced bt coex Disconnected antenna algorithm is used to find out which antennas are disconnected. It should be disabled for devices that support advanced bluetooth coexist. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 3031242b31dcd76e1c6b1c1718cfee872f55d5af Author: Shanyu Zhao Date: Wed Nov 10 09:56:48 2010 -0800 iwlwifi: seperate disconnected antenna function Disconnected antenna algorithm is seperated into its own function from chain noise calibration routine for better code management. Signed-off-by: Shanyu Zhao Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit b2769b84d86a2d29fa131a763d2b23b112834420 Author: Johannes Berg Date: Wed Nov 10 09:56:47 2010 -0800 iwlagn: fix RXON HT When the HT information is changed due to BSS changes (like legacy stations joining) we need to recalculate HT RXON parameters. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8da8e62851680772f0422d0f1c4b467190b268e5 Author: Johannes Berg Date: Wed Nov 10 09:56:46 2010 -0800 iwlagn: re-enable calibration During the RXON rewrite, this code got lost. When we've just associated, we need to enable all calibrations and see if some were already finished. Add back the missing code. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 52d980c01353202332ff4322f3f41db0c49816a5 Author: Johannes Berg Date: Wed Nov 10 09:56:45 2010 -0800 iwlagn: fix RXON issues The RXON rework resulted in a massive loss of throughput because we weren't programming the device completely correctly -- the BSSID has to be programmed into the device before the AP station is uploaded. To fix this, simply always send the unassoc RXON, i.e. even when it was already unassoc so that the BSSID and some other parameters are updated properly. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2e1fea43aa170e18beb8378465e595e18cd08f6e Author: Johannes Berg Date: Wed Nov 10 09:56:44 2010 -0800 iwlagn: fix needed chains calculation Garen noticed that this was wrong. Fix the calibration -- default to multiple chains and fall back to single where possible. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 35a6eb36520b938742d8680fd8d821df20982ced Author: Wey-Yi Guy Date: Wed Nov 10 09:56:43 2010 -0800 iwlwifi: resending QoS command when HT changes "mac80211: Fix WMM driver queue configuration" inadvertedly broke iwlwifi, because now mac80211 configures the QoS settings before assoc, and therefore before HT. Thus, iwlwifi no longer told the device about the HT setting, which it needs to -- and thus throughput went down a lot. Fix this by resending the QoS command to the device not only when QoS/WMM settings change, but also when HT changes. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit fd11743dd25efe7157ff17b03dd2db0cbb6fed05 Author: Winkler, Tomas Date: Wed Nov 10 09:56:42 2010 -0800 iwlwlifi: update rx write pointer w/o request mac access in the CAM mode In iwl_rx_queue_update_write_ptr function replace iwl_write_direct32 with iwl_write32 when not in power save mode. We don't have to go through grab nic access as the NIC is already awake. Signed-off-by: Tomas Winkler Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 708068db4c09f93937a6a83ac8fff8516f482b0f Author: Wey-Yi Guy Date: Wed Nov 10 09:56:41 2010 -0800 iwlwifi: legacy tx_cmd_protection function Legacy (4965 and 3945) devices has different tx_cmd_protection routine. Move to iwl-legacy.c Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit e39fdee1d7856817619326fa114438c146d74510 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:40 2010 -0800 iwlwifi: put all the isr related function under ops There were two type of isr supported by iwlwifi devices. legacy isr - only used by legacy devices (3945 & 4965) ict isr - used by all new generation of iwlwifi devices Move all the isr related functions into ops, the ict type of isr supports only needed for newer devices. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 81baf6ec9c190ae128748cf2a026bff5cb811b70 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:39 2010 -0800 iwlwifi: Legacy isr only used by legacy devices Move iwl_isr_legacy function to iwl_legacy.c since it only used by legacy devices. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ae79d23d0b2c16998e60f49a16dae53521c76a45 Author: Johannes Berg Date: Wed Nov 10 09:56:38 2010 -0800 iwlagn: fix non-5000+ build When building 4965 without 5000+ there were a lot of build errors due to functions being used that weren't even compiled in. To fix this move some code around and only compile the HCMD code for 5000+ series as it's not used for 4965. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2a21ff446c07b95d08cbb830bd20112f3ee1d76e Author: Wey-Yi Guy Date: Wed Nov 10 09:56:37 2010 -0800 iwlagn: update PCI ID for 100 series devices Update the supported PCI ID list for 100 series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit fb30eaf38703d7562606e49a5872745d66366a50 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:36 2010 -0800 iwlagn: update PCI ID for 6000g2a series devices Update the supported PCI ID list for 6000g2a series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 8b37d9f0a1e114a1c7f5082842fb310a81ea3732 Author: Wey-Yi Guy Date: Wed Nov 10 09:56:35 2010 -0800 iwlagn: update PCI ID for 6000g2b series devices Update the supported PCI ID list for 6000g2b series devices Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5d882c97e2c958df9f8b78832fa1ecbecef6ea1d Author: Ben Greear Date: Mon Nov 8 10:50:03 2010 -0800 ath5k: Print stats as unsigned ints. The debugfs code for ath5k was printing some unsigned int stats with %d instead of %u. This meant that you could see negative numbers instead of a clean wrap. Signed-off-by: Ben Greear Signed-off-by: John W. Linville commit 8c5765fda4b382acce4ff386e18ec11790dff893 Author: Ivo van Doorn Date: Sat Nov 6 15:49:01 2010 +0100 rt2x00: Add watchdog functions for HW queue Add watchdog functions for managing the Queues inside the hardware. Normally the driver doesn't have much to do with these queues directly, but the Ralink drivers did implement watchdog functions for these. These watchdog functions are not triggered that often, compared to the other watchdog functions, but I have at least seen them trigger once or twice during a long stresstest run. v2: Add extra documentation for register fields Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit ea175ee26268370ca07aff91cf6ba1e0f1a3bd36 Author: Ivo van Doorn Date: Sat Nov 6 15:48:43 2010 +0100 rt2x00: Remove rt2x00lib_toggle_rx As part of the queue refactoring, the rt2x00lib_toggle_rx can be removed and replaced with the call directly to the set_device_state callback function. We can remove the STATE_RADIO_RX_ON_LINK and STATE_RADIO_RX_OFF_LINK, as it was only used for special behavior inside rt2x00lib rather then the drivers. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 8be4eed0ea7d8ef38692de878043a949e9db16e8 Author: Ivo van Doorn Date: Sat Nov 6 15:48:23 2010 +0100 rt2x00: Fix rt2x00queue_kick_tx_queue arguments The queue_entry argument to rt2x00queue_kick_tx_queue, doesn't make sense due to the function name (it is called kick QUEUE)... But neither do we need the queue_entry, since we need the data_queue. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 813f0339dd739c48607f12dac79ec26c61874226 Author: Ivo van Doorn Date: Sat Nov 6 15:48:05 2010 +0100 rt2x00: Rename queue->lock to queue->index_lock The queue->lock is only used to protect the index numbers. Rename the lock accordingly. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 821cde63b5bd04bc3ca0f95e2abf17b04e640488 Author: Mark Einon Date: Sat Nov 6 15:47:46 2010 +0100 rt2x00: checkpatch.pl error fixes for rt73usb.c rt73usb.c:43: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit f8bfbc31794635f6d0b7fd30950d49cecf54e1ce Author: Mark Einon Date: Sat Nov 6 15:47:25 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00queue.c rt2x00queue.c:804: ERROR: space prohibited after that open parenthesis '(' rt2x00queue.c:805: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 027e8fd105c82956de9dec232bad21b1628ee7c0 Author: Mark Einon Date: Sat Nov 6 15:47:09 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00link.c rt2x00link.c:70: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 5f181dc16bbd13b68b54ed5c43c4d2c5ad00297b Author: Mark Einon Date: Sat Nov 6 15:46:53 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00lib.h rt2x00lib.h:60: ERROR: space prohibited after that open parenthesis '(' rt2x00lib.h:60: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c2361baec100c6f373107346e3fd98e9b267ac6c Author: Mark Einon Date: Sat Nov 6 15:46:36 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00dev.c rt2x00dev.c:689: ERROR: spaces required around that '=' (ctx:WxV) Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 8a239033c355be998b8985f12f0cc3a9eaeb93e9 Author: Mark Einon Date: Sat Nov 6 15:46:17 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2x00config.c rt2x00config.c:136: ERROR: space required before the open parenthesis '(' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 87a46caf920515eb269df0109f0a61a958236568 Author: Mark Einon Date: Sat Nov 6 15:45:58 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800usb.h rt2800usb.h:43: ERROR: space prohibited after that open parenthesis '(' rt2800usb.h:43: ERROR: space prohibited before that close parenthesis ')' rt2800usb.h:44: ERROR: space prohibited after that open parenthesis '(' rt2800usb.h:44: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 144b80bc05e76df0acb8b5e86a6e6aaf0c53325e Author: Mark Einon Date: Sat Nov 6 15:45:41 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800usb.c rt2800usb.c:48: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit c6cbadeb3afd9471e539791842877d085f367746 Author: Mark Einon Date: Sat Nov 6 15:45:22 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800pci.h rt2800pci.h:41: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:42: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:43: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:44: ERROR: Macros with complex values should be enclosed in parenthesis rt2800pci.h:55: ERROR: space prohibited after that open parenthesis '(' rt2800pci.h:55: ERROR: space prohibited before that close parenthesis ')' rt2800pci.h:56: ERROR: space prohibited after that open parenthesis '(' rt2800pci.h:56: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit bf1b15125e2aa245ddd9348f80d041d4f1fd13a9 Author: Mark Einon Date: Sat Nov 6 15:45:06 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800lib.c rt2800lib.c:831: ERROR: inline keyword should sit between storage class and type Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fd8dab9a67b22c35f38f0f5bfff4b3f6ed02e43a Author: Mark Einon Date: Sat Nov 6 15:44:52 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2800.h rt2800.h:1511: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1511: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1513: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1513: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1515: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1515: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1517: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1517: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1519: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1519: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1521: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1521: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1661: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1661: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1662: ERROR: space prohibited after that open parenthesis '(' rt2800.h:1662: ERROR: space prohibited before that close parenthesis ')' rt2800.h:1663: ERROR: space prohibited before that close parenthesis ')' rt2800.h:2013: ERROR: space prohibited after that open parenthesis '(' rt2800.h:2013: ERROR: space prohibited before that close parenthesis ')' rt2800.h:2014: ERROR: space prohibited after that open parenthesis '(' rt2800.h:2014: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit cf553477a4dfb819c66ebfcad9f3b5cc3b93a9af Author: Mark Einon Date: Sat Nov 6 15:44:33 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2500usb.c rt2500usb.c:42: ERROR: do not initialise statics to 0 or NULL Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit cb771b1a5de81e3ee59bd8b7ed17da6d09ffcf68 Author: Mark Einon Date: Sat Nov 6 15:44:15 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2500pci.h rt2500pci.h:1091: ERROR: space prohibited after that open parenthesis '(' rt2500pci.h:1091: ERROR: space prohibited before that close parenthesis ')' rt2500pci.h:1092: ERROR: space prohibited after that open parenthesis '(' rt2500pci.h:1092: ERROR: space prohibited before that close parenthesis ')' Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 46b9786975a69a75f25b71796f7e36d203fbd4ee Author: Mark Einon Date: Sat Nov 6 15:44:00 2010 +0100 rt2x00: checkpatch.pl error fixes for rt2400pci.h rt2400pci.h:812: ERROR: space prohibited after that open parenthesis '(' rt2400pci.h:812: ERROR: space prohibited before that close parenthesis ')' rt2400pci.h:813: ERROR: space prohibited after that open parenthesis '(' rt2400pci.h:813: ERROR: space prohibited before that close parenthesis ')' rt2400pci.h:950: ERROR: Macros with complex values should be enclosed in parenthesis Signed-off-by: Mark Einon Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 041fb8f504fb0a6b61bc2131679da554b2fa8c9d Author: Christian Lamparter Date: Sat Nov 6 14:07:10 2010 +0100 carl9170: tx path review This patch fixes a few shortcomings in the tx path. * move temp. ampdu_[ack]_len out of txinfo->pad. * fix WARN_ON from tx.c:line 300 when tx_ampdu_queue fails to queue the frame. * In tx_prepare, we already have a local pointer to the station's ieee80211_sta struct. * remove a second !sta check, tx_prepare already takes care of that. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit ffa56e540c3949c4560dcce45eca247819e183c1 Author: Jesper Juhl Date: Thu Nov 4 22:59:56 2010 +0100 mac80211: Remove redundant checks for NULL before calls to crypto_free_cipher() crypto_free_cipher() is a wrapper around crypto_free_tfm() which is a wrapper around crypto_destroy_tfm() and the latter can handle being passed a NULL pointer, so checking for NULL in the ieee80211_aes_key_free()/ieee80211_aes_cmac_key_free() wrappers around crypto_free_cipher() is pointless and just increase object code size needlesly and makes us execute extra test/branch instructions that we don't need. Btw; don't we have to many wrappers around wrappers ad nauseam here? Anyway, this patch removes the redundant conditionals. Signed-off-by: Jesper Juhl Signed-off-by: John W. Linville commit 723fc7af5300dba9eac40cb23dbefa67589e5181 Author: Lalith Suresh Date: Thu Nov 4 20:43:16 2010 +0100 rt2x00: Fix comments in rt73usb.h and rt61pci.h This patch fixes a few comments in rt73usb.h and rt61pci.h. Signed-off-by: Lalith Suresh Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit fa8b4b22d543b4052602b0c86065150613ed19e8 Author: Helmut Schaa Date: Thu Nov 4 20:42:36 2010 +0100 rt2x00: Fix hw crypto in AP mode for some devices The BSSID register shouldn't be set in AP mode on some older devices (like rt73usb) as it breaks hw crypto on these. However, rt2800 devices explicitly need the BSSID register set to the same value as our own MAC address (only in AP mode). Hence, don't set the BSSID from rt2x00lib but move it down into rt2800 to avoid problems on older devices. This fixes a regression (at least for rt73usb) and avoids a new regression for rt2800 devices in 2.6.36. Reported-by: Johannes Stezenbach Reported-by: Lee Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 070192dd2975c0e97bbdeac7623b755235c6db7d Author: Ivo van Doorn Date: Thu Nov 4 20:41:05 2010 +0100 rt2x00: Fix crash on USB unplug By not scheduling the TX/RX completion worker threads when Radio is disabled, or hardware has been unplugged, the queues cannot be completely cleaned. This causes crashes when the hardware has been unplugged while the radio is still enabled. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 303c7d6abfd0430e39e84a43361492b4a8c890b6 Author: Ivo van Doorn Date: Thu Nov 4 20:40:46 2010 +0100 rt2x00: Fix MCU_SLEEP arguments Legacy driver uses 0xff as the second argument for the MCU_SLEEP command. It is still unknown what the values actually mean, but this will at least keep the command in-sync with the original driver. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit f44df18c58d4debe3ec0bb76a490aa2f3929fd8b Author: Ivo van Doorn Date: Thu Nov 4 20:40:11 2010 +0100 rt2x00: Implement flush callback Implement a basic flush callback function, which simply loops over all TX queues and waits until all frames have been transmitted and the status reports have been gathered. At this moment we don't support dropping any frames during the flush, but mac80211 will only send 'false' for this argument anyway, so this is not important at this time. Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit aaf886bd215396f295bc0489e8ae09d1c03d9aa0 Author: Ivo van Doorn Date: Thu Nov 4 20:39:48 2010 +0100 rt2x00: Remove failsave from rt2x00usb_watchdog_tx_dma When the TX status handler failed to clear the queue in rt2x00usb_watchdog_tx_dma() we shouldn't use a failsave to use the rt2x00usb txdone handler. If a driver has overriden the txdone handler it must make sure the txdone handler is capable of cleaning up the queue itself. Signed-off-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 7225ce1ea93d24c0914eea0410dcfc426281f996 Author: Ivo van Doorn Date: Thu Nov 4 20:39:23 2010 +0100 rt2x00: Rename rt2x00queue_timeout Rename rt2x00queue_timeout to rt2x00queue_status_timeout to better describe what is actually timing out (note that we already have a rt2x00queue_dma_timeout). Signed-off-by: Ivo van Doorn Acked-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit e2f8c8752b994026fc0ddb4bb29ca229b3e0c104 Author: Helmut Schaa Date: Thu Nov 4 20:38:56 2010 +0100 rt2x00: Optimize rt2x00debug_dump_frame when frame dumping is not active When rt2x00 is compiled with debugging but frame dumping is currently not active we can avoid the call to do_gettimeofday. Furthermore, frame dumping is not the default case, mark it as unlikely. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 2b23cdaa3b0e9567597563e5a7a5103ecda447f0 Author: Helmut Schaa Date: Thu Nov 4 20:38:15 2010 +0100 rt2x00: Reduce tx descriptor size The tx descriptor values qid, cw_min, cw_max and aifs are directly accessible through the tx entry struct. So there's no need to copy them into the tx descriptor and passing them to the indiviual drivers. Instead we can just get the correct value from the tx entry. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 08e5310028359de2daaa39cd10e9ca493c51792b Author: Helmut Schaa Date: Thu Nov 4 20:37:47 2010 +0100 rt2x00: Wait up to one second on rt2800 for WPDMA to be ready At least some devices need such a long time to inititalize WPDMA. This only increases the maximum wait time and shouldn't affect devices that have been working before. Reported-by: Joshua Smith Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit efd2f271e44c7ea011cdb0363d38f40338ab80d2 Author: Helmut Schaa Date: Thu Nov 4 20:37:22 2010 +0100 rt2x00: Sync Tx and RX ring sizes with legacy drivers All rt2x00 devices used the same Tx and Rx ring size (24 entries) till now. Newer devices (like rt2800) can however make use of a larger TX and RX ring due to 11n capabilities (AMPDUs of size 64 for example). Hence, bring rt2x00 in sync with the legacy drivers and use the same TX and RX ring sizes. Also remove the global defines RX_ENTRIES, TX_ENTRIES, BEACON_ENTRIES and ATIM_ENTRIES and use per driver values. That is 24 entries for rt2400pci, 32 entries for rt2500pci, rt2500usb, rt61pci and rt73usb and 128 (RX) and 64 (TX) for rt2800pci and rt2800usb. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 961621abee08fde2328daf6f8000e1059e5205e9 Author: Helmut Schaa Date: Thu Nov 4 20:36:59 2010 +0100 rt2x00: Add TXOP_CTRL_CFG register definition Remove the magic value initialisation of the TXOP_CTRL_CFG register by defining its fields and using them during intialisation. The field RESERVED_TRUN_EN is referred to as reserved, however it is set to 1 by the legacy drivers. Hence, do the same. Signed-off-by: Helmut Schaa Signed-off-by: Ivo van Doorn Signed-off-by: John W. Linville commit 066dae93bdfcc7af5e38a33617773fd5c6457607 Author: Felix Fietkau Date: Sun Nov 7 14:59:39 2010 +0100 ath9k: rework tx queue selection and fix queue stopping/waking The current ath9k tx queue handling code showed a few issues that could lead to locking issues, tx stalls due to stopped queues, and maybe even DMA issues. The main source of these issues is that in some places the queue is selected via skb queue mapping in places where this mapping may no longer be valid. One such place is when data frames are transmitted via the CAB queue (for powersave buffered frames). This is made even worse by a lookup WMM AC values from the assigned tx queue (which is undefined for the CAB queue). This messed up the pending frame counting, which in turn caused issues with queues getting stopped, but not woken again. To fix these issues, this patch removes an unnecessary abstraction separating a driver internal queue number from the skb queue number (not to be confused with the hardware queue number). It seems that this abstraction may have been necessary because of tx queue preinitialization from the initvals. This patch avoids breakage here by pushing the software <-> hardware queue mapping to the function that assigns the tx queues and redefining the WMM AC definitions to match the numbers used by mac80211 (also affects ath9k_htc). To ensure consistency wrt. pending frame count tracking, these counters are moved to the ath_txq struct, updated with the txq lock held, but only where the tx queue selected by the skb queue map actually matches the tx queue used by the driver for the frame. Signed-off-by: Felix Fietkau Reported-by: Björn Smedman Signed-off-by: John W. Linville commit 21e731a1b15bf03927e292af1b4a2c84fc8af817 Author: Rafał Miłecki Date: Wed Nov 3 21:36:12 2010 +0100 b43legacy: rfkill: use status register based on core revision (not PHY's) Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit d94519c1b0de827d5d142b9333b7f114c0b3a021 Author: maximilian attems Date: Tue Nov 2 23:39:12 2010 +0100 zd1201: Add missing id The Mandriva patch seems to stem from 2.6.14, so much for their upstreaming effort. Didn't find another Linux reference of it, just an omnious "USB\VID_1044&PID_8004" from GigabyteZD1201U.INF for Gigabyte GN-WLBZ101 802.11b USB Adapter, which matches the Mandriva patch comment. Aboves file also lists an "USB\VID_1044&PID_8006", which I have kept appart as this "Gigabyte GN-WBZB-M 802.11b USB Adapter" didn't show up in googling. Signed-off-by: maximilian attems Signed-off-by: John W. Linville commit 8cecc90e4a302ac214c48e362709ce906a96a295 Author: maximilian attems Date: Tue Nov 2 23:10:12 2010 +0100 zd1211rw: add 2 missing usb id's "These USB ID came from Palnex Worked fine." says Mandriva patch for their 2.6.32 and earlier. Web has evidence for both id's to work, so just add them upstream: http://www.mail-archive.com/zd1211-devs@lists.sourceforge.net/msg00507.html http://ubuntuforums.org/showthread.php?t=473046 Signed-off-by: Go Taniguchi Signed-off-by: maximilian attems Signed-off-by: John W. Linville commit daeeb074105a80a34f90a454c24efc14e9a8d3c3 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:39 2010 -0200 rtl8187: restore anaparam registers after reset with 8187B Current 8187B initialization misses anaparam registers restore after 8187 reset. This causes ANAPARAM register to stay zeroed out (ANAPARAM2 kept its value on my tests). To avoid this, call rtl8187_set_anaparam right after chip reset (to be on the safe side, as it makes sure we restore all ANAPARAM registers). Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Cc: seno Signed-off-by: John W. Linville commit 998606cfd75e7a8169ed0d324061a8d6bc60716a Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:38 2010 -0200 rtl8187: remove uneeded setting of anaparam write Usually you set RTL818X_CONFIG3_ANAPARAM_WRITE when you are going to change/write ANAPARAM registers. But in current initialization of RTL8187B there is a place where ANAPARAM_WRITE bit is set without any ANAPARAM register being written, without reason, so remove it. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Cc: seno Signed-off-by: John W. Linville commit 0bf198eb4d05a4662143e4a2e2a44fb592e2b177 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:37 2010 -0200 rtl8187: consolidate anaparam on/off write sequences There are repeated calls for anaparam on/off sequence in the code. Consolidate the common code in rtl8187_set_anaparam and use it where needed. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit fe3326903d7aafd7b5602d8e178537c8b0465f6c Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:36 2010 -0200 rtl8187: don't set RTL818X_CONFIG3_GNT_SELECT flag on 8187B The GNTSel bit should only concern pci devices by looking at RTL8180 spec, which is not the case of 8187B. Also testing shows that trying to set this bit fails, a subsequent read from the register after trying to set it shows that the bit isn't set, seems the hardware ignores it, which makes sense. This setting was a left over from Realtek sources. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 896cae65fc0489b8e42bb7790f64731d53a2cecf Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:35 2010 -0200 rtl8187: move pll reset at start out of ANAPARAM write On 8187B start, comment about pll reset, and move it out of ANAPARAM write sequence, so that code is more readable. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit a8ff34e37a186ebb7d2d90ee40ef88a3ef95ad47 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:34 2010 -0200 rtl8187: avoid redundant write to register FF72 (RFSW_CTRL) The table with misc register initialization was setting it, and later on we would set it again with a explicity call to rtl818x_iowrite16_idx. Remove duplicate initialization from the register table. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 60f589145d76cf834ec5e485c5412ec0994e52d1 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:33 2010 -0200 rtl8187: fix wrong register initialization in 8187B We were using wrong address for BRSR (Basic Rate Set Register) while initializing its value, comparing with Realtek sources, for 8187B case. Also, the same register is initialized in rtl8187b_reg_table, so remove the duplicate initialization from the table. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit f002c25cc13e86762551c0eda29a40c60d6dbf1b Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:32 2010 -0200 rtl8187: remove setting of beacon/atim registers from initialization On 8187B path, we set a initial value for beacon interval and atim window on initialization. But this isn't needed, since same setup is done on rtl8187_config. Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit 327571ea9927beec2ee2ed9a266c57c1515393b4 Author: Herton Ronaldo Krzesinski Date: Mon Nov 1 22:59:31 2010 -0200 rtl8187: remove redundant initialization of ARFR This removes redundant write to Auto Rate Fallback Register on RTL8187B. The same value was being written twice in the same function. Avoid this removing the duplicate initialization on rtl8187b_reg_table, and also add comment for this write (information from Realtek source). Signed-off-by: Herton Ronaldo Krzesinski Acked-by: Larry Finger Signed-off-by: John W. Linville commit c0bf9ca98e07ca72c444a6cfb272aafa9890b9b6 Author: Nishant Sarmukadam Date: Mon Nov 1 17:55:48 2010 -0700 mwl8k: force AP mode to use non-AMPDU frames AP firmware uses xmitcontrol to differentiate between AMPDU and non-AMPDU frames. As the support for AMPDU is not yet added, set xmitcontrol to non-AMPDU for all tx frames for AP firmware. This field will be set to indicate ampdu/non-ampdu frames when tx AMPDU support is added. Signed-off-by: Pradeep Nemavat Signed-off-by: Brian Cavagnolo Acked-by: Lennert Buytenhek Signed-off-by: John W. Linville commit 3eedb6f436858f3e864139dc184adc9a51440c92 Author: Christian Lamparter Date: Sat Oct 30 00:36:53 2010 +0200 carl9170: configurable beacon rates Previously, the beacon rate was fixed to either: * 1Mb/s [2.4GHz band] * 6Mb/s [5GHz band] This limitation has been addressed and now the beacon rate is selected by ieee80211_tx_info's rate control info, almost like any ordinary data frame. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 2a6cef513fab525399e484edc9bfb39b6d462f76 Author: Christian Lamparter Date: Fri Oct 29 23:41:16 2010 +0200 carl9170: stop stale uplink BA sessions This patch fixes a possible lengthy stall if the device is operating as an experimental 11n AP and an STA [during heavy txrx action] suddenly signalized to go off-channel (old NetworkManager), or (sleep - which is unlikely, because then it wouldn't be *active* at all!?). Because the driver has to manage the BA Window, the sudden PSM transition can leave active uplink BA sessions to the STA in a bad state and a proper cleanup is needed. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit e4a668c59080f862af3ecc28b359533027cbe434 Author: Christian Lamparter Date: Fri Oct 29 23:26:13 2010 +0200 carl9170: fix spurious restart due to high latency RX Stress tests of unidirectional bulk traffic with bitrates of up to 220Mbit/s have revealed that the fatal-event recovery logic [which was solely triggered by an out-of-rx-buffer situation] is too aggressive. The new method now "pings" the device and then decides - based on the response - whenever a restart is needed or not. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit e27769059ccb15273a7eb69ed31b8e08f9b0eda8 Author: Christian Lamparter Date: Fri Oct 29 23:17:38 2010 +0200 carl9170: initialize HW aMPDU parameters properly This patch changes the initial aMPDU density and factor settings to match those of Otus. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 3f1240e4f4b249f2388903864bdc766973f76687 Author: Christian Lamparter Date: Fri Oct 29 22:44:59 2010 +0200 carl9170: import hw/fw header updates This patch imports all shared header changes from carl9170fw.git. * add some strategic __aligned(4). This allows the compiler generate optimized code for architectures which can't access (unaligned/packed) data efficiently. ("ath9k_hw: optimize all descriptor access functions") * add a forgotten __CARL9170FW__ ifdef around a private firmware-internal struct. * GET_VAL macro helper Very useful for extracting data out of the bit-packed PHY registers. * cosmetic changes e.g.: _CCA_MINCCA_ to just _CCA_MIN_. * version bump 1.8.8.3 -> 1.9.0. Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit bdd7bd16439975133d36bcd7c9c489302a114525 Author: Blaise Gassend Date: Thu Oct 28 02:01:24 2010 -0700 mac80211_hwsim: Incorporate txpower into rssi Up to now mac80211_hwsim has been reporting an rssi of -50. This patch improves the model slightly by returning txpower-50. This makes it easy to stimulate tests that need to see a varying rssi. Signed-off-by: Blaise Gassend Signed-off-by: John W. Linville commit 19999792d2889350611ba9e346d6a2924959dc2d Author: Thadeu Lima de Souza Cascardo Date: Thu Oct 28 20:01:00 2010 -0200 rtl8187b: do not do per packet TX AGC Clearing the per packet TX AGC for the RTL8187B device appears to increase its overall TX power. This allows the device to associate and a connection to be established using APs a little further away. This is in accordance to what is done for RTL8187L devices and also what Realtek drivers do. Tested-by: Thadeu Lima de Souza Cascardo Signed-off-by: Thadeu Lima de Souza Cascardo Cc: linux-wireless@vger.kernel.org Cc: Larry Finger Cc: Rogerio Luz Coelho Cc: Herton Ronaldo Krzesinski Cc: Hin-Tak Leung Cc: seno Tested-by: Herton Ronaldo Krzesinski Signed-off-by: John W. Linville commit e285a5250c0772c5596a9137041a96b2c1f744d6 Author: Eliad Peller Date: Wed Oct 27 14:09:58 2010 +0200 wl1271: add recover testmode command add RECOVER testmode command. this command triggers a recovery sequence (by enqueueing a recovery_work). Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ccc83b046c03378bbaf7cf095d8d7e9b9abb24c5 Author: Eliad Peller Date: Wed Oct 27 14:09:57 2010 +0200 wl1271: handle HW watchdog interrupt unmask the WL1271_ACX_INTR_WATCHDOG interrupt. when getting it - enqueue a recovery work and bail out. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 03107a4b5923aa7767329e857caf227749087e47 Author: Eliad Peller Date: Wed Oct 27 14:58:30 2010 +0200 wl1271: refactor debugfs function generation code refactor wl1271_debugfs by using a format© function, instead of duplicating the code for each generated function. this change reduces about 3Kb from wl1271.ko Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 71125abdf0c297adc00dc5632f0318b2397286f5 Author: Eliad Peller Date: Thu Oct 28 21:46:43 2010 +0200 wl1271: set wl->vif only if add_interface succeeded. set wl->vif to the newly created interface only after the firmware booted successfully. on the way - make the function flow more clear. Signed-off-by: Eliad Peller Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit f8d9802f66eda9ff14f7667f99a46b31e9a9e273 Author: Juuso Oikarinen Date: Tue Oct 26 13:24:39 2010 +0200 wl1271: Check interface state in op_* functions Check the state of the interface on op_* function so we don't try to access the hardware in when its off. The mac80211 may call these in some corner cases related, for instance, to the hardware recovery procedure. These accesses cause a kernel crash on at least some SDIO devices, because the bus is not properly claimed in that scenario. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit b739a42c921dcb0ae92cc14032b7f75dcba88e3b Author: Juuso Oikarinen Date: Tue Oct 26 13:24:38 2010 +0200 wl1271: Fix scan failure detection In scan_complete_work, because the mutex is released before accessing the scan->failed flag, it is possible for unfounded hardware recovery rounds to be executed. Fix this. Signed-off-by: Juuso Oikarinen Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit fb2382c75b1292aff0ebc8e209b0cb9ba70bb2cf Author: Juuso Oikarinen Date: Mon Oct 25 11:24:29 2010 +0200 wl1271: Fix RX path stall The wl1271_rx function loops through packets in an aggregated buffer. Each packet in the buffer is handled by a call to wl1271_rx_handle_data, which will fail if skb memory allocation fails or production mode is enabled. These failures currently prevent the rx counters to be incremented, thus causing the rx loop to run forever. Fix this by ignoring error codes reported wl1271_rx_handle_data function. This essentially means that frames will be dropped in production mode, which is the intetion, and frames will be dropped if memory allocation fails, which is a decent way to recover from that situation. Signed-off-by: Juuso Oikarinen Tested-by: Tuomas Katila Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit ff6d76fd3d45ed5494287e57d76073739721214b Author: Nicolas Kaiser Date: Mon Oct 25 15:30:03 2010 +0200 wireless/wl1271: remove redundant if-statement v2 wl1271_ps_elp_sleep() is void and cannot return a value. Signed-off-by: Nicolas Kaiser Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 5404643139c16e56d31a6ebd09cfa6db1eb03a36 Author: Luciano Coelho Date: Wed Oct 20 15:15:52 2010 +0300 wl1271: exit ELP mode when setting enabled rates in tx This bug was being triggered by a call to acx_rate_policies in tx_work without calling ps_elp_wakeup first. If we have full PSM enabled, this happens rather often, immediately after association. Reported-by: Tuomas Katila Signed-off-by: Luciano Coelho Tested-by: Tuomas Katila commit 6a2de93b2553c2e9a72997370534993c85c1eee6 Author: Teemu Paasikivi Date: Thu Oct 14 11:00:04 2010 +0200 wl1271: Fix warning about unsupported RX rate While scanning, it is possible that beacon and probe response frames are received on other band than configured to the driver. In rx status handling this has caused "Unsupported RX rate from HW" warnings. This patch changes the wl1271_rate_to_index function to take the band of the received frame as a parameter instead of using value configuret to wl->band. Signed-off-by: Teemu Paasikivi Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 18357850b694ba3fa29363c7d86ccd8783f4a065 Author: Shahar Levi Date: Wed Oct 13 16:09:41 2010 +0200 wl1271: 11n Support, functionality and configuration ability Add 11n ability in scan, connection and using MCS rates. The configuration is temporary due to the code incomplete and still in testing process. That plans to be remove in the future. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit c4db1c879679e795689ef3c9dd7d3f6568ea14c5 Author: Shahar Levi Date: Wed Oct 13 16:09:40 2010 +0200 wl1271: 11n Support, ACX Commands Added ACX command to the FW for 11n support. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit e8b03a2b8debc6056f6f43d24f98f601097301a1 Author: Shahar Levi Date: Wed Oct 13 16:09:39 2010 +0200 wl1271: 11n Support, Add Definitions Two acx commands: ht_capabilities & ht_information, 11n sta capabilities macro. Signed-off-by: Shahar Levi Reviewed-by: Luciano Coelho Signed-off-by: Luciano Coelho commit 2fe33e8cff354a3f320549544bffebbbab680145 Author: Ido Yariv Date: Tue Oct 12 14:49:12 2010 +0200 wl1271: Fix TX queue low watermark handling The number of entries in the TX queue is compared to the low watermark value each time TX completion interrupts are handled. However, the fact that a TX completion arrived does not necessarily mean there are any less skbs in the TX queue. In addition, a TX completion interrupt does not necessarily mean that there are any new available TX blocks. Thus, queuing TX work when the low watermark is reached might not be needed. Fix this by moving the low watermark handling to the TX work function, and avoid queuing TX work in this case. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 25eeb9e3876a161e3afcc820c6cb72e13f9b7c7e Author: Ido Yariv Date: Tue Oct 12 16:20:06 2010 +0200 wl1271: Allocate TX descriptors more efficiently On each TX descriptor allocation, a free entry is found by traversing the TX descriptors array. Improve this by holding a bitmap of all TX descriptors, and using efficient bit operations to search for free entries. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit a522550a283de31c7cfc30c7a129ce584e38c582 Author: Ido Yariv Date: Tue Oct 12 14:49:10 2010 +0200 wl1271: Fix TX starvation While wl1271_irq_work handles RX directly (by calling wl1271_rx), a different work is scheduled for transmitting packets. The IRQ work might handle more than one interrupt during a single call, including multiple TX completion interrupts. This might starve TX, since no packets are transmitted until all interrupts are handled. Fix this by calling the TX work function directly, instead of deferring it. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit 6c6e669ed6282788d6045397ce0f201edc400d9d Author: Ido Yariv Date: Tue Oct 12 14:49:09 2010 +0200 wl1271: TX aggregation optimization In case the aggregation buffer is too small to hold all available packets, the buffer is transferred to the FW and no more packets are aggregated. Although there may be enough available TX blocks, no additional packets will be handled by the current TX work. Fix this by flushing the aggregation buffer when it's full, and continue transferring packets as long as there are enough available TX blocks. Signed-off-by: Ido Yariv Reviewed-by: Juuso Oikarinen Signed-off-by: Luciano Coelho commit c8aea565e8f715d9f10064b1cbfbc15bf75df501 Author: Gery Kahn Date: Tue Oct 5 16:09:05 2010 +0200 wl1271: ref_clock cosmetic changes Cosmetic cleanup for ref_clock code while configured by board. Signed-off-by: Gery Kahn Signed-off-by: Luciano Coelho commit 34d59c07e9ad7130813c28f8554ef1298af923b7 Author: Wey-Yi Guy Date: Sat Oct 23 09:15:46 2010 -0700 iwlagn: use 6000g2b uCode for 130 series devices For 130 series device, 6000g2b uCode will be used, no need to have additional defines for 130 devices, so remove those. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 69d826b6c54de113f02a73990b6f6809289b48cc Author: Wey-Yi Guy Date: Sat Oct 23 09:15:45 2010 -0700 iwlwifi: add new devices to Kconfig Adding description to Kconfig to indicate more devices are being supported by iwlagn Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit f5682c01eb85fce13d064d232c947322bd7e2631 Author: Wey-Yi Guy Date: Sat Oct 23 09:15:44 2010 -0700 iwlagn: turn dynamic smps on while BT is on While BT is on and doing iscan and/or pscan, BT is in listen mode which will impact WiFi throughput, we need to enable dynamic smps in order to improve the rx throughput. Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit d4daaea656e0b5543c2e37c31934cea8f044b31e Author: Johannes Berg Date: Sat Oct 23 09:15:43 2010 -0700 iwlwifi: implement switching iftype while up Implement switching the interface while an interface is up in iwlwifi. Interfaces have to stay on the context they were created on. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit bd50a8ab9f48787109f6ff761c8f0e185e3d0690 Author: Johannes Berg Date: Sat Oct 23 09:15:42 2010 -0700 iwlwifi: fix IBSS beaconing My previous patch to clean up all RXON handling inadvertently broke IBSS because it failed to take into account that unlike in AP mode, IBSS requires beacons to be sent only after setting the RXON assoc. Fix this, clean up the code a bit, improve the error checking around this, and also react to beacon changes in IBSS mode from mac80211. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2295c66b68ae160dde2e6e2dc4f3061105153bfc Author: Johannes Berg Date: Sat Oct 23 09:15:41 2010 -0700 iwlagn: new RXON processing for modern devices In order to simplify the flow, and make new enhancements easier, separate out the RXON processing for modern AGN (5000 and newer) from RXON processing for the older 3945 and 4965 devices. Avoid changing these old ones to avoid regressions and move their code to a new file (iwl-legacy.c). 4965 gets the commit_rxon that used to be common for all AGN devices, but with removed PAN support. The new RXON processing is more central and does more work in committing, so that it is easier to follow. To make it more evident what is split out for legacy, split the necessary operations for that into a new struct iwl_legacy_ops. Those parts that still exist in the new AGN code don't need to be parametrized. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 2d4e43c3c6783f956163c11568303b0390725e28 Author: Johannes Berg Date: Sat Oct 23 09:15:40 2010 -0700 iwlagn: don't resend RXON timing Resending RXON timing here caused issues with dual-mode under certain circumstances, so avoid doing it here right now. This effectively reverts b01efe434bd6ea807eb72b and partially 2491fa42d9bdf26075765. The next patch will make all this cleaner for just the devices that need it. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit dc21b5453249e7e9b8878fab356fd60b731cf04d Author: Johannes Berg Date: Sat Oct 23 09:15:39 2010 -0700 iwlwifi: make mac80211 ops a device config In the future, 4965 and modern AGN devices will need to have different mac80211 callbacks since they have different capabilities. Prepare for that by making the mac80211 operations a device config. Signed-off-by: Johannes Berg Signed-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 07caf9d6c9135ae25a760867f37aab90c1008380 Author: Eliad Peller Date: Wed Oct 27 14:58:29 2010 +0200 mac80211: refactor debugfs function generation code refactor mac80211 debugfs code by using a format© function, instead of duplicating the code for each generated function. this change reduces about 600B from mac80211.ko Signed-off-by: Eliad Peller Signed-off-by: John W. Linville commit 6a6733f256f18cbcf4875e13f59eedb593b755a8 Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:25 2010 -0700 ath9k: content DMA start / stop through the PCU lock This helps align resets / RX enable & disable / TX stop / start. Locking around the PCU is important to ensure the hardware doesn't get stale data when working with DMA'able data. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 4bdd1e978ede034c1211957eb17eaf50de00d234 Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:24 2010 -0700 ath9k: move the PCU lock to the sc structure The PCU lock should be used to contend TX DMA as well, this will be done next. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 9d94674ab754be0e275120a183670ead435f9c0d Author: Luis R. Rodriguez Date: Tue Oct 26 15:27:23 2010 -0700 ath9k: simplify hw reset locking The new PCU lock is better placed so we can just contend against that when trying to reset hardware. This is part of a series of patches which fix stopping TX DMA completley when requested on the driver. For more details about this issue refer to this thread: http://marc.info/?l=linux-wireless&m=128629803703756&w=2 Tested-by: Ben Greear Cc: Kyungwan Nam Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 5d4c428254f73bae272be9d296724b1ee09d76ec Author: Mohammed Shafi Shajakhan Date: Tue Oct 26 21:28:57 2010 +0530 ath9k: Properly assign boolean types This takes care that boolean types are properly assigned Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit 446fad5a5b6be765c8ec39bfdbbc6c7aa63fbcbb Author: Rajkumar Manoharan Date: Tue Oct 26 20:11:29 2010 +0530 ath9k_htc: Handle monitor mode properly for HTC devices No need to inform about monitor interface changes to firmware. Set the HW mode to monitor type based on mac80211 indication flag is sufficient. Signed-off-by: Rajkumar Manoharan Signed-off-by: John W. Linville commit f60dc0138aa19769bf8bab9f93b043235428b66f Author: John W. Linville Date: Mon Oct 25 16:12:37 2010 -0400 iwlwifi: Convert to new PCI PM framework Use the new PCI PM and let the PCI core code handle the PCI-specific details of power transitions. Based on similarly titled ath9k patch posted by Rafael J. Wysocki. Signed-off-by: John W. Linville Acked-by: Rafael J. Wysocki Acked-by: Wey-Yi Guy commit b9237578f8d685bb86901ba9ff0d379218e5a3c5 Author: John W. Linville Date: Mon Oct 25 10:33:07 2010 -0400 rt2x00pci: do not use GFP_DMA Signed-off-by: John W. Linville Acked-by: Ivo van Doorn commit 26f94dc264a7ebddcc08d3908e99880703d871e5 Author: John W. Linville Date: Mon Oct 25 10:24:09 2010 -0400 b43: remove extraneous code in free_ringmemory This code seems to have been cut-n-pasted from alloc_ringmemory? Anyway, it is useless. Signed-off-by: John W. Linville commit 8e7ce8930165c785ec1c754ef3e3092a3bdffe02 Author: Hauke Mehrtens Date: Sat Oct 23 19:51:32 2010 +0200 carl9170: fix typos Signed-off-by: Hauke Mehrtens Acked-by: Christian Lamparter Signed-off-by: John W. Linville commit a2d9bc6fdc0c8693b5641c69bce7eaf5b47f0593 Author: Rafał Miłecki Date: Fri Oct 22 17:43:49 2010 +0200 b43: N-PHY: improve 2055 radio initialization 1) Upload 5 GHz values when needed. 2) Do not upload all values on first init. Follow wl. Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 7a4db8f5c37d1acf1213b835b3cdd8f7c051eb9b Author: Rafał Miłecki Date: Fri Oct 22 17:43:48 2010 +0200 b43: N-PHY: determine usage of radio regulatory workaround correctly Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 7e6da2bfc05c2b96197c12484f3d071fe0c6d0fb Author: Rafał Miłecki Date: Fri Oct 22 17:43:47 2010 +0200 b43: define known SPROM boardflags2 bits Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit c0b102c20972cfa3e10a0cf4a2a563edb70961b1 Author: Rafał Miłecki Date: Fri Oct 22 17:43:46 2010 +0200 b43: N-PHY: fix 2055 radio init Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit 3eb9616af24d6a1910ae6ae5c2d51719eba960cf Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:30 2010 +0200 iwlwifi: avoid commit rxon during scan in iwl_set_no_assoc Currently we are canceling scan when changing BSSID. Behave the same when changing association and beacon enablement, to avoid committing rxon during scan in iwl_set_no_assoc(). Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit ac4f5457c7617999967e9740f8903b922714bab4 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:29 2010 +0200 iwlwifi: defer update power mode while scan Do not set power mode when scanning, and defer that when scan finish. We still set power mode in force case i.e. when device is overheated. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 5eda74a40587139b1d66cd8197cac92ba36e79f4 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:28 2010 +0200 iwlwifi: avoid commit rxon during scan in iwlagn_bt_traffic_change_work Avoid sending commands to firmware (including commit_rxon) when scan is pending and we are calling iwlagn_bt_traffic_change_work simultaneously. Also comment some innocent race conditions. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 749ff4efa14df904c22b28e2f7b10a02119a4d5e Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:27 2010 +0200 iwlwifi: avoid commit rxon during scan in iwlagn_configure_filter Almost anywhere in the code we avoid committing rxon while performing scan, and make rxon commit when scan complete. However in some places in the code we do not follow that rule. This patch fix that problem in iwlagn_configure_filter(). Since we do not commit directly in iwl3945_configure_filter, we can also do the same for agn, so I just remove iwlcore_commit_rxon() function and add a comment. Also change comment for iwl3945. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit a25a66ac94db88190653d5725c563e3f8faeee61 Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:26 2010 +0200 iwlwifi: fix set_tx_power vs scan According to comment in iwl_bg_scan_completed, setting tx power should be deferred during pending scan, but we are not doing this. This patch change code to really defer setting tx power after scan complete. Additionally refactor iwl_set_tx_power code and call lib->send_tx_power() directly from iwlagn_commit_rxon. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4cbf1b12491cd43032846acc6c6924d9090fa19f Author: Stanislaw Gruszka Date: Fri Oct 22 17:04:25 2010 +0200 iwlwifi: send tx_power_cmd synchronously On 5xxx and 6xxx change to send tx_power_cmd command synchronously, to do not start other commands when setting tx power is pending. We currently do the same for 4956 and 3945. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4beeba7dc59cc10d6a47346c857d1a64a9ec9642 Author: Stanislaw Gruszka Date: Mon Oct 25 10:34:50 2010 +0200 iwlwifi: warn when send tx power settings during scan Add WARN_ONCE when scanning is pending. Use STATUS_SCAN_HW bit since we can have scan canceled or completed but STATUS_SCANNING bit still set. v1 -> v2: replace EIO to EAGAIN Signed-off-by: Stanislaw Gruszka Acked-off-by: Wey-Yi Guy Signed-off-by: John W. Linville commit c7317e41df30c7e04dca46360e5ebb0cb36dda45 Author: Felix Fietkau Date: Thu Oct 21 02:47:25 2010 +0200 mac80211: minstrel_ht - reduce the overhead of rate sampling - reduce the number of retransmission attempts for sample rates - sample lower rates less often - do not use RTS/CTS for sampling frames - increase the time between sampling attempts Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit ff32d9cd2c4107224a28f39d3c72eec66d566e09 Author: Felix Fietkau Date: Thu Oct 21 02:47:23 2010 +0200 ath9k_hw: fix potential spurious tx error bit interpretation According to documentation, AR_ExcessiveRetries, AR_Filtered and AR_FIFOUnderrun are only valid if AR_FrmXmitOK is clear. Not checking this might result in suboptimal FIFO settings, unnecessary retransmissions, or other connectivity issues. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 78a7685e1e44c6d4b6f79c73687b9322e40b040e Author: Luis R. Rodriguez Date: Wed Oct 20 16:07:08 2010 -0700 ath9k: add a debug warning when we cannot stop RX We have seen several DMA races when we race against stopping and starting the PCU. I suspect that when we cannot stop the PCU we may hit some of these same races so warn against them for now but only when debugging (CONFIG_ATH_DEBUG) is enabled. If you run into this warning and are a developer, please fix the cause of the warning. The potential here, although I cannot prove yet, is that the DMA engine can be confused and start writing to a buffer that was already DMA'd before and at least the kernel assumes is not being accessed by hardware anymore. Cc: Ben Greear Cc: Kyungwan Nam Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit b87b0128894efd3bbf7272a579f71b3a2bc500d1 Author: Luis R. Rodriguez Date: Thu Oct 21 12:10:11 2010 -0700 ath: add a ATH_DBG_WARN() To be used to throw out warnings only for developers. This can be used by some corner cases that developers already know can be hit but developers want to address so to avoid spewing out a warning this can only be enabled with CONFIG_ATH_DEBUG enabled. Cc: Ben Greear Cc: Kyungwan Nam Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit d91e41b690f795c04af4eb6fe28d2cafd3291051 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:59 2010 -0700 cfg80211: prefix REG_DBG_PRINT() with cfg80211 Everyone's doing it, its the cool thing. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit e702d3cf29143327679ce2e2a60775eaf829f377 Author: Luis R. Rodriguez Date: Thu Oct 21 19:17:04 2010 +0530 cfg80211: add debug print when processing a channel In the worst case you are seeing really odd things you want more information than what is provided right now, for those that insist and want debug info through CONFIG_CFG80211_REG_DEBUG provide a print of when we are processing a channel and with what regulatory rule. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit a65185367f9f876448f0f12ac09a673d20371efc Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:57 2010 -0700 cfg80211: add debug print when disabling a channel on a custom regd Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 926a0a094d2b9052db3f7f37438c3d305cea4be7 Author: Luis R. Rodriguez Date: Thu Oct 21 19:17:03 2010 +0530 cfg80211: add debug prints for when we ignore regulatory hints This can help with debugging issues. You will only see these with CONFIG_CFG80211_REG_DEBUG enabled. Cc: Easwar Krishnan Signed-off-by: Luis R. Rodriguez Signed-off-by: Senthil Balasubramanian Signed-off-by: John W. Linville commit ca4ffe8f2848169a8ded0ea8a60b2d81925564c9 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:55 2010 -0700 cfg80211: fix disabling channels based on hints After a module loads you will have loaded the world roaming regulatory domain or a custom regulatory domain. Further regulatory hints are welcomed and should be respected unless the regulatory hint is coming from a country IE as the IEEE spec allows for a country IE to be a subset of what is allowed by the local regulatory agencies. So disable all channels that do not fit a regulatory domain sent from a unless the hint is from a country IE and the country IE had no information about the band we are currently processing. This fixes a few regulatory issues, for example for drivers that depend on CRDA and had no 5 GHz freqencies allowed were not properly disabling 5 GHz at all, furthermore it also allows users to restrict devices further as was intended. If you recieve a country IE upon association we will also disable the channels that are not allowed if the country IE had at least one channel on the respective band we are procesing. This was the original intention behind this design but it was completely overlooked... Cc: David Quan Cc: Jouni Malinen cc: Easwar Krishnan Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 749b527b21465fb079796c03ffb4302584dc31c1 Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:54 2010 -0700 cfg80211: fix allowing country IEs for WIPHY_FLAG_STRICT_REGULATORY We should be enabling country IE hints for WIPHY_FLAG_STRICT_REGULATORY even if we haven't yet recieved regulatory domain hint for the driver if it needed one. Without this Country IEs are not passed on to drivers that have set WIPHY_FLAG_STRICT_REGULATORY, today this is just all Atheros chipset drivers: ath5k, ath9k, ar9170, carl9170. This was part of the original design, however it was completely overlooked... Cc: Easwar Krishnan Cc: stable@kernel.org Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 7ca43d03b1291481bdf894bbaec5d580e7684e7d Author: Luis R. Rodriguez Date: Wed Oct 20 10:18:53 2010 -0700 cfg80211: pass the reg hint initiator to helpers This is required later. Cc: Easwar Krishnan Cc: stable@kernel.org signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 2e48928d8a0f38c1b5c81eb3f1294de8a6382c68 Author: Stephen Hemminger Date: Wed Oct 20 10:16:58 2010 -0700 rfkill: remove dead code The following code is defined but never used. Signed-off-by: Stephen Hemminger Signed-off-by: John W. Linville commit e081685c1bbe8da37c7f61726fdb783ff277f14f Author: Larry Finger Date: Wed Oct 20 09:59:33 2010 -0500 ssb: Clear RETRY_TIMEOUT in PCI Configuration for normal devices MMIO log traces obtained using the Broadcom wl hybrid driver show that the RETRY_TIMEOUT register (0x41) in PCI configuration space is cleared if non-zero. Similar code found in other drivers such as ipw2100 show this operation is needed to keep PCI Tx retries from interfering with C3 CPU state. There are no known cases where omission of this code has caused a problem, but this patch is offered just in case such a situation occurs. Signed-off-by: Larry Finger Signed-off-by: John W. Linville commit 14fb7c17e97ea0fcc545393fb1f34e6541647b5b Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:38 2010 -0700 ath5k: make ath5k_update_bssid_mask_and_opmode() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/ath5k/base.c drivers/net/wireless/ath/ath5k/base.c:569:6: warning: symbol 'ath5k_update_bssid_mask_and_opmode' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit f8c2a0871b8462481a02445b38a7321ad63bfc88 Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:37 2010 -0700 ath: make ath_hw_set_keycache_entry() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/key.c drivers/net/wireless/ath/key.c:110:6: warning: symbol 'ath_hw_set_keycache_entry' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit a3685d119dacb07a7080169fea2847ef385b209f Author: Luis R. Rodriguez Date: Wed Oct 20 06:59:36 2010 -0700 ath: make ath_hw_keysetmac() static This fixes this sparse warning: CHECK drivers/net/wireless/ath/key.c drivers/net/wireless/ath/key.c:70:6: warning: symbol 'ath_hw_keysetmac' was not declared. Should it be static? Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit babcbc295fee766ca710235e431686fef744d9a6 Author: Felix Fietkau Date: Wed Oct 20 02:09:46 2010 +0200 ath9k: initialize per-channel tx power limits instead of hardcoding them Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit de40f316c01b1ba9535e6dc99f6a67e7655b07da Author: Felix Fietkau Date: Wed Oct 20 03:08:53 2010 +0200 ath9k_hw: extend ath9k_hw_set_txpowerlimit to test channel txpower ath9k_hw_set_txpowerlimit gets an extra boolean parameter that - if set - causes the rate txpower table and the regulatory limit to be calculated and stored, without changing hardware registers. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 6b7b6cf553f881d45bb37a73f5db956afb290a08 Author: Felix Fietkau Date: Wed Oct 20 02:09:44 2010 +0200 ath9k_hw: initialize regulatory->max_power_level in set_txpower for AR9003 The same is done for the older chip families as well. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 900fcf091e95fbcc773b72c770afcd2e8eda4da2 Author: Paul Mundt Date: Mon Nov 1 09:29:24 2010 +0000 net: sh_eth: Move off of deprecated I/O routines. sh_eth is the last in-tree user of the ctrl_xxx I/O routines. This simply converts them over to regular MMIO accesors. Signed-off-by: Paul Mundt Signed-off-by: David S. Miller commit 636e19a34275d7d6fda0fefa965b1e2a715e2b02 Author: John Fastabend Date: Sat Oct 30 14:22:42 2010 +0000 net: consolidate 8021q tagging Now that VLAN packets are tagged in dev_hard_start_xmit() at the bottom of the stack we no longer need to tag them in the 8021Q module (Except in the !VLAN_FLAG_REORDER_HDR case). This allows the accel path and non accel paths to be consolidated. Here the vlan_tci in the skb is always set and we allow the stack to add the actual tag in dev_hard_start_xmit(). Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 8f5549f381ced6a255f2c7127b2b3b3b05fdfd6e Author: John Fastabend Date: Sat Oct 30 14:22:37 2010 +0000 net: remove check for headroom in vlan_dev_create It is possible for the headroom to be smaller then the hard_header_len for a short period of time after toggling the vlan offload setting. This is not a hard error and skb_cow_head is called in __vlan_put_tag() to resolve this. Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 029f5fc31cdb35d6c8a7fe9a54bf21556e175988 Author: John Fastabend Date: Sat Oct 30 14:22:32 2010 +0000 8021q: set hard_header_len when VLAN offload features are toggled Toggling the vlan tx|rx hw offloads needs to set the hard_header_len as well otherwise we end up using LL_RESERVED_SPACE incorrectly. This results in pskb_expand_head() being used unnecessarily. Signed-off-by: John Fastabend Acked-by: Jesse Gross Signed-off-by: David S. Miller commit 58e998c6d23988490162cef0784b19ea274d90bb Author: Jesse Gross Date: Fri Oct 29 12:14:55 2010 +0000 offloading: Force software GSO for multiple vlan tags. We currently use vlan_features to check for TSO support if there is a vlan tag. However, it's quite likely that the NIC is not able to do TSO when there is an arbitrary number of tags. Therefore if there is more than one tag (in-band or out-of-band), fall back to software emulation. Signed-off-by: Jesse Gross CC: Ben Hutchings Signed-off-by: David S. Miller commit c8d5bcd1aff89199cde4bd82c5c40fb704c8bba4 Author: Jesse Gross Date: Fri Oct 29 12:14:54 2010 +0000 offloading: Support multiple vlan tags in GSO. We assume that hardware TSO can't support multiple levels of vlan tags but we allow it to be done. Therefore, enable GSO to parse these tags so we can fallback to software. Signed-off-by: Jesse Gross CC: Ben Hutchings Signed-off-by: David S. Miller commit e1e78db628b33c657944865e3bca01ee59cc5b80 Author: Jesse Gross Date: Fri Oct 29 12:14:53 2010 +0000 offloading: Make scatter/gather more tolerant of vlans. When checking if it is necessary to linearize a packet, we currently use vlan_features if the packet contains either an in-band or out- of-band vlan tag. However, in-band tags aren't special in any way for scatter/gather since they are part of the packet buffer and are simply more data to DMA. Therefore, only use vlan_features for out- of-band tags, which could potentially have some interaction with scatter/gather. Signed-off-by: Jesse Gross CC: Ben Hutchings Reviewed-by: Ben Hutchings Signed-off-by: David S. Miller commit ef995e3a91e290684f24696e1d2e8767a2a2ebb6 Author: Joe Perches Date: Mon Nov 15 09:09:17 2010 -0800 ASoC: Remove unnecessary semicolons Signed-off-by: Joe Perches Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 410989f65151557701ce86875b141e694281dd6c Author: Casey Leedom Date: Thu Nov 11 09:30:43 2010 +0000 cxgb4vf: Advertise NETIF_F_TSO_ECN. Advertise NETIF_F_TSO_ECN. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit 4204875dd4b3c3e40e0294a8c2619fdf9e5907e1 Author: Casey Leedom Date: Thu Nov 11 09:30:42 2010 +0000 cxgb4vf: fix up "Section Mismatch" compiler warning. Fix up "Section Mismatch" compiler warning and mark another routine as __devinit. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit f12fe3536bebcbd2ccfa80030ec7d9868c488d30 Author: Casey Leedom Date: Thu Nov 11 09:30:41 2010 +0000 cxgb4vf: add ethtool statistics for GRO. Add ethtool statistics for GRO. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit caedda35c6dba5a283e5d87e77a8d19ee4be3183 Author: Casey Leedom Date: Thu Nov 11 09:30:40 2010 +0000 cxgb4vf: minor comment/symbolic name cleanup. Minor cleanup of comments and symbolic constant names for clarity. Signed-off-by: Casey Leedom Signed-off-by: David S. Miller commit d9aa93804e53f2153260568024b75ad3d81784f9 Author: David S. Miller Date: Mon Nov 15 08:52:02 2010 -0800 ipv4: Fix build with multicast disabled. net/ipv4/igmp.c: In function 'ip_mc_inc_group': net/ipv4/igmp.c:1228: error: implicit declaration of function 'for_each_pmc_rtnl' net/ipv4/igmp.c:1228: error: expected ';' before '{' token net/ipv4/igmp.c: In function 'ip_mc_unmap': net/ipv4/igmp.c:1333: error: expected ';' before 'igmp_group_dropped' ... Move for_each_pmc_rcu and for_each_pmc_rtnl macro definitions outside of multicast ifdef protection. Reported-by: Stephen Rothwell Signed-off-by: David S. Miller commit ead9b9199c09653dd9b889933c7af75f020c7286 Author: Jarkko Nikula Date: Sat Nov 13 20:40:44 2010 +0200 ASoC: Add optional name_prefix for codec kcontrol, widget and route names There is a need to prefix codec kcontrol, widget and internal route names in an ASoC machine that has multiple codecs with conflicting names. The name collision would occur when codec drivers try to registering kcontrols with the same name or when building audio paths. This patch introduces optional prefix_map into struct snd_soc_card. With it machine drivers can specify a unique name prefix to each codec that have conflicting names with anothers. Prefix to codec is matched with codec name. Following example illustrates a machine that has two same codec instances. Name collision from kcontrol registration is avoided by specifying a name prefix "foo" for the second codec. As the codec widget names are prefixed then second audio map for that codec shows a prefixed widget name. static const struct snd_soc_dapm_route map0[] = { {"Spk", NULL, "MONO"}, }; static const struct snd_soc_dapm_route map1[] = { {"Vibra", NULL, "foo MONO"}, }; static struct snd_soc_prefix_map codec_prefix[] = { { .dev_name = "codec.2", .name_prefix = "foo", }, }; static struct snd_soc_card card = { ... .prefix_map = codec_prefix, .num_prefixes = ARRAY_SIZE(codec_prefix), }; Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e987fa357a4c585e4f43fc3e0ab15ba9e908e233 Author: Jesper Juhl Date: Sun Nov 7 23:24:44 2010 +0100 infiniband: Only include mutex.h once in drivers/infiniband/hw/cxgb4/iw_cxgb4.h Only include the header linux/mutex.h once inside drivers/infiniband/hw/cxgb4/iw_cxgb4.h Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit b7bedd804333f13248c0fee57eeef764edfcbc9b Author: Jesper Juhl Date: Sun Nov 7 23:15:41 2010 +0100 ARM, mm: Don't include smp_plat.h twice in flush.c It's enough to include the asm/smp_plat.h once in arch/arm/mm/flush.c Signed-off-by: Jesper Juhl Signed-off-by: Jiri Kosina commit 6ccd744123679c1f19fb6e414e3df717d9ed57f6 Merge: 3c9e28e bcbb243 Author: Mark Brown Date: Mon Nov 15 13:20:12 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit 6021afcf19d8c6f5db6d11cadcfb6a22d0c28a48 Author: Edgar (gimli) Hucek Date: Tue Nov 9 17:38:42 2010 +0100 input: bcm5974: Add support for MacBookAir3 This patch adds support for the MacBookAir3,1 and MacBookAir3,2 models. [rydberg@euromail.se: touchpad range calibration] Cc: stable@kernel.org Signed-off-by: Edgar (gimli) Hucek Signed-off-by: Henrik Rydberg Signed-off-by: Jiri Kosina commit 380cf090f4f531545b558b04a3dd90d09df52ee9 Author: Wu Fengguang Date: Thu Nov 11 19:23:29 2010 +0800 ext4: fix redirty_page_for_writepage() typo in comment Signed-off-by: Wu Fengguang Signed-off-by: Jiri Kosina commit 149d730fac715e077a8bcceb4b27f3523b314558 Author: Jonathan Neuschäfer Date: Tue Nov 9 23:20:26 2010 +0100 spelling fix in drivers/misc/Kconfig Signed-off-by: Jonathan Neuschäfer Signed-off-by: Jiri Kosina commit 3c9e28e751cf9969c2cb2e57b5573cab86cf521a Author: Arnaud Patard (Rtp) Date: Sat Nov 13 18:51:53 2010 +0100 ASoC: Add support for OpenRD Ultimate OpenRD Ultimate & Client are similar machines so enable OpenRD client sound support on Ultimate too Tested-by: Robas Teodor Signed-off-by: Arnaud Patard Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f9a67059d43a8f12446356ed42d7694afc34bb92 Author: Mark Brown Date: Sun Nov 14 19:25:09 2010 +0000 ASoC: Prevent system suspend while debouncing wakeup capable GPIO jacks If the device associated with a GPIO jack is wakeup capable then disable suspend while we're debouncing the jack so that we skip suspends that race with the jack. Note that currently the GPIO based jack has a CODEC associated with it which we're using right now. These jacks should be reparented against the card itself and this code adjusted. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 20a4c261ad9cec39942257b1f91765a4b238db05 Author: Paul Fox Date: Mon Nov 15 01:33:24 2010 -0800 Input: hgpk - fix powersave mode Recent testing of this codepath showed that it wasn't working, perhaps due to changes within the input layer. This fixes it. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 34caed2082105a6d9f5aaba1cf4e02760cbee14e Author: Daniel Drake Date: Mon Nov 15 01:33:22 2010 -0800 Input: hgpk - recalibration tweaks Disable the recalibration guard where new recalibrations are triggered if we detect a packet too soon after calibrating - we found that this results in erroneous recalibrations, and if the recalibration failed then the rest of our badness-detection code will request another. Add a module option disabling all of the recalibration code, in case an OLPC deployment thinks all of the workarounds we have are doing more damage than good and wants to experiment with them all disabled. Based on work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 67f56bb0f4997b55291c162077e02e4f29639fc2 Author: Daniel Drake Date: Mon Nov 15 01:28:54 2010 -0800 Input: hgpk - detect simple mode overflows Based on work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 82cc2e4b513e23a03df78b7f32ef957ef8180405 Merge: 0143832 d69b78b Author: Jens Axboe Date: Mon Nov 15 10:25:49 2010 +0100 Merge branch 'for-linus' into for-next commit c94f28c383f58c9de74678e0f1624db9c5f8a8cb Merge: df15315 1bb9583 Author: Chris Wilson Date: Mon Nov 15 06:49:30 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_ringbuffer.c commit df15315899c0641412bd54b29565a70b078a6ac8 Author: Chris Wilson Date: Mon Nov 15 05:25:58 2010 +0000 drm/i915: Fix current tiling check for relaxed fencing As we may bind an object with the correct alignment, but with an invalid size, it may pass the current checks on whether the object may be reused with a fence. Signed-off-by: Chris Wilson commit 473ff6609c0778c5939164c5c57676b74164be71 Author: Joe Perches Date: Sun Nov 14 19:04:21 2010 -0800 arch/microblaze: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Michal Simek commit 7e87fe84303cc54ecf3c7b688cb08ca24322a41d Author: Gerrit Renker Date: Sun Nov 14 17:26:13 2010 +0100 dccp ccid-2: Separate option parsing from CCID processing This patch replaces an almost identical replication of code: large parts of dccp_parse_options() re-appeared as ccid2_ackvector() in ccid2.c. Apart from the duplication, this caused two more problems: 1. CCIDs should not need to be concerned with parsing header options; 2. one can not assume that Ack Vectors appear as a contiguous area within an skb, it is legal to insert other options and/or padding in between. The current code would throw an error and stop reading in such a case. Since Ack Vectors provide CCID-specific information, they are now processed by the CCID directly, separating this functionality from the main DCCP code. Signed-off-by: Gerrit Renker commit 52394eecec4e6fa677a61af26f0bd35de665344e Author: Gerrit Renker Date: Sun Nov 14 17:26:02 2010 +0100 dccp ccid-2: Remove old infrastructure This removes * functions for which updates have been provided in the preceding patches and * the @av_vec_len field - it is no longer necessary since the buffer length is now always computed dynamically. Signed-off-by: Gerrit Renker commit d83447f0944e73d690218d79c07762ffa4ceb9e4 Author: Gerrit Renker Date: Sun Nov 14 17:25:46 2010 +0100 dccp ccid-2: Schedule Sync as out-of-band mechanism The problem with Ack Vectors is that i) their length is variable and can in principle grow quite large, ii) it is hard to predict exactly how large they will be. Due to the second point it seems not a good idea to reduce the MPS; in particular when on average there is enough room for the Ack Vector and an increase in length is momentarily due to some burst loss, after which the Ack Vector returns to its normal/average length. The solution taken by this patch is to subtract a minimum-expected Ack Vector length from the MPS, and to defer any larger Ack Vectors onto a separate Sync - but only if indeed there is no space left on the skb. This patch provides the infrastructure to schedule Sync-packets for transporting (urgent) out-of-band data. Its signalling is quicker than scheduling an Ack, since it does not need to wait for new application data. Signed-off-by: Gerrit Renker commit 18219463c884bfdb7954d298b9edb5194b14d621 Author: Gerrit Renker Date: Sun Nov 14 17:25:36 2010 +0100 dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module This aggregates Ack Vector processing (handling input and clearing old state) into one function, for the following reasons and benefits: * all Ack Vector-specific processing is now in one place; * duplicated code is removed; * ensuring sanity: from an Ack Vector point of view, it is better to clear the old state first before entering new state; * Ack Event handling happens mostly within the CCIDs, not the main DCCP module. Signed-off-by: Gerrit Renker commit 3802408644515e29fb723d51a5317301b212cf3a Author: Gerrit Renker Date: Sun Nov 14 17:25:23 2010 +0100 dccp ccid-2: Update code for the Ack Vector input/registration routine This patch updates the code which registers new packets as received, using the new circular buffer interface. It contributes a new algorithm which * supports both tail/head pointers and buffer wrap-around and * deals with overflow (head/tail move in lock-step). Signed-off-by: Gerrit Renker commit 5753fdfe8bd8e9a2ff9e5af19b0ffc78bfcd502a Author: Gerrit Renker Date: Sun Nov 14 17:25:11 2010 +0100 dccp ccid-2: Algorithm to update buffer state This provides a routine to consistently update the buffer state when the peer acknowledges receipt of Ack Vectors; updating state in the list of Ack Vectors as well as in the circular buffer. While based on RFC 4340, several additional (and necessary) precautions were added to protect the consistency of the buffer state. These additions are essential, since analysis and experience showed that the basic algorithm was insufficient for this task (which lead to problems that were hard to debug). The algorithm now * deals with HC-sender acknowledging to HC-receiver and vice versa, * keeps track of the last unacknowledged but received seqno in tail_ackno, * has special cases to reset the overflow condition when appropriate, * is protected against receiving older information (would mess up buffer state). Signed-off-by: Gerrit Renker commit 4232f60791d12a5156c3e1c9b04ae08b873a2920 Author: Guennadi Liakhovetski Date: Thu Nov 11 14:45:09 2010 +0000 fbdev: sh_mobile_hdmi: add support for E-EDID parsing Many HDMI clients implement enhanced EDID blocks, which often contain additional supported video modes. This patch implements parsing of such E-EDID blocks. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit d8d776f3fb1ff19c37d43b600fc8c128ff172deb Merge: c724d07 0ad83f6 Author: Paul Mundt Date: Mon Nov 15 14:57:49 2010 +0900 Merge branch 'fbdev/edid' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/fbdev-2.6 into common/fbdev-edid commit 0ad83f6882c41df1a7fa387086029e162038c1f2 Author: Guennadi Liakhovetski Date: Thu Nov 11 15:45:04 2010 +0100 fbdev: when parsing E-EDID blocks, also use SVD entries Add parsing of E-EDID SVD entries. In this first version only a few CEA/EIA-861E modes are implemented, more can be added as needed. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit e4105119aca9b86b163fa07428df1f615034a03d Author: Guennadi Liakhovetski Date: Thu Nov 11 15:44:52 2010 +0100 fbdev: export fb_edid_add_monspecs() for modules, improve algorithm fb_edid_add_monspecs() should also be exported for use in modules, and it requires a dummy version for the case, when CONFIG_FB_MODE_HELPERS is not selected. This patch also improves the algorithm by removing a redundant memory allocation, adds function documentation, adds data verification and replaces memmove() with memcpy(). Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 9fbbdde93231ad7f35c217aa6bbbc7995133f483 Author: Erik Gilling Date: Thu Nov 11 15:44:43 2010 +0100 video: add fb_edid_add_monspecs for parsing extended edid information Modern monitors/tvs have more extended EDID information blocks which can contain extra detailed modes. This adds a fb_edid_add_monspecs function which drivers can use to parse those additions blocks. Signed-off-by: Erik Gilling Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 5e78330126e23e009502b21d1efdabd68ab91397 Author: Daniel Vetter Date: Sun Nov 14 22:32:36 2010 +0100 drm/i915: fix relaxed tiling for gen <= 3 && !g33 g33/pineview doesn't have any alignment constrains for unfenced tiled buffers. But older chips have. Fix this. Problem introduced in a00b10c360b35d6431a94cbf130a4e162870d661. Signed-off-by: Daniel Vetter commit bc3f67a3e1b20756d4bfa5886a6b8fd0c068e6a4 Author: Joe Perches Date: Sun Nov 14 19:04:47 2010 -0800 drivers/spi: Remove unnecessary semicolons Signed-off-by: Joe Perches Signed-off-by: Grant Likely commit c25ecd0a21d5e08160cb5cc984f9e2b8ee347443 Merge: 190683a 9457b24 Author: David S. Miller Date: Sun Nov 14 11:57:05 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 69435b94d01f49197b287eb5902fb8c5cee8fe1d Author: Adrian Hoban Date: Thu Nov 4 15:02:04 2010 -0400 crypto: rfc4106 - Extending the RC4106 AES-GCM test vectors Updated RFC4106 AES-GCM testing. Some test vectors were taken from http://csrc.nist.gov/groups/ST/toolkit/BCM/documents/proposedmodes/ gcm/gcm-test-vectors.tar.gz Signed-off-by: Adrian Hoban Signed-off-by: Tadeusz Struk Signed-off-by: Gabriele Paoloni Signed-off-by: Aidan O'Mahony Signed-off-by: Herbert Xu commit 0bd82f5f6355775fbaf7d3c664432ce1b862be1e Author: Tadeusz Struk Date: Thu Nov 4 15:00:45 2010 -0400 crypto: aesni-intel - RFC4106 AES-GCM Driver Using Intel New Instructions This patch adds an optimized RFC4106 AES-GCM implementation for 64-bit kernels. It supports 128-bit AES key size. This leverages the crypto AEAD interface type to facilitate a combined AES & GCM operation to be implemented in assembly code. The assembly code leverages Intel(R) AES New Instructions and the PCLMULQDQ instruction. Signed-off-by: Adrian Hoban Signed-off-by: Tadeusz Struk Signed-off-by: Gabriele Paoloni Signed-off-by: Aidan O'Mahony Signed-off-by: Erdinc Ozturk Signed-off-by: James Guilford Signed-off-by: Wajdi Feghali Signed-off-by: Herbert Xu commit 895be15745d59cc7ede0e1c203e3432b0abdb71c Author: Nicolas Kaiser Date: Thu Nov 4 14:58:12 2010 -0400 crypto: cast5 - simplify if-statements I noticed that by factoring out common rounds from the branches of the if-statements in the encryption and decryption functions, the executable file size goes down significantly, for crypto/cast5.ko from 26688 bytes to 24336 bytes (amd64). On my test system, I saw a slight speedup. This is the first time I'm doing such a benchmark - I found a similar one on the crypto mailing list, and I hope I did it right? Before: # cryptsetup create dm-test /dev/hda2 -c cast5-cbc-plain -s 128 Passsatz eingeben: # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,43484 s, 21,5 MB/s # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,4089 s, 21,8 MB/s # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,41091 s, 21,7 MB/s After: # cryptsetup create dm-test /dev/hda2 -c cast5-cbc-plain -s 128 Passsatz eingeben: # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,38128 s, 22,0 MB/s # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,29486 s, 22,8 MB/s # dd if=/dev/zero of=/dev/mapper/dm-test bs=1M count=50 52428800 Bytes (52 MB) kopiert, 2,37162 s, 22,1 MB/s Signed-off-by: Nicolas Kaiser Signed-off-by: Herbert Xu commit d4d77629953eabd3c14f6fa5746f6b28babfc55f Author: Tejun Heo Date: Sat Nov 13 11:55:18 2010 +0100 block: clean up blkdev_get() wrappers and their users After recent blkdev_get() modifications, open_by_devnum() and open_bdev_exclusive() are simple wrappers around blkdev_get(). Replace them with blkdev_get_by_dev() and blkdev_get_by_path(). blkdev_get_by_dev() is identical to open_by_devnum(). blkdev_get_by_path() is slightly different in that it doesn't automatically add %FMODE_EXCL to @mode. All users are converted. Most conversions are mechanical and don't introduce any behavior difference. There are several exceptions. * btrfs now sets FMODE_EXCL in btrfs_device->mode, so there's no reason to OR it explicitly on blkdev_put(). * gfs2, nilfs2 and the generic mount_bdev() now set FMODE_EXCL in sb->s_mode. * With the above changes, sb->s_mode now always should contain FMODE_EXCL. WARN_ON_ONCE() added to kill_block_super() to detect errors. The new blkdev_get_*() functions are with proper docbook comments. While at it, add function description to blkdev_get() too. Signed-off-by: Tejun Heo Cc: Philipp Reisner Cc: Neil Brown Cc: Mike Snitzer Cc: Joern Engel Cc: Chris Mason Cc: Jan Kara Cc: "Theodore Ts'o" Cc: KONISHI Ryusuke Cc: reiserfs-devel@vger.kernel.org Cc: xfs-masters@oss.sgi.com Cc: Alexander Viro commit 75f1dc0d076d1c1168f2115f1941ea627d38bd5a Author: Tejun Heo Date: Sat Nov 13 11:55:17 2010 +0100 block: check bdev_read_only() from blkdev_get() bdev read-only status can be queried using bdev_read_only() and may change while the device is being opened. Enforce it by checking it from blkdev_get() after open succeeds. This makes bdev_read_only() check in open_bdev_exclusive() and fsg_lun_open() unnecessary. Drop them. Signed-off-by: Tejun Heo Cc: David Brownell Cc: linux-usb@vger.kernel.org commit 6a027eff62f6ae32d49f2ae5dadd6f4eee1ddae2 Author: Tejun Heo Date: Sat Nov 13 11:55:17 2010 +0100 block: reorganize claim/release implementation With claim/release rolled into blkdev_get/put(), there's no reason to keep bd_abort/finish_claim(), __bd_claim() and bd_release() as separate functions. It only makes the code difficult to follow. Collapse them into blkdev_get/put(). This will ease future changes around claim/release. Signed-off-by: Tejun Heo commit e525fd89d380c4a94c0d63913a1dd1a593ed25e7 Author: Tejun Heo Date: Sat Nov 13 11:55:17 2010 +0100 block: make blkdev_get/put() handle exclusive access Over time, block layer has accumulated a set of APIs dealing with bdev open, close, claim and release. * blkdev_get/put() are the primary open and close functions. * bd_claim/release() deal with exclusive open. * open/close_bdev_exclusive() are combination of open and claim and the other way around, respectively. * bd_link/unlink_disk_holder() to create and remove holder/slave symlinks. * open_by_devnum() wraps bdget() + blkdev_get(). The interface is a bit confusing and the decoupling of open and claim makes it impossible to properly guarantee exclusive access as in-kernel open + claim sequence can disturb the existing exclusive open even before the block layer knows the current open if for another exclusive access. Reorganize the interface such that, * blkdev_get() is extended to include exclusive access management. @holder argument is added and, if is @FMODE_EXCL specified, it will gain exclusive access atomically w.r.t. other exclusive accesses. * blkdev_put() is similarly extended. It now takes @mode argument and if @FMODE_EXCL is set, it releases an exclusive access. Also, when the last exclusive claim is released, the holder/slave symlinks are removed automatically. * bd_claim/release() and close_bdev_exclusive() are no longer necessary and either made static or removed. * bd_link_disk_holder() remains the same but bd_unlink_disk_holder() is no longer necessary and removed. * open_bdev_exclusive() becomes a simple wrapper around lookup_bdev() and blkdev_get(). It also has an unexpected extra bdev_read_only() test which probably should be moved into blkdev_get(). * open_by_devnum() is modified to take @holder argument and pass it to blkdev_get(). Most of bdev open/close operations are unified into blkdev_get/put() and most exclusive accesses are tested atomically at the open time (as it should). This cleans up code and removes some, both valid and invalid, but unnecessary all the same, corner cases. open_bdev_exclusive() and open_by_devnum() can use further cleanup - rename to blkdev_get_by_path() and blkdev_get_by_devt() and drop special features. Well, let's leave them for another day. Most conversions are straight-forward. drbd conversion is a bit more involved as there was some reordering, but the logic should stay the same. Signed-off-by: Tejun Heo Acked-by: Neil Brown Acked-by: Ryusuke Konishi Acked-by: Mike Snitzer Acked-by: Philipp Reisner Cc: Peter Osterlund Cc: Martin Schwidefsky Cc: Heiko Carstens Cc: Jan Kara Cc: Andrew Morton Cc: Andreas Dilger Cc: "Theodore Ts'o" Cc: Mark Fasheh Cc: Joel Becker Cc: Alex Elder Cc: Christoph Hellwig Cc: dm-devel@redhat.com Cc: drbd-dev@lists.linbit.com Cc: Leo Chen Cc: Scott Branden Cc: Chris Mason Cc: Steven Whitehouse Cc: Dave Kleikamp Cc: Joern Engel Cc: reiserfs-devel@vger.kernel.org Cc: Alexander Viro commit e09b457bdb7e8d23fc54dcef0930ac697d8de895 Author: Tejun Heo Date: Sat Nov 13 11:55:17 2010 +0100 block: simplify holder symlink handling Code to manage symlinks in /sys/block/*/{holders|slaves} are overly complex with multiple holder considerations, redundant extra references to all involved kobjects, unused generic kobject holder support and unnecessary mixup with bd_claim/release functionalities. Strip it down to what's necessary (single gendisk holder) and make it use a separate interface. This is a step for cleaning up bd_claim/release. This patch makes dm-table slightly more complex but it will be simplified again with further changes. Signed-off-by: Tejun Heo Acked-by: Neil Brown Acked-by: Mike Snitzer Cc: dm-devel@redhat.com commit 37004c42f7240035bc2726c340c4efa726b4818e Author: Tejun Heo Date: Sat Nov 13 11:55:17 2010 +0100 btrfs: close_bdev_exclusive() should use the same @flags as the matching open_bdev_exclusive() In the failure path of __btrfs_open_devices(), close_bdev_exclusive() is called with @flags which doesn't match the one used during open_bdev_exclusive(). Fix it. Signed-off-by: Tejun Heo Cc: Chris Mason commit 731edacb7567c15f25b1fccac18a203bd432ae5e Author: Tejun Heo Date: Sat Nov 13 11:55:16 2010 +0100 mtd: fix bdev exclusive open bugs in block2mtd::add_device() There are two bdev exclusive open bugs. * open_bdev_exclusive() must not be called with NULL holder. Use dev as the holder. * open_by_devnum() doesn't open the bdev exclusively but block2mtd_free_device() always assumes it. Explicitly claim the bdev. The latter is rather clumsy but will be simplified with future blkdev_get/put() cleanups. - Updated to use local variable @mode to cache FMODE_* masks as suggested by Artem Bityutskiy. Signed-off-by: Tejun Heo Cc: linux-mtd@lists.infradead.org Cc: Artem Bityutskiy commit 190683a9d5457e6d962c232ffbecac3ab158dddd Author: Eric Dumazet Date: Wed Nov 10 10:50:44 2010 +0000 net: net_families __rcu annotations Use modern RCU API / annotations for net_families array. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit e85eb11782259dc39502807f3ec903a7b82b1bab Author: Philippe De Muyter Date: Thu Nov 11 12:31:21 2010 +0000 net: Kconfig whitespace cleanup Many lines in Kconfig start withe 8 spaces instead of a TAB, and even sometimes with 7 spaces. Replace 10 or 9 spaces, or TAB + 1 space, by TAB + 2 spaces, and 8 or 7 spaces by TAB. Signed-off-by: Philippe De Muyter Signed-off-by: David S. Miller commit 1d7138de878d1d4210727c1200193e69596f93b3 Author: Eric Dumazet Date: Fri Nov 12 05:46:50 2010 +0000 igmp: RCU conversion of in_dev->mc_list in_dev->mc_list is protected by one rwlock (in_dev->mc_list_lock). This can easily be converted to a RCU protection. Writers hold RTNL, so mc_list_lock is removed, not replaced by a spinlock. Signed-off-by: Eric Dumazet Cc: Cypher Wu Cc: Américo Wang Signed-off-by: David S. Miller commit f5539b5bfa2e00f2a6fd35731db66142a2f327c0 Author: Giuseppe Cavallaro Date: Fri Nov 12 12:43:34 2010 -0800 stmmac: update the driver documentation Signed-off-by: Giuseppe Cavallaro Signed-off-by: David S. Miller commit f92c8dd7a0eb18124521e2b549f88422e17f707b Author: Bob Peterson Date: Fri Nov 12 11:15:20 2010 -0600 dlm: reduce cond_resched during send Calling cond_resched() after every send can unnecessarily degrade performance. Go back to an old method of scheduling after 25 messages. Signed-off-by: Bob Peterson Signed-off-by: David Teigland commit cb2d45da81c86d5191b19d0f67732a854bc0253c Author: David Teigland Date: Fri Nov 12 11:12:55 2010 -0600 dlm: use TCP_NODELAY Nagling doesn't help and can sometimes hurt dlm comms. Signed-off-by: David Teigland commit dcce240ead802d42b1e45ad2fcb2ed4a399cb255 Author: Steven Whitehouse Date: Fri Nov 12 12:12:29 2010 +0000 dlm: Use cmwq for send and receive workqueues So far as I can tell, there is no reason to use a single-threaded send workqueue for dlm, since it may need to send to several sockets concurrently. Both workqueues are set to WQ_MEM_RECLAIM to avoid any possible deadlocks, WQ_HIGHPRI since locking traffic is highly latency sensitive (and to avoid a priority inversion wrt GFS2's glock_workqueue) and WQ_FREEZABLE just in case someone needs to do that (even though with current cluster infrastructure, it doesn't make sense as the node will most likely land up ejected from the cluster) in the future. Signed-off-by: Steven Whitehouse Cc: Tejun Heo Signed-off-by: David Teigland commit cb2b3cf1fedd31916b7c64d61e2d20d23bd3681a Author: Mark Brown Date: Thu Nov 11 17:18:01 2010 +0000 ASoC: Reset WM8962 with default ID value The value makes no odds and it makes life easier with caches. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 87abb6bbdbcfbced2ce0bcad68dd89ac3ff9464b Author: Dmitry Torokhov Date: Thu Nov 11 22:03:59 2010 -0800 Input: mac mouse emulation - add locking We need to add appropriate locking when toggling mac mouse emulation on and off to ensure that input device and handler are in consistent state. Signed-off-by: Dmitry Torokhov commit a309cdc778b9eece59b34e9e1c26e41476dbbcd6 Author: Daniel Drake Date: Thu Nov 11 22:20:03 2010 -0800 Input: hgpk - extend jumpiness detection In addition to forcing recalibrations upon detection of cursor jumps (and performing them quicker than before), detect and discard errant 'jump' packets caused by a firmware bug, which are then repeated with each one being approximately half the delta of the one previously (as if it is averaging out) Based on original work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit c0dc8342656a1425c31dcc505072f2387f0f0c92 Author: Daniel Drake Date: Thu Nov 11 22:20:02 2010 -0800 Input: hgpk - rework spew detection The old implementation of spew detection simply tracked the overall position delta of the cursor over every 100 packets. We found that this causes occasional false positives in spew detection, and also that the conditions of the spewy packets are perhaps more fixed than we once thought. Rework the spew detection to look for packets of specific small delta, and only recalibrating if the overall movement delta stays within expected bounds. Also discard duplicate packets in the advanced mode, which appear to be very common. If we don't, the spew detection kicks in far too early. If we get a large spew of duplicates, request a recalibration straight up. Based on earlier work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit ca94ec43540ce5d93fd30a3bf88321b6f11ed51a Author: Daniel Drake Date: Thu Nov 11 22:19:57 2010 -0800 Input: hgpk - support GlideSensor and PenTablet modes Add a "hgpk_mode" sysfs attribute that allows selection between 3 options: Mouse (the existing option), GlideSensor and PenTablet. GlideSensor is an enhanced protocol for the regular touchpad mode that additionally reports pressure and uses absolute coordinates. We suspect that it may be more reliable than mouse mode in some environments. PenTablet mode puts the touchpad into resistive mode, you must then use a stylus as an input. We suspect this is the most reliable way to drive the touchpad. The GlideSensor and PenTablet devices expose themselves with the intention of being combined with the synaptics X11 input driver. Based on earlier work by Paul Fox. Signed-off-by: Daniel Drake Signed-off-by: Dmitry Torokhov commit 10ee2ded629b1571cef1182728d6f65dbe4c7f79 Author: Dmitry Torokhov Date: Thu Nov 11 01:03:00 2010 -0800 Input: pcf_keypad - convert to dev_op_ops Signed-off-by: Dmitry Torokhov commit 2a0591596b302adc654a1caf6bd3d0063407ea4b Author: Dmitry Torokhov Date: Thu Nov 11 21:52:18 2010 -0800 Input: xpad - remove useless check in xpad_remove ixpad can never be NULL here; if it is NULL we would not have been bound to the interface and then why would we be called? Signed-off-by: Dmitry Torokhov commit 161feb2417dd0c4324c2e8da24aaebd30a436d45 Author: Axel Lin Date: Thu Nov 11 21:47:42 2010 -0800 Input: xpad - fix resource reclaim in xpad_probe error path Properly free the resources in error path by the reverse order of resource allocation. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 6ff92a6db2083ecd1a8e2742d9397159fd880987 Author: Axel Lin Date: Thu Nov 11 21:43:17 2010 -0800 Input: xpad - fix a memory leak In xpad_led_disconnect(), what we really want is to kfree(xpad_led). In xpad_disconnect(), add a missing kfree(xpad->bdata) to fix the memory leak. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 49cc69b6789b57d2d8ed78843c4219525b433b58 Author: Axel Lin Date: Thu Nov 11 21:39:11 2010 -0800 Input: xpad - return proper error in error path In current implementation, xpad_probe return 0 when usb_alloc_urb failed for xpad->bulk_out and kzalloc failed for xpad->bdata. This patch removes the initialization for error variable, assign the error code at the place the error happens instead. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit c753796769e4fb0cd813b6e5801b3c01f4681d4f Author: David S. Miller Date: Thu Nov 11 17:07:48 2010 -0800 ipv4: Make rt->fl.iif tests lest obscure. When we test rt->fl.iif against zero, we're seeing if it's an output or an input route. Make that explicit with some helper functions. Signed-off-by: David S. Miller commit 37bc9f5078c62bfa73edeb0053edceb3ed5e46a4 Author: Dirk Brandewie Date: Tue Nov 9 12:08:08 2010 -0800 x86: Ce4100: Add reboot_fixup() for CE4100 This patch adds the CE4100 reboot fixup to reboot_fixups_32.c [ tglx: Moved PCI id to reboot_fixups_32.c ] Signed-off-by: Dirk Brandewie LKML-Reference: <5bdcfb4f0206fa721570504e95659a03b815bc5e.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit 91d8037f563e4a86ff8b02c994530989c7936427 Author: Dirk Brandewie Date: Tue Nov 9 12:08:05 2010 -0800 ce4100: Add PCI register emulation for CE4100 This patch provides access methods for PCI registers that mis-behave on the CE4100. Each register can be assigned a private init, read and write routine. The exception to this is the bridge device. The bridge device is the only device on bus zero (0) that requires any fixup so it is a special case. [ tglx: minor coding style cleanups, __init annotation and simplification of ce4100_conf_read/write ] Signed-off-by: Dirk Brandewie LKML-Reference: <40b6751381c2275dc359db5a17989cce22ad8db7.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit c751e17b5371ad86cdde6cf5c0175e06f3ff0347 Author: Thomas Gleixner Date: Tue Nov 9 12:08:04 2010 -0800 x86: Add CE4100 platform support Add CE4100 platform support. CE4100 needs early setup like moorestown. Signed-off-by: Thomas Gleixner Signed-off-by: Dirk Brandewie LKML-Reference: <94720fd7f5564a12ebf202cf2c4f4c0d619aab35.1289331834.git.dirk.brandewie@gmail.com> Signed-off-by: Thomas Gleixner commit 2adc2917ce4bfb482a6e3c05ff543cef151c9830 Author: Baurzhan Ismagulov Date: Thu Nov 11 10:54:58 2010 +0100 serial: cpu_uart: Remove unused uart_cpm_port fields AFAICT, these fields are not used anywhere. Signed-off-by: Baurzhan Ismagulov Signed-off-by: Greg Kroah-Hartman commit 5b04ec4ad8e2ffdc9d1f27fd6eb5118e919bc87d Author: Baurzhan Ismagulov Date: Thu Nov 11 10:53:03 2010 +0100 serial: cpm_uat: reducing CPM serial latency Setting Rx FIFO size to 1 reduces reader process wakeup latency up to 20x for baud rates <= 9600. This patch sets the Rx FIFO size to 1 for baud rates <= 9600 or if low latency has been requested for the tty. Signed-off-by: Michael Trimarchi Signed-off-by: Bruno Morelli Signed-off-by: Baurzhan Ismagulov Signed-off-by: Greg Kroah-Hartman commit 63295cb2ff4329f563579f3d20c5855a96a866d5 Author: Claudio Scordino Date: Thu Nov 11 11:22:36 2010 +0100 serial: add Documentation about RS485 serial communications Documentation about RS485 serial communications Signed-off-by: Claudio Scordino Acked-by: Randy Dunlap Acked-by: Russell King Acked-by: Grant Edwards Signed-off-by: Greg Kroah-Hartman commit 5f9a31d63105c3e88bd6d026e7bc53f02a5ac042 Author: Alan Cox Date: Thu Nov 4 15:17:27 2010 +0000 n_gsm: clean up printks [Original From Ken Mills but I redid it using pr_ helpers instead] Also fix up coding style, there are two warnings left but that is where the CodingStyle tools blow up because they cannot handle if (blah) { foo } else switch (x) { case 1: } Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c2f2f0000bb69f067fea12624272e6a58a811702 Author: Alan Cox Date: Thu Nov 4 15:17:03 2010 +0000 n_gsm: Fix support for legacy encoding The mux supports several encoding schemes. Encoding 0 is a "not recommended" mode still sometimes used. This has now been tested with hardware that supports this mode, and found wanting. Fix the FCS handling in this mode and correct the state machine. Signed-off-by: Ken Mills Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 304e12665a4a7b8b25dfe8c64fa4fd56a04a67ea Author: Alexey Charkov Date: Mon Nov 8 20:33:20 2010 +0300 serial: Add support for UART on VIA VT8500 and compatibles This adds a driver for the serial ports found in VIA and WonderMedia Systems-on-Chip. Interrupt-driven FIFO operation is implemented. The hardware also supports pure register-based operation (which is slower) and DMA-based FIFO operation. As the FIFOs are only 16 bytes long, DMA operation is probably not worth the hassle. Signed-off-by: Alexey Charkov Signed-off-by: Greg Kroah-Hartman commit af3b8881f4c9852eefe9c7f1a997b3ecf580561b Author: Russ Gorby Date: Tue Oct 26 14:13:52 2010 +0100 ifx6x60: SPI protocol driver for Infineon 6x60 modem Prototype driver for the IFX6x60 series of SPI attached modems by Jim Stanley and Russ Gorby Signed-off-by: Russ Gorby [Some reworking and a major cleanup] Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b36930dd508e00f0c5083bcd57d25de6d0375c76 Author: David Miller Date: Wed Nov 10 21:56:39 2010 -0800 dlm: Handle application limited situations properly. In the normal regime where an application uses non-blocking I/O writes on a socket, they will handle -EAGAIN and use poll() to wait for send space. They don't actually sleep on the socket I/O write. But kernel level RPC layers that do socket I/O operations directly and key off of -EAGAIN on the write() to "try again later" don't use poll(), they instead have their own sleeping mechanism and rely upon ->sk_write_space() to trigger the wakeup. So they do effectively sleep on the write(), but this mechanism alone does not let the socket layers know what's going on. Therefore they must emulate what would have happened, otherwise TCP cannot possibly see that the connection is application window size limited. Handle this, therefore, like SUNRPC by setting SOCK_NOSPACE and bumping the ->sk_write_count as needed when we hit the send buffer limits. This should make TCP send buffer size auto-tuning and the ->sk_write_space() callback invocations actually happen. Signed-off-by: David S. Miller Signed-off-by: David Teigland commit ed1deb7021b4dfee1d544b91edff4ef92f5c3b54 Merge: 72cdd1d b3d14bf Author: David S. Miller Date: Thu Nov 11 10:43:30 2010 -0800 Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6 commit 72cdd1d971c0deb1619c5c339270570c43647a78 Author: Eric Dumazet Date: Thu Nov 11 07:14:07 2010 +0000 net: get rid of rtable->idev It seems idev field in struct rtable has no special purpose, but adding extra atomic ops. We hold refcounts on the device itself (using percpu data, so pretty cheap in current kernel). infiniband case is solved using dst.dev instead of idev->dev Removal of this field means routing without route cache is now using shared data, percpu data, and only potential contention is a pair of atomic ops on struct neighbour per forwarded packet. About 5% speedup on routing test. Signed-off-by: Eric Dumazet Cc: Herbert Xu Cc: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: David S. Miller commit 46b13fc5c0f239f36e84665c73087d5fa86bfd86 Author: Eric Dumazet Date: Thu Nov 11 06:57:19 2010 +0000 neigh: reorder struct neighbour It is important to move nud_state outside of the often modified cache line (because of refcnt), to reduce false sharing in neigh_event_send() This is a followup of commit 0ed8ddf4045f (neigh: Protect neigh->ha[] with a seqlock) This gives a 7% speedup on routing test with IP route cache disabled. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 8168bd48bb863c00747497aadf13884b2d69d287 Author: Chris Wilson Date: Thu Nov 11 17:54:52 2010 +0000 drm/i915: Remove the definitions for Primary Ring Buffer We only ever used the PRB0, neglecting the secondary ring buffers, and now with the advent of multiple engines with separate ring buffers we need to excise the anachronisms from our code (and be explicit about which ring we mean where). This is doubly important in light of the FORCEWAKE required to read ring buffer registers on SandyBridge. Signed-off-by: Chris Wilson commit e74cfed521746544e6eeee84b24bd31c1e59ffe2 Author: Chris Wilson Date: Tue Nov 9 10:16:56 2010 +0000 Revert "drm/i915/ringbuffer: Ignore failure to setup the ring on Sandybridge" This reverts commit 629e894173c9de589913cf649deaadec4b0579bd. commit cae5852dcaa1139b198e13ebd3aeb7f3c065f875 Author: Zou Nan hai Date: Tue Nov 9 17:17:32 2010 +0800 drm/i915/ringbuffer: set FORCE_WAKE bit before reading ring register Before reading ring register, set FORCE_WAKE bit to prevent GT core power down to low power state, otherwise we may read stale values. Signed-off-by: Zou Nan hai [ickle: added a udelay which seemed to do the trick on my SNB] Signed-off-by: Chris Wilson commit c0c04c2a89cf6363da2940da59afd2e30001b991 Author: Jon Mason Date: Thu Nov 11 04:26:04 2010 +0000 vxge: update driver version Update vxge driver version Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 2c91308f449c6705b81bd3370a0ec647e370f35c Author: Jon Mason Date: Thu Nov 11 04:26:03 2010 +0000 vxge: sparse and other clean-ups Correct issues found by running sparse on the vxge driver, as well as other miscellaneous cleanups. Signed-off-by: Jon Mason Signed-off-by: David S. Miller commit 1901d042abf10d08a829961a63fd158f9844587e Author: Jon Mason Date: Thu Nov 11 04:26:02 2010 +0000 vxge: update Kconfig Update Kconfig to reflect Exar's purchase of Neterion (formerly S2IO). Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit ca3e3b8fae982400dacbbf19f3112cc84e51d46a Author: Jon Mason Date: Thu Nov 11 04:26:01 2010 +0000 vxge: correct multi-function detection The values used to determined if the adapter is running in single or multi-function mode were previously modified to the values necessary when making the VXGE_HW_FW_API_GET_FUNC_MODE firmware call. However, the firmware call was not modified. This had the driver printing out on probe that the adapter was in multi-function mode when in single function mode and vice versa. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit e7935c9669c27c5d530bff634c0c15f7a602d697 Author: Jon Mason Date: Thu Nov 11 04:26:00 2010 +0000 vxge: Titan1A detection Detect if the adapter is Titan or Titan1A, and tune the driver for this hardware. Also, remove unnecessary function __vxge_hw_device_id_get. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit c3150eac9f2e5f770b09d371f7716540219a46f6 Author: Jon Mason Date: Thu Nov 11 04:25:59 2010 +0000 vxge: Handle errors in vxge_hw_vpath_fw_api Propagate the return code of the call to vxge_hw_vpath_fw_api and __vxge_hw_vpath_pci_func_mode_get. This enables the proper handling of error conditions when querying the function mode of the device during probe. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit b81b37338412e3215670641e5025c85146521dea Author: Jon Mason Date: Thu Nov 11 04:25:58 2010 +0000 vxge: add receive hardware timestamping Add support for enable/disabling hardware timestamping on receive packets via ioctl call. When enabled, the hardware timestamp replaces the FCS in the payload. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit e8ac175615b9458a00193c55617b5b8865e67817 Author: Jon Mason Date: Thu Nov 11 04:25:57 2010 +0000 vxge: add support for ethtool firmware flashing Add the ability in the vxge driver to flash firmware via ethtool. Updated to include comments from Ben Hutchings. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 8424e00dfd5282026a93996a165fc4079d382169 Author: Jon Mason Date: Thu Nov 11 04:25:56 2010 +0000 vxge: serialize access to steering control register It is possible for multiple callers to access the firmware interface for the same vpath simultaneously, resulting in uncertain output. Add locks to serialize access. Also, make functions only accessed locally static, thus requiring some movement of code blocks. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit ddd62726e0bc1ffe0ab791b647f4178161ab451b Author: Jon Mason Date: Thu Nov 11 04:25:55 2010 +0000 vxge: cleanup debug printing and asserts Remove all of the unnecessary debug printk indirection and temporary variables for vxge_debug_ll and vxge_assert. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 4d2a5b406c02b224bd3f50992c8b02450c65a730 Author: Jon Mason Date: Thu Nov 11 04:25:54 2010 +0000 vxge: Wait for Rx to become idle before reseting or closing Wait for the receive traffic to become idle before attempting to close or reset the adapter. To enable the processing of packets while Receive Idle, move the clearing of __VXGE_STATE_CARD_UP bit in vxge_close to after it. Also, modify the return value of the ISR when the adapter is down to IRQ_HANDLED. Otherwise there are unhandled interrupts for the device. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 47f01db44b2470d9517848f6b73c75883ef5fda0 Author: Jon Mason Date: Thu Nov 11 04:25:53 2010 +0000 vxge: enable rxhash Enable RSS hashing and add ability to pass up the adapter calculated rx hash up the network stack (if feature is available). Add the ability to enable/disable feature via ethtool, which requires that the adapter is not running at the time. Other miscellaneous cleanups and fixes required to get RSS working. Signed-off-by: Jon Mason Signed-off-by: Ram Vepa Signed-off-by: David S. Miller commit 6f207e9bb4219d261d9326597ca533f954f31755 Author: Feng Tang Date: Thu Nov 11 15:50:50 2010 +0000 x86: mrst: Set vRTC's IRQ to level trigger type When setting up the mpc_intsrc structure for vRTC's IRQ, we need to set its irqflag to level trigger, otherwise it will be taken as edge triggered and the vRTC IRQ will fire only once, as there is never a EOI issued from the IA core for it. The original code worked in previous kernel. This is because it was configured to level trigger type by luck. It fell into the default PCI trigger category which is level triggered. Signed-off-by: Feng Tang Signed-off-by: Alan Cox LKML-Reference: <20101111155019.12924.569.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 8af27e1dc4e4dd7a7b04c2cd0fc3d419d91d45b0 Author: Eric Dumazet Date: Tue Nov 9 16:29:27 2010 +0100 fixdep: use hash table instead of a single array I noticed fixdep uses ~2% of cpu time in kernel build, in function use_config() fixdep spends a lot of cpu cycles in linear searches in its internal string array. With about 400 stored strings per dep file, this begins to be noticeable. Convert fixdep to use a hash table. kbuild results on my x86_64 allmodconfig Before patch : real 10m30.414s user 61m51.456s sys 8m28.200s real 10m12.334s user 61m50.236s sys 8m30.448s real 10m42.947s user 61m50.028s sys 8m32.380s After: real 10m8.180s user 61m22.506s sys 8m32.384s real 10m35.039s user 61m21.654s sys 8m32.212s real 10m14.487s user 61m23.498s sys 8m32.312s Signed-off-by: Eric Dumazet Signed-off-by: Michal Marek commit 5cdc5c3e6e13ed0631812245332f8f7a25a1a4b7 Merge: a7f387d bbde781 Author: Mark Brown Date: Thu Nov 11 16:00:49 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit a7f387d5afd5e1102f909ab611370014f1f59ae2 Author: Dimitris Papastamos Date: Thu Nov 11 10:04:59 2010 +0000 ASoC: soc-cache: Add support for rbtree based register caching This patch adds support for rbtree compression when storing the register cache. It does this by not adding any uninitialized registers (those whose value is 0). If any of those registers is written with a nonzero value they get added into the rbtree. Consider a sample device with a large sparse register map. The register indices are between [0, 0x31ff]. An array of 12800 registers is thus created each of which is 2 bytes. This results in a 25kB region. This array normally lives outside soc-core, normally in the driver itself. The original soc-core code would kmemdup this region resulting in 50kB total memory. When using the rbtree compression technique and __devinitconst on the original array the figures are as follows. For this typical device, you might have 100 initialized registers, that is registers that are nonzero by default. We build an rbtree with 100 nodes, each of which is 24 bytes. This results in ~2kB of memory. Assuming that the target arch can freeup the memory used by the initial __devinitconst array, we end up using about ~2kB bytes of actual memory. The memory footprint will increase as uninitialized registers get written and thus new nodes created in the rbtree. In practice, most of those registers are never changed. If the target arch can't freeup the __devinitconst array, we end up using a total of ~27kB. The difference between the rbtree and the LZO caching techniques, is that if using the LZO technique the size of the cache will increase slower as more uninitialized registers get changed. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit cc28fb8e7d55d4d7c1661dc0b236f4faddecdd9e Author: Dimitris Papastamos Date: Thu Nov 11 10:04:58 2010 +0000 ASoC: soc-cache: Add support for LZO register caching This patch adds support for LZO compression when storing the register cache. The initial register defaults cache is marked as __devinitconst and the only change required for a driver to use LZO compression is to set the compress_type member in codec->driver to SND_SOC_LZO_COMPRESSION. For a typical device whose register map would normally occupy 25kB or 50kB by using the LZO compression technique, one can get down to ~5-7kB. There might be a performance penalty associated with each individual read/write due to decompressing/compressing the underlying cache, however that should not be noticeable. These memory benefits depend on whether the target architecture can get rid of the memory occupied by the original register defaults cache which is marked as __devinitconst. Nevertheless there will be some memory gain even if the target architecture can't get rid of the original register map, this should be around ~30-32kB instead of 50kB. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 7a30a3db34cc7b2180a1a6c4a51d19d93c8a8b80 Author: Dimitris Papastamos Date: Thu Nov 11 10:04:57 2010 +0000 ASoC: soc-cache: Add support for flat register caching This patch introduces the new caching API and migrates the old caching interface into the new one. The flat register caching technique does not use compression at all and it is equivalent to the old caching technique. One can still access codec->reg_cache directly but this is not advised as that will not be portable across different caching strategies. None of the existing drivers need to be changed to adapt to this caching technique. There should be no noticeable overhead associated with using the new caching API. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit e86c2412c88fbe4676920c40348d3c547c9edb0d Author: maximilian attems Date: Fri Oct 29 15:55:50 2010 +0200 kbuild, deb-pkg: Fix build with paranoid umask umask 077 make deb-pkg dpkg-deb: building package `linux-image-2.6.36+' in `../linux-image-2.6.36+_2.6.36+-4_amd64.deb'. dpkg-deb: control directory has bad permissions 700 (must be >=0755 and <=0775) make[1]: *** [deb-pkg] Error 2 Reported-by: Bastian Blank Signed-off-by: maximilian attems Signed-off-by: Michal Marek commit 84e909303dbd3c8d882f152c17d1319f2873e147 Author: Mark Brown Date: Thu Nov 4 00:07:02 2010 -0400 ASoC: Add DAPM trace events Trace events for DAPM allow us to monitor the performance and behaviour of DAPM with logging which can be built into the kernel permanantly, is more suited to automated analysis and display and less likely to suffer interference from other logging activity. Currently trace events are generated for: - Start and stop of DAPM processing - Start and stop of bias level changes - Power decisions for widgets - Widget event execution start and stop giving some view as to what is happening and where latencies occur. Actual changes in widget power can be seen via the register write trace in soc-core. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a8b1d34f3ee1bc139ac5fbe3f84f6d16c90136bb Author: Mark Brown Date: Wed Nov 3 18:05:58 2010 -0400 ASoC: Add trace events for ASoC register read/write The trace subsystem provides a convenient way of instrumenting the kernel which can be left on all the time with extremely low impact on the system unlike prints to the kernel log which can be very spammy. Begin adding support for instrumenting ASoC via this interface by adding trace for the register access primitives. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 68f89ad8c233a88b10404c5fd8a1109d12999962 Author: Mark Brown Date: Wed Nov 3 23:51:49 2010 -0400 ASoC: Factor out boiler plate for DAPM event generation Make the DAPM sequence execution look a bit nicer by factoring out the code to invoke an event into a single function since it's all the same pretty much. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit ad78acafeed26f62c9e644f96eecb7c19bd78bb4 Author: Alexey Charkov Date: Sun Nov 7 19:28:55 2010 +0300 usb: Add support for VIA VT8500 and compatibles in EHCI HCD VIA and WonderMedia Systems-on-Chip feature a standard EHCI host controller. This adds necessary glue to use the standard driver with these systems. Signed-off-by: Alexey Charkov Signed-off-by: Greg Kroah-Hartman commit 8be8a9d3d16a25645b7869e4544a9d0ec386966a Author: Tatyana Brokhman Date: Mon Nov 1 17:38:05 2010 +0200 usb: dummy_hcd code simplification Take handling of the control requests out from dummy_timer to a different function. Signed-off-by: Tatyana Brokhman Signed-off-by: Greg Kroah-Hartman commit 0eadcc09203349b11ca477ec367079b23d32ab91 Author: Tatyana Brokhman Date: Mon Nov 1 18:18:24 2010 +0200 usb: USB3.0 ch11 definitions Adding hub SuperSpeed usb definitions as defined by ch10 of the USB3.0 spec. Signed-off-by: Tatyana Brokhman Signed-off-by: Greg Kroah-Hartman commit b73af61e3283068f680e58e091ceafcb88d74b22 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:23 2010 +0200 USB: gadget: f_mass_storage: code style clean ups This commit is purely style clean ups. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 00cb636ed87a65b512012ea4236348af19daef1e Author: Michal Nazarewicz Date: Thu Oct 28 17:31:22 2010 +0200 USB: gadget: f_mass_storage: remove needless complete() This commit removes call to the complete() function done in fsg_unbind() which was never needed there but was a leftover form file_storage.c. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit fe52f7922c446b2f604ef609153f1cef0ea17278 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:21 2010 +0200 USB: gadget: f_mass_storage: drop START_TRANSFER() macro This commit drops START_TRANSFER_OR() and START_TRANSFER() macros with a pair of nice inline functions which are actually more readable and easier to use. Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 1ccd7923fe521273d63d936129754e71a33ebe51 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:20 2010 +0200 USB: gadget: f_mass_storage: use ?: instead of a macro This commit removes an "OR" macro defined in Mass Storage Function in favour of a two argument version of "?:" operator (which is a GCC extension). Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit 17a936117c587c23aafafdb9cd6d433a90daa83d Author: Rahul Ruikar Date: Thu Oct 28 17:31:19 2010 +0200 USB: gadget: f_mass_storage: put_device() in error recovery This commit fixes an issue with error recovery after device_register() fails in Mass Storage Function. The device needs to be put to avoid resource leakage. Signed-off-by: Rahul Ruikar [mina86@mina86.com: updated commit message] Signed-off-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit d9385b6352da7fed50981f375c2ccb60354039a6 Author: Michal Nazarewicz Date: Thu Oct 28 17:31:18 2010 +0200 USB: gadget: file_storage: put_device() in error recovery This commit fixes some issues with File-backed Storage Gadget error recovery when registering LUN's devices. First of all, when device_register() fails the device still needs to be put. However, because lun_release() decreases fsg->ref reference counter the counter must be incremented beforehand. Second of all, after any of the device_create_file()s fails, device_unregister() is called which in turn (indirectly) calls lun_release() which decrements fsg->ref. So, again, the reference counter must be incremented beforehand. Lastly, if the first or the second device_create_file() succeeds, the files are never removed. To fix it, device_remove_file() needs to be called. This is done by simply marking LUN as registered prior to creating files so that fsg_unbind() can handle removing files. Signed-off-by: Michal Nazarewicz Reported-by: Rahul Ruikar Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 78bff3c65df33da47e93736bd8847b694084e5a9 Author: Marek Belisko Date: Wed Oct 27 10:19:01 2010 +0200 USB: gadget: composite: Typo fix. Signed-off-by: Marek Belisko Acked-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 8b455561d28bcfac17d6910e64c616cf684da07f Author: Julia Lawall Date: Tue Oct 26 12:25:31 2010 +0200 USB: gadget: amd5536udc.c: delete double assignment Delete successive assignments to the same location. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression i; @@ *i = ...; i = ...; // Signed-off-by: Julia Lawall Acked-by: Thomas Dahlmann Signed-off-by: Greg Kroah-Hartman commit 06c3859fc9bd62edb7211b241eadd0cdc8ecbecd Author: Uwe Kleine-König Date: Mon Oct 25 16:30:12 2010 +0200 usb: gadget/imx-udc: remove usage of deprecated symbol USBD_INT0 Since v2.6.34-rc2~66^2~5^2~47 USBD_INT0 is deprecated in favour of MX1_USBD_INT0. So use the new name. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit f7043ecbb3f7b8632a6d6470f8f95160ac868d0f Author: Bill Pemberton Date: Thu Oct 21 14:43:05 2010 -0400 USB: ssu100: remove max_packet_size calculation The max_packet_size logic is taken from ftdi_sio, but it's not needed for this device. This also makes proces_read_urb simpler. Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman commit 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b Author: Brett Rudley Date: Wed Nov 10 17:19:41 2010 -0800 staging: brcm80211: Remove unused module parameters. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 86071535f845fd054753122e564cee9406c84e70 Author: Vinod Koul Date: Wed Nov 10 17:40:48 2010 +0000 x86: mrst: Add audio driver bindings This patch adds the sound card bindings for Moorestown (pmic_audio) and the Medfield platform (msic_audio) as IPC devices. This ensures they will be created at the right time. Signed-off-by: Vinod Koul Signed-off-by: Alan Cox LKML-Reference: <20101110174044.11340.78008.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 0146f26145af75d53e12dbf23a36996aff373680 Author: Feng Tang Date: Wed Nov 10 17:29:17 2010 +0000 rtc: Add drivers/rtc/rtc-mrst.c Provide the standard kernel rtc driver interface on top of the vrtc layer added in the previous patch. Signed-off-by: Feng Tang LKML-Reference: <20101110172911.3311.20593.stgit@localhost.localdomain> [Fixed swapped arguments on IPC] Signed-off-by: Arjan van de Ven [Cleaned up and the device creation moved to arch/x86/platform] Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit 7309282c90d251cde77fe3b520a8276e25315c49 Author: Feng Tang Date: Wed Nov 10 17:29:00 2010 +0000 x86: mrst: Add vrtc driver which serves as a wall clock device Moorestown platform doesn't have a m146818 RTC device like traditional x86 PC, but a firmware emulated virtual RTC device(vrtc), which provides some basic RTC functions like get/set time. vrtc serves as the only wall clock device on Moorestown platform. [ tglx: Changed the exports to _GPL ] Signed-off-by: Feng Tang Signed-off-by: Jacob Pan Signed-off-by: Alan Cox LKML-Reference: <20101110172837.3311.40483.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit cfb505a7ebd4c84206b4cc7d9f966d864a2ac05a Author: Alek Du Date: Wed Nov 10 16:50:08 2010 +0000 x86: mrst: Add Moorestown specific reboot/shutdown support Moorestowns needs to use a special IPC command to reboot or shutdown the platform. Signed-off-by: Alek Du Signed-off-by: Alan Cox LKML-Reference: <20101110164928.6365.94243.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 34db1d595ef6f183fbc1e42cda45a3dfa0035258 Author: Kay Sievers Date: Thu Nov 11 09:58:57 2010 +0100 block: export 'ro' sysfs attribute for partitions We already export 'ro' for the disk. This adds the same attribute for partitions. Cc: Karel Zak Signed-off-by: Kay Sievers Signed-off-by: Jens Axboe commit 527f9e907c39f7e88abb57eaa8bccb43c8706a3d Author: Chris Wilson Date: Thu Nov 11 01:16:58 2010 +0000 drm/i915: Remove the global irq wait queue ... as it has been replaced by per-ring waiters. Signed-off-by: Chris Wilson commit 6174c3496d43b78969d4a989e1aabfbc55acbf15 Author: Greg Kroah-Hartman Date: Wed Nov 10 17:08:26 2010 -0800 Revert "staging: batman-adv: Use linux/etherdevice.h address helper functions" This reverts commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c. Turns out the batman maintainers didn't like the implementation of it, and the original author was going to rework it to meet their approval, and I applied it without fully realizing all of this. My fault. Cc: Marek Lindner Cc: Simon Wunderlich Cc: Andrew Lunn Cc: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 319684b1cd15f24120b9513b38a949539c0b7938 Author: Brandon Philips Date: Sat Nov 6 21:19:22 2010 -0400 driver core: fix whitespace in class_attr_string 869dfc875e3 addded a long line and indented with spaces. Fix. Signed-off-by: Brandon Philips Signed-off-by: Greg Kroah-Hartman commit 3701befc44eb9b0e5a0e0b7169448658919b9850 Author: Jesper Juhl Date: Wed Nov 10 21:31:38 2010 +0100 Staging, bcm: Remove unnecessary casts of void ptr returning alloc function return values Here's a patch against a copy of linux-next that I just cloned. Don't pointlessly cast pointers returned by allocation functions that return void pointers which are implicitly converted. For drivers/staging/bcm/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit afabbe6db368fbed0569d31d402aceb631d9f854 Author: facugaich Date: Wed Nov 10 10:39:33 2010 -0300 Staging: solo6x10: Fix checkpatch errors and most warnings This patch fixes all errors and most warnings reported by checkpatch.pl for all the files in the driver. v2: Fix a typo and update the patch against the latest HEAD Signed-off-by: Facundo Gaich Signed-off-by: Greg Kroah-Hartman commit 16618c20e18d60b2c8908b7758228a62a450769a Author: Alejandro R. Sedeño Date: Wed Nov 10 01:42:02 2010 -0500 Staging: beceem: Move ZTE TU25's USB id to the beceem module Signed-off-by: Alejandro R. Sedeño Signed-off-by: Greg Kroah-Hartman commit b706113f1475ce983faabf12120ac4e90d512d02 Author: Alejandro R. Sedeño Date: Wed Nov 10 01:42:01 2010 -0500 Staging: beceem: Use 32-bit integers for hardware register values Switching to UINT because that's what the rest of this codebase uses. Signed-off-by: Alejandro R. Sedeño Signed-off-by: Greg Kroah-Hartman commit 2dab1ac81b4767095f96503a9ac093a68c6e9c95 Author: Marek Belisko Date: Wed Nov 10 10:04:30 2010 +0100 staging: ft1000: Create common return point. When reg_ft1000_netdev() fails created kthread isn't stopped. So add return point for stopping thread. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c8b124e21dbb7f4941f292fea446ce63d92d80dd Author: Marek Belisko Date: Wed Nov 10 09:29:35 2010 +0100 staging: ft1000: Check return value of kthread_run. kthread_run could fail so we will check return value. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit a10bb4fb199bd7a1dc178a6228ad749f5070e0f9 Author: Larry Finger Date: Tue Nov 9 18:26:34 2010 -0600 staging: r8712u: Update TODO for sparse fixes Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 6036f373ea03687d355634fa70fb04baa95ab75e Author: Kees Cook Date: Wed Nov 10 10:35:54 2010 -0800 x86, cpu: Only CPU features determine NX capabilities Fix the NX feature boot warning when NX is missing to correctly reflect that BIOSes cannot disable NX now. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-5-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit ebba638ae723d8a8fc2f7abce5ec18b688b791d7 Author: Kees Cook Date: Wed Nov 10 10:35:53 2010 -0800 x86, cpu: Call verify_cpu during 32bit CPU startup The XD_DISABLE-clearing side-effect needs to happen for both 32bit and 64bit, but the 32bit init routines were not calling verify_cpu() yet. This adds that call to gain the side-effect. The longmode/SSE tests being performed in verify_cpu() need to happen very early for 64bit but not for 32bit. Instead of including it in two places for 32bit, we can just include it once in arch/x86/kernel/head_32.S. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-4-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit ae84739c27b6b3725993202fe02ff35ab86468e1 Author: Kees Cook Date: Wed Nov 10 10:35:52 2010 -0800 x86, cpu: Clear XD_DISABLED flag on Intel to regain NX Intel CPUs have an additional MSR bit to indicate if the BIOS was configured to disable the NX cpu feature. This bit was traditionally used for operating systems that did not understand how to handle the NX bit. Since Linux understands this, this BIOS flag should be ignored by default. In a review[1] of reported hardware being used by Ubuntu bug reporters, almost 10% of systems had an incorrectly configured BIOS, leaving their systems unable to use the NX features of their CPU. This change will clear the MSR_IA32_MISC_ENABLE_XD_DISABLE bit so that NX cannot be inappropriately controlled by the BIOS on Intel CPUs. If, under very strange hardware configurations, NX actually needs to be disabled, "noexec=off" can be used to restore the prior behavior. [1] http://www.outflux.net/blog/archives/2010/02/18/data-mining-for-nx-bit/ Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-3-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit c5cbac69422a9bffe7c7fd9a115130e272b547f5 Author: Kees Cook Date: Wed Nov 10 10:35:51 2010 -0800 x86, cpu: Rename verify_cpu_64.S to verify_cpu.S The code is 32bit already, and can be used in 32bit routines. Signed-off-by: Kees Cook LKML-Reference: <1289414154-7829-2-git-send-email-kees.cook@canonical.com> Acked-by: Pekka Enberg Acked-by: Alan Cox Signed-off-by: H. Peter Anvin commit 5d97eb69bd4767ce9973360881fa6ad161510fb0 Author: Chris Wilson Date: Wed Nov 10 20:40:02 2010 +0000 drm/i915: Only add the lazy request if we end up waiting for it. Signed-off-by: Chris Wilson commit b3d14bff12a38ad13a174eb0cc83d2ac7169eee4 Author: Gerrit Renker Date: Wed Nov 10 21:21:35 2010 +0100 dccp ccid-2: Implementation of circular Ack Vector buffer with overflow handling This completes the implementation of a circular buffer for Ack Vectors, by extending the current (linear array-based) implementation. The changes are: (a) An `overflow' flag to deal with the case of overflow. As before, dynamic growth of the buffer will not be supported; but code will be added to deal robustly with overflowing Ack Vector buffers. (b) A `tail_seqno' field. When naively implementing the algorithm of Appendix A in RFC 4340, problems arise whenever subsequent Ack Vector records overlap, which can bring the entire run length calculation completely out of synch. (This is documented on http://www.erg.abdn.ac.uk/users/gerrit/dccp/notes/\ ack_vectors/tracking_tail_ackno/ .) (c) The buffer length is now computed dynamically (i.e. current fill level), as the span between head to tail. As a result, dccp_ackvec_pending() is now simpler - the #ifdef is no longer necessary since buf_empty is always true when IP_DCCP_ACKVEC is not configured. Signed-off-by: Gerrit Renker commit 7d870936602533836bba821bd5c679c62c52a95f Author: Gerrit Renker Date: Wed Nov 10 21:21:02 2010 +0100 dccp ccid-2: Separate internals of Ack Vectors from option-parsing code This patch * separates Ack Vector housekeeping code from option-insertion code; * shifts option-specific code from ackvec.c into options.c; * introduces a dedicated routine to take care of the Ack Vector records; * simplifies the dccp_ackvec_insert_avr() routine: the BUG_ON was redundant, since the list is automatically arranged in descending order of ack_seqno. Signed-off-by: Gerrit Renker commit f17a37c9b8c4b32c01e501a84fa6f30e344c6110 Author: Gerrit Renker Date: Wed Nov 10 21:20:07 2010 +0100 dccp ccid-2: Ack Vector interface clean-up This patch brings the Ack Vector interface up to date. Its main purpose is to lay the basis for the subsequent patches of this set, which will use the new data structure fields and routines. There are no real algorithmic changes, rather an adaptation: (1) Replaced the static Ack Vector size (2) with a #define so that it can be adapted (with low loss / Ack Ratio, a value of 1 works, so 2 seems to be sufficient for the moment) and added a solution so that computing the ECN nonce will continue to work - even with larger Ack Vectors. (2) Replaced the #defines for Ack Vector states with a complete enum. (3) Replaced #defines to compute Ack Vector length and state with general purpose routines (inlines), and updated code to use these. (4) Added a `tail' field (conversion to circular buffer in subsequent patch). (5) Updated the (outdated) documentation for Ack Vector struct. (6) All sequence number containers now trimmed to 48 bits. (7) Removal of unused bits: * removed dccpav_ack_nonce from struct dccp_ackvec, since this is already redundantly stored in the `dccpavr_ack_nonce' (of Ack Vector record); * removed Elapsed Time for Ack Vectors (it was nowhere used); * replaced semantics of dccpavr_sent_len with dccpavr_ack_runlen, since the code needs to be able to remember the old run length; * reduced the de-/allocation routines (redundant / duplicate tests). Signed-off-by: Gerrit Renker commit 0c6202b3278b417444a59cecc59e6e5af04db7fd Author: Ron Mercer Date: Wed Nov 10 09:29:46 2010 +0000 qlge: Version change to v1.00.00.27 Signed-off-by: Jitendra Kalsaria Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 673483c7d3a25c43d1208bb07e3888bc5136e8cf Author: Ron Mercer Date: Wed Nov 10 09:29:45 2010 +0000 qlge: Add firmware info to ethtool get regs. By default we add firmware information to ethtool get regs. Optionally firmware info can instead be sent to log. Signed-off-by: Jitendra Kalsaria Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 00fb0d98add90480f60db2d1701ef2bb68a73797 Merge: fd8d3bc 0049317 Author: Mark Brown Date: Wed Nov 10 15:41:12 2010 +0000 Merge branch 'for-2.6.37' into for-2.6.38 commit fd8d3bc09033a275d08536c698309e18ee3c14bf Author: Jarkko Nikula Date: Tue Nov 9 14:40:28 2010 +0200 ASoC: Convert pop_dbg to use dev_info Prints from pop_dbg are enabled when dapm_pop_time != 0. Convert it to use dev_info so that parent device of DAPM context is printed. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit f7d41ae8361fb2d16fe059f65075d92c4efe562c Author: Jarkko Nikula Date: Tue Nov 9 14:40:27 2010 +0200 ASoC: Update DAPM debug and error prints Switch printk and pr_ prints to dev_ variants. It is helpful to see parent device of DAPM context especially when there are multiple DAPM contexts (codecs currently). This is mostly simple conversion. Exceptions are in snd_soc_dapm_set_pin that prints also pin state, uniform "dapm: unknown pin" error prints from snd_soc_dapm_set_pin, snd_soc_dapm_force_enable_pin and snd_soc_dapm_ignore_suspend, and pop_dbg which is converted by an another patch. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5bdb05f91b27b9361c4f348a4e05999f597df72e Author: Darren Hart Date: Mon Nov 8 13:40:28 2010 -0800 futex: Add futex_q static initializer The futex_q struct has grown considerably over the last couple years. I believe it now merits a static initializer to avoid uninitialized data errors (having spent more time than I care to admit debugging an uninitialized q.bitset in an experimental new op code). With the key initializer built in, several of the FUTEX_KEY_INIT calls can be removed. V2: use a static variable instead of an init macro. use a C99 initializer and don't rely on variable ordering in the struct. V3: make futex_q_init const Signed-off-by: Darren Hart Cc: Peter Zijlstra Cc: Eric Dumazet Cc: John Kacur Cc: Ingo Molnar LKML-Reference: <1289252428-18383-1-git-send-email-dvhart@linux.intel.com> Signed-off-by: Thomas Gleixner commit b41277dc7a18ee332d9e8078e978bacdf6e76157 Author: Darren Hart Date: Mon Nov 8 13:10:09 2010 -0800 futex: Replace fshared and clockrt with combined flags In the early days we passed the mmap sem around. That became the "int fshared" with the fast gup improvements. Then we added "int clockrt" in places. This patch unifies these options as "flags". [ tglx: Split out the stale fshared cleanup ] Signed-off-by: Darren Hart Cc: Peter Zijlstra Cc: Eric Dumazet Cc: John Kacur Cc: Ingo Molnar LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com> Signed-off-by: Thomas Gleixner commit ae791a2d2e382adc69990a144a7f1a6c4bc24f1e Author: Thomas Gleixner Date: Wed Nov 10 13:30:36 2010 +0100 futex: Cleanup stale fshared flag interfaces The fast GUP changes stopped using the fshared flag in put_futex_keys(), but we kept the interface the same. Cleanup all stale users. This patch is split out from Darren Harts combo patch which also combines various flags. This way the changes are clearly separated. Signed-off-by: Thomas Gleixner Cc: Darren Hart LKML-Reference: <1289250609-16304-1-git-send-email-dvhart@linux.intel.com> commit 33d2323711059d14fd675fa7def317e560fa787e Author: Chris Wilson Date: Wed Nov 10 13:59:09 2010 +0000 drm/i915: Unconditionally get the fence reg when pinning scanout We use i915_gem_object_get_fence_reg() to do LRU tracking of the fence registers, so stop trying to be too clever when pinning the fb->obj. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit c7657ac0c3e4d4ab569296911164b7a2b0ff871a Author: Borislav Petkov Date: Mon Nov 1 23:36:53 2010 +0100 x86, microcode, AMD: Cleanup code a bit get_ucode_data is a memcpy() wrapper which always returns 0. Move it into the header and make it an inline. Remove all code checking its return value and turn it into a void. There should be no functionality change resulting from this patch. Signed-off-by: Borislav Petkov commit 1ea6be212eea5ce1e8fabadacb0c639ad87b2f00 Author: Jesper Juhl Date: Mon Nov 1 22:44:34 2010 +0100 x86, microcode, AMD: Replace vmalloc+memset with vzalloc We don't have to do memset() ourselves after vmalloc() when we have vzalloc(), so change that in arch/x86/kernel/microcode_amd.c::get_next_ucode(). Signed-off-by: Jesper Juhl Signed-off-by: Borislav Petkov commit 7decaa557a20f48aabef35f817ec16ef563567b0 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:35:54 2010 +0100 ARM: 6454/1: sa1100: Fix for a nasty initialization bug in the RTSR. This patch fixes a nasty initialization condition on the RTSR register. Sometimes, bit 1 will wake up set, sometimes not. This can be seen by checking the value of the RTSR by typing '$ cat /proc/driver/rtc', which has been provided by the previous patch. If this bit is set, the command '$ cat /dev/rtc0' will lock the system in an endless interrupt routine calling loop. This patch fixes the issue both at sa1100_rtc_probe(), where it avoids a spurious interrupt from happening, and at sa1100_rtc_interrupt(), which is the robust solution, though it does not avoid the first spurious interrupt. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit fd3ee6d3421bc05ce42ee7f48071aee72051af28 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:34:47 2010 +0100 ARM: 6453/1: sa1100: Print the value of RTSR on /proc/drivers/rtc. This patch adds a line to the output of /proc/drivers/rtc to show the value of the RTSR register. It will be used to demonstrate a nasty initialization bug that will be fixed in the sequence. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit a404ad1ff593589bdd34c48ebecddada9edbfaf3 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:33:53 2010 +0100 ARM: 6452/1: Fix checkpatch.pl issues in drivers/rtc/rtc-sa1100.c. This patch fixes checkpatch.pl issues in drivers/rtc/rtc-sa1100.c, which I will later modify. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit d03f322c41890a86bf64d00314f0ec72738a7f21 Author: Marcelo Roberto Jimenez Date: Mon Oct 18 22:31:26 2010 +0100 ARM: 6450/1: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. This patch fixes checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. Signed-off-by: Marcelo Roberto Jimenez Signed-off-by: Russell King commit 34177802001894e064c857cac2759f68119550cd Author: Linus Walleij Date: Tue Oct 19 12:43:58 2010 +0100 ARM: 6438/2: mmci: add SDIO support for ST Variants This adds some minor variant data and trickery to enable SDIO on the ST Micro variants of MMCI/PL180. Signed-off-by: Marcin Mielczarczyk Signed-off-by: Linus Walleij Signed-off-by: Russell King commit f20f8f21e0402c785c342547f7e49eafc42cfb52 Author: Linus Walleij Date: Tue Oct 19 13:41:24 2010 +0100 ARM: 6399/3: mmci: handle broken MCI_DATABLOCKEND hardware On the U300 the MCI_DATAEND and MCI_DATABLOCKEND IRQs can arrive out-of-order. Replace an ugly #ifdef hack with a proper runtime solution which models what is really happening. In the U300 DMA mode and on all Ux500 models, the MCI_DATABLOCKEND flag isn't properly cleared in hardware following and ACK leading to all kind of weird behaviour when the flag is still up in subsequent interrupts, so we add two flags indicating the error and handle this runtime. Cc: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 2686b4b408c25349aee7b35558722d5730d67224 Author: Linus Walleij Date: Tue Oct 19 12:39:48 2010 +0100 ARM: 6311/2: mmci: work with only one irq The DBx500 variants have only one IRQ line hooked up. Allow these (and any other implementations which choose to use only one irq) to work by directing the PIO interrupts also to the first IRQ line. Signed-off-by: Rabin Vincent Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 5e4f083f78d03e9f8d2e327daccde16976f9bb00 Author: Yong Zhang Date: Sun Oct 24 11:50:53 2010 +0800 hrtimer: Remove stale comment on curr_timer curr_timer doesn't resident in struct hrtimer_cpu_base anymore. Signed-off-by: Yong Zhang LKML-Reference: <1287892253-2587-1-git-send-email-yong.zhang0@gmail.com> Signed-off-by: Thomas Gleixner commit 12ddf37444eaaf67b147561141150e10a56d7742 Merge: dc7c0b6 c724d07 Author: Paul Mundt Date: Wed Nov 10 18:34:49 2010 +0900 Merge branch 'common/fbdev' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6 commit da1d39e3903bc35be2b5e8d2116fdd5d337244d4 Author: Simon Horman Date: Tue Nov 9 17:47:02 2010 +0900 mmc, sh: Move constants to sh_mmcif.h This moves some constants from sh_mmcif.c to sh_mmcif.h so that they can be used in sh_mmcif_boot_init(). It also alters the definition of SOFT_RST_OFF from (0 << 31) to ~SOFT_RST_ON (= ~(1 << 31)). The former seems bogus. The latter is consistent with the code in sh_mmcif_boot_init(). Cc: Yusuke Goda Cc: Magnus Damm Signed-off-by: Simon Horman Signed-off-by: Paul Mundt commit 3cf9b85b474e656a0856b88290c7a289ac5ea247 Author: Joe Perches Date: Fri Nov 5 16:12:38 2010 -0700 locking, lockdep: Convert sprintf_symbol to %pS Signed-off-by: Joe Perches Cc: Peter Zijlstra Cc: Jiri Kosina LKML-Reference: <1288998760-11775-6-git-send-email-joe@perches.com> Signed-off-by: Ingo Molnar commit f6cd24777513fcc673d432cc29ef59881d3e4df1 Author: Eric Dumazet Date: Thu Nov 4 11:13:48 2010 +0100 irq: Better struct irqaction layout We currently use kmalloc-96 slab for struct irqaction allocations on 64bit arches. This is unfortunate because of possible false sharing and two cache lines accesses. Move 'name' and 'dir' fields at the end of the structure, and force a suitable alignement. Hot path fields now use one cache line on x86_64. Signed-off-by: Eric Dumazet Reviewed-by: Andi Kleen Cc: Peter Zijlstra LKML-Reference: <1288865628.2659.69.camel@edumazet-laptop> Signed-off-by: Thomas Gleixner commit 640dcfa0ff49ea1fcddad39e7c468683d9f00342 Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:34 2010 +0000 ARM: mach-shmobile: optimize PLLC2 frequency for HDMI On ap4evb PLLC2 is only used as a parent of the HDMI clock, therefore it can be reconfigured freely to improve HDMI clock precision. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c724d07a56e60e91b0aa75193f86fb000545ffe4 Author: Paul Mundt Date: Wed Nov 10 17:54:20 2010 +0900 fbdev: sh_mobile_hdmi: fix up compiler warnings. CC drivers/video/sh_mobile_hdmi.o drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_avi_infoframe_setup': drivers/video/sh_mobile_hdmi.c:539: warning: unused variable 'var' drivers/video/sh_mobile_hdmi.c: In function 'sh_hdmi_clk_configure': drivers/video/sh_mobile_hdmi.c:1021: warning: unused variable 'pdata' Signed-off-by: Paul Mundt commit 830539d14379d0f5cb07832a3e4466418011f843 Author: Paul Mundt Date: Wed Nov 10 17:51:44 2010 +0900 fbdev: sh_mobile_lcdcfb: fix up compiler warnings. CC drivers/video/sh_mobile_lcdcfb.o drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_check_var': drivers/video/sh_mobile_lcdcfb.c:922: warning: format '%u' expects type 'unsigned int', but argument 11 has type 'long unsigned int' Signed-off-by: Paul Mundt commit 0ea2af1c15b730dba9ce741420352d298bcd7862 Author: Guennadi Liakhovetski Date: Thu Nov 4 11:06:17 2010 +0000 fbdev: sh_mobile_hdmi: add support for 1080p modes Add support for 3 more preprogrammed video modes: 1080p at 24, 50, and 60Hz. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit d2ecbab5960d9814a269d36723647d6ef391ba8f Author: Guennadi Liakhovetski Date: Thu Nov 4 11:06:06 2010 +0000 fbdev: sh_mobile_lcdc: increase maximum framebuffer size to support 1080p LCDC hardware can support 1920x1080 formats, adjust the driver to cover them. Besides, instead of guessing some "reasonable" validity checks, only verify values in .fb_check_var(), that we are sure, we cannot support. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 8c183ecee23991dd6c0476a537c6bae8afd2567e Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:20 2010 +0000 fbdev: sh_mobile_hdmi: improve support for more video modes Configure pre-programmed VIC modes for VGA (640x480@60) and 720x576@50 modes, change PHY mode selection to be based on pixel clock frequency. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit c36940e678fc30779c99246c034deca1fed61ae4 Author: Guennadi Liakhovetski Date: Tue Nov 2 11:27:16 2010 +0000 fbdev: sh_mobile_hdmi: add support for more precise HDMI clock configuration The HDMI clock has to be reconfigured for different video modes. However, the precision of the supplying SoC clock on SH-Mobile systems is often insufficient. This patch allows to additionally reconfigure the parent clock to achieve the optimal HDMI clock frequency, in case this is supported by the platform. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit eae6cb31d890e2860f9ce1b8ba73c27b6005af68 Author: Grant Likely Date: Thu Oct 14 09:32:53 2010 -0600 spi/xilinx: merge OF support code into main driver Now that the of_platform_bus_type has been merged with the platform bus type, a single platform driver can handle both OF and non-OF use cases. This patch merges the OF support into the platform driver. Signed-off-by: Grant Likely Tested-by: Michal Simek commit 8fd8821b62397f8ddb7bfb23c3246a22770ab2ee Author: Grant Likely Date: Thu Oct 14 09:04:29 2010 -0600 spi/xilinx: fold platform_driver support into main body This patch merges the platform driver support into the main body of xilinx_spi.c in preparation for merging the OF and non-OF support code. Signed-off-by: Grant Likely Tested-by: Michal Simek commit 91565c4068042b3d8e37e64e393ca105476419bd Author: Grant Likely Date: Thu Oct 14 08:54:55 2010 -0600 spi/xilinx: Eliminate pdata references from common code. The current code has the OF binding modifying the platform_data pointer which it must not do, and the common code doesn't really need to use a pdata pointer. This patch eliminates the platform_data references from the common part of the driver in preparation for merging the OF and non-OF versions. Signed-off-by: Grant Likely Tested-by: Michal Simek commit dc7c0b6a6d28b0de231728de963ed53a9cee85cf Merge: d6ff7d0 b884a94 Author: Paul Mundt Date: Wed Nov 10 12:04:41 2010 +0900 Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6 commit 0a1c62dedc6e28a1117b00c4ccb4427bc91b9f29 Author: Jesper Juhl Date: Tue Nov 9 00:10:35 2010 +0100 staging, spectra: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/staging/spectra/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 5ef3df5b9fed56e64e8544e36a175354d38d0206 Author: Jesper Juhl Date: Tue Nov 9 00:10:44 2010 +0100 staging, wlags49_h2: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/staging/wlags49_h2/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 3c4e9c84970e555a80a4c92a5a3d3125c63f0e12 Author: Jesper Juhl Date: Tue Nov 9 00:09:38 2010 +0100 staging, ath6kl: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/staging/ath6kl/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 131a14b3f0330a844f79c6b87c0fe57ec86faf62 Author: Jesper Juhl Date: Tue Nov 9 00:10:25 2010 +0100 staging, rt2860: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/staging/rt2860/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 60a1d01bcd348ae1c791260d2df564d9ffc1ac97 Author: Jesper Juhl Date: Tue Nov 9 00:10:15 2010 +0100 staging, keucr: Remove unnecessary casts of void ptr returning alloc function return values Hi, 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/staging/keucr/ Signed-off-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit 6ccb5d7c62845788be9aafef26132333a07708bb Author: Justin P. Mattock Date: Mon Nov 8 13:41:46 2010 -0800 staging: Fix typos in rt2860 Here is a patch that fixes some typos, and comments in drivers/staging/rt2860 Signed-off-by: Justin P. Mattock Signed-off-by: Greg Kroah-Hartman commit 1ac586445db8e46f0007855c5c7161ff55484836 Author: Haiyang Zhang Date: Mon Nov 8 14:04:47 2010 -0800 staging: hv: Convert camel cased functions in ring_buffer.c to lower cases staging: hv: Convert camel cased functions in ring_buffer.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit fc8c72ebfa7547c044bab48fb8bba6906123f8c7 Author: Haiyang Zhang Date: Mon Nov 8 14:04:46 2010 -0800 staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases staging: hv: Convert camel cased local variables in ring_buffer.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 82f8bd40a017716bfadcf074b4c6110ebe4c7ba6 Author: Haiyang Zhang Date: Mon Nov 8 14:04:45 2010 -0800 staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases staging: hv: Convert camel cased struct fields in ring_buffer.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 203df82d81a331e16caee4c2346cd382fcd820d6 Author: Haiyang Zhang Date: Mon Nov 8 14:04:44 2010 -0800 staging: hv: Convert camel cased functions in osd.c to lower cases staging: hv: Convert camel cased functions in osd.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d39f12866d90829e1ae0440c0203dd5a162c8cd8 Author: Haiyang Zhang Date: Mon Nov 8 14:04:43 2010 -0800 staging: hv: Convert camel cased local variables in osd.c to lower cases staging: hv: Convert camel cased local variables in osd.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit d44890c8d2a83116463c230b59b9b9d356aafe85 Author: Haiyang Zhang Date: Mon Nov 8 14:04:42 2010 -0800 staging: hv: Convert camel cased functions in hv.c to lower cases staging: hv: Convert camel cased functions in hv.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit b8dfb264f4f9e55f9cf8384cb782dfe5159c413c Author: Haiyang Zhang Date: Mon Nov 8 14:04:41 2010 -0800 staging: hv: Convert camel cased local variables in hv.c to lower cases staging: hv: Convert camel cased local variables in hv.c to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit 6a0aaa185057801343e000183ef0695c2a2b75a9 Author: Haiyang Zhang Date: Mon Nov 8 14:04:40 2010 -0800 staging: hv: Convert camel cased struct fields in hv.h to lower cases staging: hv: Convert camel cased struct fields in hv.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit f6feebe073db4c97dc10f6fab54f9d4b5816886b Author: Haiyang Zhang Date: Mon Nov 8 14:04:39 2010 -0800 staging: hv: Convert camel cased struct fields in hv_api.h to lower cases staging: hv: Convert camel cased struct fields in hv_api.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit c50f7fb28400bc4829c26bb4a2d6c06a45e90b1a Author: Haiyang Zhang Date: Mon Nov 8 14:04:38 2010 -0800 staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases staging: hv: Convert camel cased struct fields in channel_mgmt.h to lower cases Signed-off-by: Haiyang Zhang Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman commit a32d4acab4a862c5cd297b73d625d813af8d4e0b Author: Tracey Dent Date: Sat Nov 6 14:48:48 2010 -0400 Staging: speakup: spk_types: trival coding style issue Checkpatch.pl gives WARNING: missing space after struct definition. This patch fixes that warning that was on line 55. Signed-off-by: Tracey Dent Signed-off-by: Greg Kroah-Hartman commit 3c9d46526db88218a311a72971efae1b4366d4c6 Author: Jesper Juhl Date: Sun Nov 7 07:37:03 2010 +0100 Staging: Cypress WestBridge OMAP3430 Kernel Hal: Remove unneeded local variables from alloc functions In drivers/staging/westbridge/astoria/arch/arm/mach-omap2/cyashalomap_kernel.c the local variables 'ret_p' are not needed and should just go away. I have no way to test this code, but I believe the change is obviously correct. Please consider it. Signed-off-by: Jesper Juhl Acked-by: David Cross Signed-off-by: Greg Kroah-Hartman commit 6f710907ff452ab67bd1161bc3f7a95f9a7e809d Author: Johan Meiring Date: Sat Nov 6 18:21:59 2010 +0200 Staging: wlan-ng: fixed coding style issues in p80211netdev.c This is a patch to the p80211netdev.c file that fixes warnings that were found by the checkpatch.pl tool Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit 869c4b4a715af94a14ec074c0a5528a562e3322b Author: Johan Meiring Date: Sat Nov 6 15:59:50 2010 +0200 Staging: wlan-ng: fixed coding style issues in p80211conv.h This is a patch to the p80211conv.h file that fixes two 80 character line limit styling issues Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit 9f027eb6871335f6e16633df796263f983f08844 Author: Johan Meiring Date: Sat Nov 6 18:24:46 2010 +0200 Staging: asus_oled: fix coding style issue in asus_oled.c This is a patch to the asus_oled.c file that fixes up brace and enum warning found by the checkpatch.pl tool Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit f83dfd065817ea3c7387b23afb2fd4d23fb470ff Author: Johan Meiring Date: Sat Nov 6 18:23:44 2010 +0200 Staging: wlan-ng: fix coding style issues in prism2mgmt.c This is a patch to prism2mgmt.c that fixes coding style issues found by checkpatch.pl. Three instances of the 80 char line limit being exceeded have been kept as is so that string literals are not split up. Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit c5de2157b801b9f38c7852b4d30fea8aff0c1bbd Author: Johan Meiring Date: Sat Nov 6 18:23:09 2010 +0200 Staging: wlan-ng: fix coding style issues in p80211types.h This is a patch that fixes various coding style issues in p80211types.h. The typedef declarations have been kept as they seem necessary. Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit 4314e5a68ab014092a55d5b2b26964952a97bc85 Author: Johan Meiring Date: Sat Nov 6 18:22:42 2010 +0200 Staging: wlan-ng: fixed coding style issues in p80211netdev.h This is a patch to the p80211netdev.h file that fixes up warnings found by the checkpatch.pl tool. The typedefs have been left in place as they seem necessary. Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit 5b84cc781058bb452f869d84bb24442ec51948c4 Author: Joe Perches Date: Thu Nov 4 20:07:59 2010 -0700 staging: Use vzalloc Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 4eb28f7197a2cbaf7a9be778d429a5fb9bb6172e Author: Johan Meiring Date: Sat Nov 6 15:46:54 2010 +0200 Staging: wlan-ng: fixed coding style issues in p80211conv.c This is a patch to the p80211conv.c file that fixes a couple of coding style issues found by the checkpatch.pl tool. Signed-off-by: Johan Meiring Signed-off-by: Greg Kroah-Hartman commit 4c510e95aef6138242ed4bc7fe29ee184bea413f Author: Larry Finger Date: Sun Nov 7 12:22:18 2010 -0600 staging: r8712u: Remove extraneous variables from osdep_service.h Jesper Juhl submitted a patch to remove one extraneous variable in this file; however, there are several others. Signed-off-by: Larry Finger Reviewed-by: Jesper Juhl Signed-off-by: Greg Kroah-Hartman commit a2ac9d69d69d8df88d4096903f5f76fe2de2345b Author: Jesper Juhl Date: Sun Nov 7 12:22:18 2010 -0600 staging: r8712u: Remove unneeded local variable in _malloc in osdep_service.h header The variable 'pbuf' is not needed. Signed-off-by: Jesper Juhl Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 268dfede46e24eef55a2ef7a10a462617936771e Author: Mike Thomas Date: Sun Nov 7 20:11:36 2010 +0000 staging/easycap: Improve interface to the videodev module The changes here represent an intermediate step towards bringing the driver within the V4L2 framework. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit ae59dad4fef271222d65ac6afe2889eb12ea6ca9 Author: Mike Thomas Date: Sun Nov 7 20:09:19 2010 +0000 staging/easycap: Eliminate BKL No locking is required for normal operation of the driver, but locking is needed to prevent an Oops during some hot-unplugging scenarios. The BKL is replaced here by mutex locks together with traps to detect null pointers following asynchronous device disconnection. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 2a87a0b9220f8e0e6f204b0f61dc6e15ad64ccd4 Author: Mike Thomas Date: Sun Nov 7 20:07:12 2010 +0000 staging/easycap: Avoid compiler warning about frame size ... larger than ... Replacing some of the large automatic variables by dynamically allocated variables in the IOCTL routines gets rid of the compiler warning. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 94155cf4195bb3be0068481dc21e8688eda2e051 Author: Mike Thomas Date: Sun Nov 7 20:05:51 2010 +0000 staging/easycap: Add option to set the hardware audio gain A new module parameter adjusts the gain of the AC'97 audio chip, if one is present. Attenuation as well as amplification should be possible according to the datasheet, but attenuation seems not to work yet. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 849322a0f114e52d05e16fe8349843c980cff2c6 Author: Mike Thomas Date: Sun Nov 7 20:03:50 2010 +0000 staging/easycap: Add option to show conspicuous indication of signal loss A new module parameter turns on the option of displaying a testcard when the analogue input signal is lost (more precisely: when the hardware detects no field/frame synchronization). This feature has been requested in the context of security cameras used at night. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 40b8d50ac98f8c8779aea7459f805e5a69fdb726 Author: Mike Thomas Date: Sun Nov 7 20:02:15 2010 +0000 staging/easycap: Implement interlaced modes and reduced framerates Interlaced modes are requested by tvtime. Reduced framerates are preferred by some userspace programs, e.g. astronomy applications. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit f36bc37a48148f31f936557b811431b98dbfe347 Author: Mike Thomas Date: Sun Nov 7 20:00:35 2010 +0000 staging/easycap: Improve hardware initialization Sometimes at startup the video urbs consistently and persistently deliver bad data, each video frame (not isoc frame) containing an excess of precisely two bytes. A brute-force cure implemented here is to repeatedly reinitialize the registers of the SAA7113H chip and the STK1160 USB bridge until good behaviour is obtained. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit e68703cfe8dd2f5605c53b46fae6c9c027e7ef50 Author: Mike Thomas Date: Sun Nov 7 19:58:55 2010 +0000 staging/easycap: Make code re-entrant In order to allow multiple EasyCAP dongles to operate simultaneously without mutual interference all static variables have been eliminated except for a persistent inventory of plugged-in dongles at module level. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit ce36cedab3f865969653bf4360f7e364ab0937e4 Author: Mike Thomas Date: Sun Nov 7 19:56:40 2010 +0000 staging/easycap: Remove obsolete routines The so-called bridger routine has proved unnecessary following general improvements elsewhere. The explain_() functions were a convenience during early development, but are unnecessary and inappropriate now. Signed-off-by: Mike Thomas Signed-off-by: Greg Kroah-Hartman commit 050afc92ee394ccdd953f91dcbbf9af863af8efc Merge: 391a169 5bf6859 Author: Greg Kroah-Hartman Date: Tue Nov 9 16:12:37 2010 -0800 Staging: Merge Ben Collins solo6x10 tree with upstream There were some duplicate changes that needed to be hand-merged due to fixes needed to keep .37 building and working properly. Signed-off-by: Greg Kroah-Hartman commit 391a169e99c789d59ef2a6b0cb80d1c6f63238dd Author: Jesper Juhl Date: Thu Nov 4 22:27:42 2010 +0100 pohmelfs: remove unneeded conditionals before calls to crypto_destroy_tfm wrappers. Hi, crypto_free_hash() and crypto_free_ablkcipher() are just wrappers around crypto_free_tfm() which is itself just a wrapper around crypto_destroy_tfm(). Passing crypto_destroy_tfm() a NULL pointer is valid, so there's no reason to check for NULL first. Removing the unneeded conditionals (which is what the patch does) brings us the benefit of having to execute a few fewer test/branch instructions and also reduces object code size slightly: before: text data bss dec hex filename 8630 112 3312 12054 2f16 drivers/staging/pohmelfs/crypto.o 0000000000000cbe : cbe: 55 push %rbp cbf: 48 89 e5 mov %rsp,%rbp cc2: 53 push %rbx cc3: 48 83 ec 08 sub $0x8,%rsp cc7: e8 00 00 00 00 callq ccc ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 cd3: 48 89 fb mov %rdi,%rbx cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi cda: 48 85 ff test %rdi,%rdi cdd: 74 0c je ceb cdf: 48 ff 05 00 00 00 00 incq 0x0(%rip) # ce6 ce6: e8 58 fa ff ff callq 743 ceb: 48 8b 7b 28 mov 0x28(%rbx),%rdi cef: 48 85 ff test %rdi,%rdi cf2: 75 09 jne cfd cf4: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfb cfb: eb 16 jmp d13 cfd: 48 89 fe mov %rdi,%rsi d00: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d07 d07: e8 00 00 00 00 callq d0c d0c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d13 d13: 48 8b 7b 18 mov 0x18(%rbx),%rdi d17: e8 00 00 00 00 callq d1c d1c: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d23 d23: 5e pop %rsi d24: 5b pop %rbx d25: c9 leaveq d26: c3 retq after: text data bss dec hex filename 8604 112 3296 12012 2eec drivers/staging/pohmelfs/crypto.o 0000000000000cbe : cbe: 55 push %rbp cbf: 48 89 e5 mov %rsp,%rbp cc2: 53 push %rbx cc3: 48 83 ec 08 sub $0x8,%rsp cc7: e8 00 00 00 00 callq ccc ccc: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cd3 cd3: 48 89 fb mov %rdi,%rbx cd6: 48 8b 7f 20 mov 0x20(%rdi),%rdi cda: e8 64 fa ff ff callq 743 cdf: 48 8b 7b 28 mov 0x28(%rbx),%rdi ce3: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cea cea: 48 89 fe mov %rdi,%rsi ced: e8 00 00 00 00 callq cf2 cf2: 48 8b 7b 18 mov 0x18(%rbx),%rdi cf6: 48 ff 05 00 00 00 00 incq 0x0(%rip) # cfd cfd: e8 00 00 00 00 callq d02 d02: 48 ff 05 00 00 00 00 incq 0x0(%rip) # d09 d09: 5e pop %rsi d0a: 5b pop %rbx d0b: c9 leaveq d0c: c3 retq Signed-off-by: Jesper Juhl Acked-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 5712dc7fc812d1bdbc5e634d389bc759d4e7550c Author: Tobias Klauser Date: Wed Nov 3 10:59:02 2010 +0100 staging: batman-adv: Use linux/etherdevice.h address helper functions Replace custom ethernet address check functions by calls to the helpers in linux/etherdevice.h In one case where the address was tested for broadcast and multicast address, the broadcast address check can be omitted as broadcast is also a multicast address. The patch is only compile-tested. Cc: Marek Lindner Cc: Simon Wunderlich Cc: Andrew Lunn Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit e09f138e06d4f1ea63079e25bb55ee1dacff7933 Author: Marek Belisko Date: Wed Nov 3 11:19:55 2010 +0100 staging: ft1000: Get rid of UINT typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c613f6f50f9d98015b8640f9aeff3b0c8e07548e Author: Marek Belisko Date: Wed Nov 3 11:19:54 2010 +0100 staging: ft1000: Get rid of PCHAR typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 81584137d8c97ab6bd87c2b4091f6105f600e66e Author: Marek Belisko Date: Thu Nov 4 07:37:13 2010 +0100 staging: ft1000: Get rid of BOOLEAN typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 84b7801d135ca90903df3a9170b9db5978fe8fce Author: Marek Belisko Date: Wed Nov 3 11:19:52 2010 +0100 staging: ft1000: Get rid of ULONG typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d44d76f93dafdbaeac0f1d541f3867777de65c8a Author: Marek Belisko Date: Wed Nov 3 11:19:51 2010 +0100 staging: ft1000: Get rid of PULONG typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit fc549a05e74edf9535862a4e517e63ade3908f75 Author: Marek Belisko Date: Wed Nov 3 11:19:50 2010 +0100 staging: ft1000: Get rid of USHORT typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d1674983e0fdf3a18dbc4ac7f1f0912f7b1c246e Author: Marek Belisko Date: Wed Nov 3 11:19:49 2010 +0100 staging: ft1000: GEt rid of PUSHORT typedef usage. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit c8f775c88b1b84909d5d73b171a48302bf46b2f8 Author: Marek Belisko Date: Wed Nov 3 11:19:48 2010 +0100 staging: ft1000: Get rid of UCHAR typedef. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit e2cb7da1671eb659c8edc81be9838afdd0b6b2cc Author: Marek Belisko Date: Wed Nov 3 11:19:47 2010 +0100 staging: ft1000: Get rid of PUCHAR typedef. PUCHAR typedef was replaces by u8 *. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 95112cb448b5962daeee68db8ee523b71266e28b Author: Marek Belisko Date: Tue Nov 2 14:51:47 2010 +0100 staging: ft1000: Check return value. Function ft1000_submit_rx_urb() could fail so add checking for return value. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d7780865164f2efe3ea2fa6f1ebdf61ecc1f2a4d Author: Marek Belisko Date: Tue Nov 2 14:51:46 2010 +0100 staging: ft1000: Correct return error values. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 3b3291e868695194096591c4a5e3e302939e4c2b Author: Marek Belisko Date: Tue Nov 2 14:51:45 2010 +0100 staging: ft1000: Use common return point. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 35e9403b052ff6cad71bc5d9a075385e0c62ab96 Author: Marek Belisko Date: Tue Nov 2 14:51:44 2010 +0100 staging: ft1000: Use specific error codes instead self defined. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit d2b07455b85d20c72e4182fe7d53d8c70838f984 Author: Marek Belisko Date: Tue Nov 2 13:44:10 2010 +0100 staging: ft1000: Pseudo header handlig improved. Handling for pseudo header was done by directly copying data to tx buffer. This hide a functionality and make code unreadable. Use approach where fill pseudo_hdr structure first with data and then copy to beginning of buffer. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 019bd3f825a7fc438b1e9ce7d145b03f13102aee Author: Marek Belisko Date: Tue Nov 2 13:44:09 2010 +0100 staging: ft1000: Remove dead code. Remove functions which was used nowhere. Also remove dead variables used by this functions. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit eb21c1587ac3272d58592e775dc55af6266f7403 Author: Marek Belisko Date: Tue Nov 2 13:44:08 2010 +0100 staging: ft1000: Use memset instead looping with for. Signed-off-by: Marek Belisko Signed-off-by: Greg Kroah-Hartman commit 4d26d7e6ba3fffd224560acd586526bf2f2f4f73 Author: Pekka Enberg Date: Mon Nov 1 22:29:31 2010 +0200 Staging: w35und: Kill struct hwdata ->SurpriseRemoveCount This patch kills the ->SurpriseRemoveCount member of struct hwdata. It's not used at all so it's safe to remove it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 87cb9a6310bc5183de196b25ef6adfda3080a744 Author: Pekka Enberg Date: Mon Nov 1 22:29:30 2010 +0200 Staging: w35und: Kill struct hwdata ->HwStop This patch kills the ->HwStop member of struct hwdata. It's a read-only variable that's always zero so it's safe to remove it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 4d0d302257d3d0eccf371aab49c74b41797bebc3 Author: Pekka Enberg Date: Mon Nov 1 22:29:29 2010 +0200 Staging: w35und: Kill struct hwdata ->NullPacketCount This patch kills the NullPacketCount member of struct hwdata. It's not used for anything so it's safe to remove it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 6112063d804aa0afc8d4462b22e36fc259393b64 Author: Pekka Enberg Date: Mon Nov 1 22:29:28 2010 +0200 Staging: w35und: Kill empty Mds_Destroy function The Mds_Destroy() function doesn't do anything so kill it. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 9dd5f271441bbe85578c2b7841820d8bca26096c Author: Mauro Schilman Date: Mon Nov 1 14:12:05 2010 -0300 Staging: frontier: fix space and * coding style issues in alphatrack.c This is a patch to the alphatrack.c file that fixes up a space warning and a space after '*' warning found by the checkpatch.pl tool Signed-off-by: Mauro Schilman Signed-off-by: Greg Kroah-Hartman commit b5ef076141acc223e55aa298abd2d2f5fb844874 Author: Pekka Enberg Date: Mon Nov 1 21:50:06 2010 +0200 Staging: w35und: Rename wbhal_s.h to wbhal.h This patch renames the wbhal_s.h header file to wbhal.h now that it contains both structure and function definitions. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 72ca8819f7f4ac4ddf82ab72ee614075821a3d00 Author: Pekka Enberg Date: Mon Nov 1 21:50:05 2010 +0200 Staging: w35und: Merge wbhal_f.h to wbhal_s.h This patch merges HAL struct and function definitions into one header file. Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit ba5c2b3ddcb7a6a0e942c7c2434f048d152f08c5 Author: Felipe Andres Besoain Pino Date: Fri Oct 29 19:15:58 2010 -0300 staging: vt6656: resolved checkpatch finding removed spaces at the start of a lines. Signed-off-by: Felipe Andres Besoain Pino Signed-off-by: Greg Kroah-Hartman commit 99b7bbb9b57da48f602732aaa107d7add49c842d Author: Ariel Savini Date: Fri Oct 29 19:19:20 2010 -0300 staging: vt6656 resolved parenthesis not spaces removes before parenthesis Signed-off-by: Ariel Savini Signed-off-by: Greg Kroah-Hartman commit 4a499de2d13786de626c3f689022d7ec25230911 Author: Mariano Reingart Date: Fri Oct 29 19:15:26 2010 -0300 staging: vt6656: resolved checkpatch finding removed a C99 '//' comment and added a space around '=' Signed-off-by: Mariano Reingart Signed-off-by: Greg Kroah-Hartman commit fc4f55860254566b43e066bed0962c7cca72da84 Author: Matias De la Puente Date: Fri Oct 29 19:07:45 2010 -0300 staging: vt6656: resolved checkpatch finding removed parentesis and spaces at the start of a line of a return Signed-off-by: Matias De la Puente Signed-off-by: Greg Kroah-Hartman commit cc8b59d41fa597bb62bdca2c200e8509bc8bec2a Author: Joe Perches Date: Sat Oct 30 14:08:38 2010 -0700 Staging: solo6x10: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 8892384803af7082056fe29faef02fd0c762493e Author: Eric Dumazet Date: Fri Oct 29 15:19:27 2010 +0200 staging: get rid of dev_base_lock dev_base_lock was the legacy rwlock used to protect netdevice list, and is expected to vanish. We now use RTNL and RCU locking. Signed-off-by: Eric Dumazet Signed-off-by: Greg Kroah-Hartman commit e1ffd62b8fc87e842431cc693821d7f1ac70b9de Author: Barry Song Date: Wed Oct 27 21:44:22 2010 -0400 staging: iio: adis16209: tuning spi delay to make hardware more stable Looks like one spot was missed in the previous spi tune patch. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 817e5c65c511d4a83686333ae75507deb4b55d5e Author: Graf Yang Date: Wed Oct 27 21:44:21 2010 -0400 staging: iio: resolver: new driver for AD2S1210 devices Signed-off-by: Graf Yang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ffd7a62f0dffa92409dc769562a4997eb424a7d3 Author: Graf Yang Date: Wed Oct 27 21:44:20 2010 -0400 staging: iio: resolver: new driver for AD2S1200/1205 devices Signed-off-by: Graf Yang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f46d9f154ac3001b90e75ca646400a13b499a49e Author: Graf Yang Date: Wed Oct 27 21:44:19 2010 -0400 staging: iio: resolver: new driver for AD2S90 devices This also kicks off the new resolver subsection. Signed-off-by: Graf Yang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 5b264a624ebc9a082873aa06ea641cbdc760e6e1 Author: Barry Song Date: Wed Oct 27 21:44:18 2010 -0400 staging: iio: meter: new driver for ADE7854/58/68/78 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 2919fa54ef643364eab69bfff5a72e4aa50d3e39 Author: Barry Song Date: Wed Oct 27 21:44:17 2010 -0400 staging: iio: meter: new driver for ADE7759 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 8210cfe9bd99fd63fae0b60c40fa793b8454e381 Author: Barry Song Date: Wed Oct 27 21:44:16 2010 -0400 staging: iio: meter: new driver for ADE7758 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 8d97a5877b85ab0a2b346c2c111a8192d336495f Author: Barry Song Date: Wed Oct 27 21:44:15 2010 -0400 staging: iio: meter: new driver for ADE7754 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 09434ef7c2eedca448d2701ffce229b5ccade64f Author: Barry Song Date: Wed Oct 27 21:44:14 2010 -0400 staging: iio: meter: new driver for ADE7753/6 devices This also kicks off the new meter subsection. Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 0152a0585281a03d734f38effcfe9515874b7d48 Author: Cliff Cai Date: Wed Oct 27 21:44:13 2010 -0400 staging: iio: dds: new driver for AD9951 devices Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 2996a2dc38c58f96432a28fdd7f81ccfd692637d Author: Cliff Cai Date: Wed Oct 27 21:44:12 2010 -0400 staging: iio: dds: new driver for AD9910 devices Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit a886689f6c36ccad01d9600a92029f80a2a6279f Author: Cliff Cai Date: Wed Oct 27 21:44:11 2010 -0400 staging: iio: dds: new driver for AD9852/4 devices Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit a82ab27aa758e4b02f130d86be5c2fedf29c0c0a Author: Cliff Cai Date: Wed Oct 27 21:44:10 2010 -0400 staging: iio: dds: new driver for AD9850/1 devices Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 4a8e6c33e88b09a3fdef022d1711dc13ce8cb7db Author: Cliff Cai Date: Wed Oct 27 21:44:09 2010 -0400 staging: iio: dds: new driver for AD9832/3/4/5 devices Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit da6fcbdf764cbc8f539333a725411183a4253cfa Author: Cliff Cai Date: Wed Oct 27 21:44:08 2010 -0400 staging: iio: dds: new driver for AD5930/2 devices This is the initial driver in the new Direct Digital Synthesis section. Signed-off-by: Cliff Cai Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 6790e29fef61b20b213bd1cf5a025dc3412a4765 Author: Barry Song Date: Wed Oct 27 21:44:07 2010 -0400 staging: iio: dac: new driver for AD5624R devices This is used to convert digital streams into voltages. Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 7a83f60d7bdf619cb7a37b5e0f6c128a91c6ecd0 Author: Barry Song Date: Wed Oct 27 21:44:06 2010 -0400 staging: iio: gyro: new driver for ADIS16130 digital output gyros Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 1b2f99e1ae79b6039340571312ebbe0551d39c16 Author: Barry Song Date: Wed Oct 27 21:44:05 2010 -0400 staging: iio: gyro: new driver for ADIS16080 digital output gyros Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit e071f6b8e47834e9c91a299a5e773bebffe10e67 Author: Barry Song Date: Wed Oct 27 21:44:04 2010 -0400 staging: iio: gyro: new driver for ADIS16060 digital output gyros Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 4f0cd86d66a81fd77912504d0e0b5883c473512e Author: Barry Song Date: Wed Oct 27 21:44:03 2010 -0400 staging: iio: gyro: new driver for ADIS16251 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 06b86a75b148e44d489a960c047a8fc6926c841d Author: Sonic Zhang Date: Wed Oct 27 21:44:02 2010 -0400 staging: iio: adc: new driver for ADT7410 temperature sensors Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit a5d8c6bc2f87c1c5cb69fb3a22d1ef0110a9eacc Author: Sonic Zhang Date: Wed Oct 27 21:44:01 2010 -0400 staging: iio: adc: new driver for ADT7310 temperature sensors Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit d7713b6c56472b41e04ebcbdfdf85df84c8e82d6 Author: Sonic Zhang Date: Wed Oct 27 21:44:00 2010 -0400 staging: iio: adc: new driver for ADT75 temperature sensors Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 7924425db04a6107e49312edf53c158590d52aae Author: Sonic Zhang Date: Wed Oct 27 21:43:59 2010 -0400 staging: iio: adc: new driver for AD7816 devices Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 671d85f2aa3dadc6e221b6f6f7e087bf487275e7 Author: Barry Song Date: Wed Oct 27 21:43:58 2010 -0400 staging: iio: adc: new driver for AD7745/6/7 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f84c26e61eedaa9eb21fe8a238d38fffb8d3c394 Author: Sonic Zhang Date: Wed Oct 27 21:43:57 2010 -0400 staging: iio: adc: new driver for AD7314 devices Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit e8ada962bc2e34e964d370f721994387df7b1363 Author: Sonic Zhang Date: Wed Oct 27 21:43:56 2010 -0400 staging: iio: adc: new driver for AD7298 devices Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ddaecd5ba8cc3bc68b65b01cc8dbfedcac87254e Author: Sonic Zhang Date: Wed Oct 27 21:43:55 2010 -0400 staging: iio: adc: new driver for AD7291 devices Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit a20ebd930081edaf21f354db195e7bb9820b18d8 Author: Barry Song Date: Wed Oct 27 21:43:54 2010 -0400 staging: iio: adc: new driver for AD7152/3 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 54c5be349bf66ed0c50c2e293803057d148a4c95 Author: Barry Song Date: Wed Oct 27 21:43:53 2010 -0400 staging: iio: adc: new driver for AD7150/1/6 devices Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 35f6b6b86ede34a9f8c029943842640b2ffbfa19 Author: Sonic Zhang Date: Wed Oct 27 21:43:52 2010 -0400 staging: iio: new ADT7316/7/8 and ADT7516/7/9 driver IIO driver for temperature sensor, ADC and DAC devices over SPI and I2C. Signed-off-by: Sonic Zhang Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit bb6f19eafe3a1a5dd937ce66668e70aeaa1b0bf4 Author: Barry Song Date: Wed Oct 27 21:43:51 2010 -0400 staging: iio: new adis16204 driver IIO driver for Programmable High-g Digital Impact Sensor and Recorder. Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f11ba4f5774957415aa15eea7c8c8717126907ee Author: Barry Song Date: Wed Oct 27 21:43:50 2010 -0400 staging: iio: new adis16203 driver IIO driver for Programmable 360 Degrees Inclinometer adis16203 parts. Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f7fe1d1dd5a512a44f0ada40ff7f120664e2e082 Author: Barry Song Date: Wed Oct 27 21:43:49 2010 -0400 staging: iio: new adis16201 driver IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts. Signed-off-by: Barry Song Signed-off-by: Michael Hennerich Acked-by: Jonathan Cameron Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 6f125f17945a65e0bed37a4dfd7e5397a2c7a886 Author: Mike Frysinger Date: Wed Oct 27 21:43:48 2010 -0400 staging: iio: add ADI info to TODO Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f733d02ab61787239d1ca05c30f6f393275a7899 Author: Michael Hennerich Date: Wed Oct 27 21:43:47 2010 -0400 staging: iio: gyro: make sure grep can find the ADIS16265 support Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 61a4295b492f96878b4b47d577a173568530ecff Author: Mike Frysinger Date: Wed Oct 27 21:43:46 2010 -0400 staging: iio: adis16350: add missing reference to temp offset We declare this attr but never link it in to the attr list. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 3b785a8cfc6ac1bc837b0a1424056b6a4a1e544e Author: Jesper Juhl Date: Tue Nov 9 00:10:02 2010 +0100 Staging: brcm80211: 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/staging/brcm80211/ Signed-off-by: Jesper Juhl Cc: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit d4fcdc68564f49cbb4fdaf9b0ebfb5c3d02c81d3 Author: Ben Hutchings Date: Sun Nov 7 17:20:37 2010 +0000 Staging: brcmfmac: Fix MAC header lookup on 64-bit architectures Fix direct use of sk_buff::mac_header which is an offset rather than a pointer on 64-bit architectures. Signed-off-by: Ben Hutchings Cc: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 69ec303a99ff68cfb5dbc6cefb043e53b6ba8945 Author: Brett Rudley Date: Fri Nov 5 19:20:16 2010 -0700 staging: brcm80211: migrate #includes from headers into .c files. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 997dd24fe9aadf6e0b3652580e7c79372ccb600c Author: Brett Rudley Date: Wed Nov 3 19:53:59 2010 -0700 staging: brcm80211: Remove pkttag from osl Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit df0d8bb8daa1e8c3c2afcf93c46ef0294c78ac26 Author: Brett Rudley Date: Wed Nov 3 19:53:58 2010 -0700 staging: brcm80211: Remove 'failed' field from osh Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 2578f7edf895fd4aad278134452cde1dc1b2fef5 Author: Nicolas Kaiser Date: Sat Oct 30 00:10:29 2010 +0200 Staging: brcm80211: simplify expression Simplify: ((a && b) || !a) => (b || !a) Signed-off-by: Nicolas Kaiser Cc: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit a28792e78669dc1bb984dd7798f0bccda741acbb Author: Brett Rudley Date: Mon Nov 1 17:10:18 2010 -0700 staging: brcm80211: Remove cruft from wlioctl.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 9014378bf42912533299d37f14677f9dfa21268a Author: Brett Rudley Date: Mon Nov 1 17:10:17 2010 -0700 staging: brcm80211: Remove OSL_ERROR entry point Get rid of generic OSL_ERROR and error code translation to the only place that needs it: dhd. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 683ab518a19fe55de9b9f682c94f672951315fe2 Author: Brett Rudley Date: Mon Nov 1 17:10:16 2010 -0700 staging: brcm80211: Remove dead code from osl.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 8fb6b18884703d447af4c5ed1eeec02b489aa54b Author: Brett Rudley Date: Mon Nov 1 17:10:15 2010 -0700 staging: brcm80211: Remove abstraction layer for dma alignment Directly align buffers instead of abstracting it. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 4766ae6ce7c5098a26136241576cd8a287d20484 Author: Brett Rudley Date: Wed Oct 27 15:47:53 2010 -0700 staging: brcm80211: purge epivers.h Purge include/epivers.h moving individual lines to where they are needed and delete unused refs. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit eb8160364f007c668c423614e262b9b7fc7b2c74 Author: Brett Rudley Date: Tue Oct 26 18:37:24 2010 -0700 staging: brcm80211: Separate fullmac vs softmac defs in shared file wlioctl.h is shared by fullmac and softmac but mostly fullmac. Separate out fullmac to purge extranous code in softmac and possibly as a step towards it own file. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 7f7c3dbb3f6d8624109ee30ad5a8f6b23f0a72f4 Author: Brett Rudley Date: Tue Oct 26 15:23:09 2010 -0700 staging: brcm80211: Move #include from bcmutils.h out to .c files Part of effort to move #includes out of .h files and unwind the include mess. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit c6ac24e90a3f6a3cf25e3b1e4d8957032acf70a6 Author: Brett Rudley Date: Tue Oct 26 11:55:23 2010 -0700 staging: brcm80211: Purge linuxver.h and redistribute #includes as required Linuxver.h only included other .h files. Delete it and move #includes to .c's as needed. Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit a52ba66cf2e06dc7b9ad655b74324e81f756dbd3 Author: Brett Rudley Date: Tue Oct 26 09:17:06 2010 -0700 staging: brcm80211: Move #includes out of d11.h Move #includes out of d11.h and into .c files Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit ded6d25baa6bb0b3a41fa50a0427258c5d09ea7f Author: Brett Rudley Date: Tue Oct 26 09:17:05 2010 -0700 staging: brcm80211: Purge unused includes from d11.h Purge unused #includes from d11.h Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit 53b6b34dfaa0263128d1e03bed0ba6fb40df88f8 Author: Brett Rudley Date: Tue Oct 26 09:17:04 2010 -0700 staging: brcm80211: Purge unused lines from bcmdefs.h/wlc_pub.h Purge unused lines Signed-off-by: Brett Rudley Signed-off-by: Greg Kroah-Hartman commit e38b67c7cd3d2e377868e4c8ff4772f14ec7c45b Author: Sven Eckelmann Date: Mon Oct 25 23:43:14 2010 +0200 Staging: batman-adv: Remove useless braces 77099f0afe94928b5b0066a7efa5fa9f81696b54 added changes to vis.c which trigger a checkpatch.pl warning about braces which are not necessary anymore. WARNING: braces {} are not necessary for any arm of this statement + if (entry->primary) [...] + else { [...] Signed-off-by: Sven Eckelmann Cc: Andy Shevchenko Cc: Marek Lindner Cc: Simon Wunderlich Cc: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit eba499d3e376983f4d521bac05bf7e9a634ace2f Author: Naveen Kumar Gaddipati Date: Tue Nov 2 17:38:45 2010 +0530 Staging: add Synaptics RMI4 touchpad driver support Added the Synaptics RMI4 touchpad driver support. Acked-by: Linus Walleij Signed-off-by: Naveen Kumar Gaddipati Cc: Dmitry Torokhov Cc: Alan Cox Cc: Christopher Heiny Signed-off-by: Greg Kroah-Hartman commit 78fd115e21087133be74bc6dd7a9bc1969aea8f8 Author: Ramesh Agarwal Date: Fri Oct 22 14:00:20 2010 +0100 Staging: add Synaptics TM1217 Touchscreen Controller driver This is submitted as a staging driver because there is a more generic driver "on the way" for all these devices and has been for some time. The intent is that as soon as the general drivers are in the mainstream this one will get any leftovers integrated and then be dumped. Until this unspecified future data at least people can actually use their hardware. As its interface is simply input layer we can do that without pain. Some clean up by Alan Cox - Extract gpio support and IRQ support more sanely - Tidying Signed-off-by: Ramesh Agarwal [avoid deference NULL ts if kzalloc fails] [finger_touched may be used uninitialized] [fix missing sync which confused twm] Signed-off-by: Hong Liu Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit fc2347e2023221ef04c6d9ce84019aa8c7e0ad6d Author: Atul Sowani Date: Wed Nov 3 18:40:56 2010 +0530 Staging: xgifb: change obsolete pci_find_device() with pci_get_device() Replaced obsolete pci_find_device() calls with pci_get_device() calls. This is recommended in pci.txt filei in PCI Documentation. Signed-off-by: Atul Sowani Acked-by: Arnaud Patard Signed-off-by: Greg Kroah-Hartman commit af02b584bc0e1f46cf1477ad54ae18ec3842b6f4 Author: Uwe Kleine-König Date: Tue Oct 26 21:57:53 2010 +0200 Staging: trivial: fix typos concerning "controller" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit c4fb2bab7dea7780452e57166bd00cdfa9dba6ef Author: Uwe Kleine-König Date: Tue Oct 26 21:57:52 2010 +0200 Staging: trivial: fix typos concerning "configure" Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit dec34f85c62845a4d190a45aa5b5e9dd96797880 Author: Tracey Dent Date: Fri Oct 22 17:30:28 2010 -0400 Staging: msm: Makefile: replace the use of -objs with -y Changed -objs to -y in Makefile. Signed-off-by: Tracey Dent Signed-off-by: Greg Kroah-Hartman commit d0f40c5041f9c48afbd8f7fbf8a5faa9e5dbd39a Author: Joe Perches Date: Wed Oct 20 18:51:06 2010 -0700 Staging: intel_sst: Use pr_fmt, fix misspellings Remove leading "sst: " from format strings. Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Prefix is changed from "sst: " to "snd_intel_sst: " Add missing newlines Trim trailing spaces after newlines Fix several different misspellings Signed-off-by: Joe Perches Cc: Vinod Koul Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 074e61ec3751da9ab88ee66d3818574556c03489 Author: James Morris Date: Wed Nov 10 09:01:31 2010 +1100 kernel: add roundup() code comment from akpm Add roundup() code comment from akpm. Signed-off-by: Andrew Morton Signed-off-by: James Morris commit 2ff81110de696f37a32cca2de50bf0cfbaf56733 Merge: a7bcf21 e5837ce Author: Greg Kroah-Hartman Date: Tue Nov 9 13:43:45 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/beceem into work-next commit 0656f6cf6c394ede78657595dd5a8ca7a1e64853 Author: Jarkko Nikula Date: Mon Nov 8 10:57:57 2010 +0200 ASoC: tpa6130a2: Revisit power-up sequence There are no known problems with current power-up sequence which first sets the /shutdown pin high and then enables the supply. However, swap the order so that the device is kept in shutdown/reset mode during the supply voltage transition since slowly rising voltages can usually cause problems if the device is not kept in reset. Signed-off-by: Jarkko Nikula Cc: Peter Ujfalusi Acked-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit edb40a23c8dc5b5be219bf4561074b6233bba65f Author: Bruno Randolf Date: Tue Oct 19 16:56:54 2010 +0900 ath5k: Add channel time to survey data Include the channel utilization (busy, rx, tx) in the survey results. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 3dd0923de491d72a041f82a9d0aaccc473fd2c42 Author: Bruno Randolf Date: Tue Oct 19 16:56:48 2010 +0900 ath5k: Optimize descriptor alignment Similar to Felix Fietkau "ath9k_hw: optimize all descriptor access functions" (13db2a80244908833502189a24de82a856668b8a). Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville commit 123f5b8e6f411d342f2fc8a15c4d9349ace5074a Author: Mohammed Shafi Shajakhan Date: Mon Oct 18 11:37:17 2010 +0530 ath9k: Remove the median function in rate control With the current rate control selection method the median function is nowhere used, so remove it. Signed-off-by: Mohammed Shafi Shajakhan Signed-off-by: John W. Linville commit ada9f1cacb66b74a68254521bb5e3ca4eb8fa871 Author: Felix Fietkau Date: Sat Oct 16 01:01:48 2010 +0200 ath9k_hw: optimize all descriptor access functions Because all of the descriptor data structures are marked as __packed, GCC assumes the worst case wrt. alignment and generates unaligned load/store instructions on MIPS for access to all fields. Since descriptors always have to be 4-byte-aligned, we can just mark the data structures with __aligned(4), which allows GCC to generate much more efficient code. Verified through disassembly and OProfile comparisons. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit f0e94b479c987abef17eb18e5c8e0ed178d00cd4 Author: Rafael J. Wysocki Date: Sat Oct 16 00:36:17 2010 +0200 ath9k: Convert to new PCI PM framework The ath9k driver uses the legacy PCI power management (suspend and resume) callbacks that apparently cause intermittent problems to happen (the adapter sometimes doesn't resume correctly on my Acer Ferrari One). Make it use the new PCI PM and let the PCI core code handle the PCI-specific details of power transitions. Signed-off-by: Rafael J. Wysocki Signed-off-by: John W. Linville commit 191d6a1186f65bc86c24b9d6d9d91acc155285ba Author: Luis R. Rodriguez Date: Fri Oct 15 13:27:49 2010 -0700 ath9k: fix sparse complaint on aphy for debugfs This fixes this sparse complaint: CHECK drivers/net/wireless/ath/ath9k/debug.c drivers/net/wireless/ath/ath9k/debug.c:548:34: warning: symbol 'aphy' shadows an earlier one drivers/net/wireless/ath/ath9k/debug.c:491:26: originally declared here Signed-off-by: Luis R. Rodriguez Signed-off-by: John W. Linville commit 744bcb42a1ff1b9200e82dd074468877e31ff161 Author: Felix Fietkau Date: Fri Oct 15 20:03:33 2010 +0200 ath9k_hw: make ath9k_hw_gettsf32 static It is now only used in hw.c Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 8eb1dabbd10e067cff671935d3e0c819f8e80d54 Author: Felix Fietkau Date: Fri Oct 15 20:03:32 2010 +0200 ath9k: remove a redundant call to ath9k_hw_gettsf32 When the timer_next argument to ath9k_gen_timer_start is behind the tsf value, tsf + timer_period is used, which is what ath_btcoex_period_timer was setting it to. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 9fa23e1741404207c414fad69212a8763c138bf0 Author: Felix Fietkau Date: Fri Oct 15 20:03:31 2010 +0200 ath9k: optimize/fix ANI RSSI processing ANI needs the RSSI average only in station mode, and only for tracking the signal strength of beacons of the AP that it is connected to. Adjust the code to track on the beacon RSSI, and store the average of that in the ath_wiphy struct. With these changes, we can get rid of this extra station lookup in the rx path, which saves precious CPU cycles. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit e0e9bc82fb0813fd353b0abbba0f1d6a680cc77c Author: Felix Fietkau Date: Fri Oct 15 20:03:30 2010 +0200 ath9k_hw: optimize tx status descriptor processing Disassembly shows, that at least on MIPS, the compiler generates a lot of memory accesses to the same location in the descriptor field parsing. Since it is operating on uncached memory, this can be quite expensive in this hot path. Change the code a bit to help the compiler optimize it properly, and get rid of some unused fields in the ath_tx_status struct. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 45684c75f9aa80eb477465bddcf79c9ad95206c7 Author: Felix Fietkau Date: Fri Oct 15 20:03:29 2010 +0200 ath9k_hw: small optimization in ar9002_hw_get_isr ah->config.rx_intr_mitigation does not need to be checked before checking the rx interrupt mask for AR_ISR_RXMINTR or AR_ISR_RXINTM, as those interrupts will be masked out if rx interrupt mitigation is disabled. Avoid reading AR_ISR_S5_S twice by reordering the code to be more concise. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 4df3071ebd92ef7115b409da64d0eb405d24a631 Author: Felix Fietkau Date: Mon Nov 8 20:54:47 2010 +0100 ath9k_hw: optimize interrupt mask changes OProfile showed that ath9k was spending way too much time in ath9k_hw_set_interrupts. Since most of the interrupt mask changes only need to globally enable/disable interrupts, it makes sense to split this part into separate functions, replacing all calls to ath9k_hw_set_interrupts(ah, 0) with ath9k_hw_disable_interrupts(ah). ath9k_hw_set_interrupts(ah, ah->imask) only gets changed to ath9k_hw_enable_interrupts(ah), whenever ah->imask was not changed since the point where interrupts were disabled. Signed-off-by: Felix Fietkau Signed-off-by: John W. Linville commit 790a11f268373b60069bc1371dc05143107c607c Author: Rafał Miłecki Date: Thu Oct 14 23:04:40 2010 +0200 b43: N-PHY: define registers names for 2056 radio Signed-off-by: Rafał Miłecki Cc: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: John W. Linville commit 794830e691a6b61d2de3fa9daeb609fd4ef4a4e7 Author: Rafał Miłecki Date: Sun Oct 17 15:38:51 2010 +0200 b43: N-PHY: define registers names for 2056 radio Signed-off-by: Rafał Miłecki Cc: Henry Ptasinski Cc: Brett Rudley Cc: Nohee Ko Signed-off-by: John W. Linville commit 038aaa382eb0a8fd6a0bbae7abc1383b9b57c543 Author: Rafał Miłecki Date: Thu Oct 14 23:01:02 2010 +0200 b43: N-PHY: define channel table struct for rev3+ devices Signed-off-by: Rafał Miłecki Signed-off-by: John W. Linville commit b95fccbc025cb5788776ed8b80dba20b24529b15 Author: Axel Lin Date: Tue Nov 9 17:06:44 2010 +0800 ASoC: Fix compile error if CONFIG_DEBUG_FS is not configured Add soc_init_card_debugfs and soc_cleanup_card_debugfs functions to fix below error. CC sound/soc/soc-core.o sound/soc/soc-core.c: In function 'soc_probe': sound/soc/soc-core.c:1689: error: implicit declaration of function 'soc_init_card_debugfs' sound/soc/soc-core.c: In function 'soc_remove': sound/soc/soc-core.c:1718: error: implicit declaration of function 'soc_cleanup_card_debugfs' make[2]: *** [sound/soc/soc-core.o] Error 1 make[1]: *** [sound/soc] Error 2 make: *** [sound] Error 2 Signed-off-by: Axel Lin Acked-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 27b1fec2caa668c162cd1a862c69e087df277fae Author: Rajendra Nayak Date: Tue Sep 28 21:02:58 2010 +0530 OMAP: I2C: Convert i2c driver to use PM runtime api's This patch converts the i2c driver to use PM runtime apis Signed-off-by: Rajendra Nayak Cc: Paul Walmsley Cc: Jean Delvare Acked-by: Ben Dooks Signed-off-by: Kevin Hilman commit 4d17aeb1c5b2375769446d13012a98e6d265ec13 Author: Paul Walmsley Date: Tue Sep 21 19:37:15 2010 +0530 OMAP: I2C: split device registration and convert OMAP2+ to omap_device Split the OMAP1 and OMAP2+ platform_device build and register code. Convert the OMAP2+ variant to use omap_device. This patch was developed in collaboration with Rajendra Nayak . Signed-off-by: Paul Walmsley Signed-off-by: Rajendra Nayak Cc: Kevin Hilman Signed-off-by: Kevin Hilman commit f776471f620a07be234f40288a1fd9932d039e26 Author: Benoit Cousson Date: Tue Sep 21 19:37:14 2010 +0530 OMAP4: hwmod: add I2C hwmods for OMAP4430 Add hwmod structures for I2C controllers on OMAP4430. Signed-off-by: Benoit Cousson Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman commit 4fe20e97c8b1082d16b38e9f4c53feeed143ab98 Author: Rajendra Nayak Date: Tue Sep 21 19:37:13 2010 +0530 OMAP3: hwmod: add I2C hwmods for OMAP3430 Add hwmod structures for I2C controllers on OMAP3430. This patch was developed in collaboration with Paul Walmsley . OMAP3 fixes for correct IDLEST bit monitoring from G, Manjunath Kondaiah Signed-off-by: Rajendra Nayak Signed-off-by: Paul Walmsley Cc: G, Manjunath Kondaiah Signed-off-by: Kevin Hilman commit 2004290f55f03c52e22044a5843928cf0f6cc56a Author: Paul Walmsley Date: Thu Sep 30 02:40:12 2010 +0530 OMAP2xxx: hwmod: add I2C hwmods for OMAP2420, 2430 Add hwmod structures for I2C controllers on OMAP2420/2430. NOTE: I2C module on OMAP2420 has 16bit registers and causes imprecise aborts if 32bits are read/written to it. Use the HWMOD_16BIT_REG flag to notify the hmwod framework of this hard requirement so that __raw_writew/readw is used to read /write the mdoule registers. Signed-off-by: Paul Walmsley Signed-off-by: Rajendra Nayak Signed-off-by: Kevin Hilman commit 2af6fd8b18ceed416c9dfa675287c765aabf7d43 Author: Joe Perches Date: Sat Oct 30 11:08:53 2010 +0000 net/ipv4/tcp.c: Update WARN uses Coalesce long formats. Align arguments. Remove KERN_. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit b194a3674fba6d9f9e470084d192c7cb99194a62 Author: Joe Perches Date: Sat Oct 30 11:08:52 2010 +0000 net/core/dev.c: Update WARN uses Coalesce long formats. Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit 9c413ed55d5b52159e85a3937cda7f210a318048 Author: Joe Perches Date: Sat Oct 30 11:08:34 2010 +0000 drivers/net/usb: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c389ff80d4b598f57d56aa807d396d4351cac8a4 Author: Joe Perches Date: Sat Oct 30 11:08:33 2010 +0000 drivers/net/can: Update WARN uses Add missing newlines. Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7 Author: Eric Dumazet Date: Wed Nov 3 22:49:35 2010 +0000 drivers/net: normalize TX_TIMEOUT Some network drivers use old TX_TIMEOUT definitions, assuming HZ=100 of old kernels. Convert these definitions to include HZ, since HZ can be 1000 these days. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 Author: Daniel Drake Date: Tue Sep 21 16:37:26 2010 +0100 viafb: Add OLPC XO-1.5 port configs The OLPC XO-1.5 does not use the standard port wiring suggested in the viafb driver. This is required for the upcoming OLPC DCON and via-camera drivers, to be submitted soon. Signed-off-by: Daniel Drake [fts: removed useless ifdef's and corrected comment] Signed-off-by: Florian Tobias Schandinat commit 67eb6f9617a24dfb033b584d6b1b42b39cc9297a Author: Jonathan Corbet Date: Thu Oct 28 18:23:21 2010 +0100 viafb: suspend/resume for GPIOs Be sure to re-enable GPIO lines on resume. Users still have to be sure to set them properly. Signed-off-by: Jonathan Corbet Signed-off-by: Daniel Drake Signed-off-by: Florian Tobias Schandinat commit 751305d9b2fd3e03eaab7808e976241d85ca4353 Author: Daniel Drake Date: Thu Oct 28 18:23:01 2010 +0100 viafb: General power management infrastructure Multiple devices need S/R hooks (framebuffer, GPIO, camera). Add infrastructure and convert existing framebuffer code to the new model. This patch should create no functional change. Based on earlier work by Jonathan Corbet. Signed-off-by: Daniel Drake Acked-by: Jonathan Corbet Signed-off-by: Florian Tobias Schandinat commit 2b9408a45978dcda77407859148deeccf403c372 Author: Shaohua Li Date: Tue Nov 9 14:51:13 2010 +0100 cfq-iosched: don't schedule a dispatch for a non-idle queue Vivek suggests we don't need schedule a dispatch when an idle queue becomes nonidle. And he is right, cfq_should_preempt already covers the logic. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 7f05dec3dd70f086870fdc1d40dbe30db1fe0994 Author: Jacob Pan Date: Tue Nov 9 11:28:43 2010 +0000 x86: mrst: Parse SFI timer table for all timer configs Penwell has APB timer based watchdog timers, it requires platform code to parse SFI MTMR tables in order to claim its timer. This patch will always parse SFI MTMR regardless of system timer configuration choices. Otherwise, SFI MTMR table may not get parsed if running on Medfield with always-on local APIC timers and constant TSC. Watchdog timer driver will then not get a timer to use. Signed-off-by: Jacob Pan Signed-off-by: Alan Cox LKML-Reference: <20101109112800.20591.10802.stgit@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 1da4b1c6a4dfb5a13d7147a27c1ac53fed09befd Author: Feng Tang Date: Tue Nov 9 11:22:58 2010 +0000 x86/mrst: Add SFI platform device parsing code SFI provides a series of tables. These describe the platform devices present including SPI and I²C devices, as well as various sensors, keypads and other glue as well as interfaces provided via the SCU IPC mechanism (intel_scu_ipc.c) This patch is a merge of the core elements and relevant fixes from the Intel development code by Feng, Alek, myself into a single coherent patch for upstream submission. It provides the needed infrastructure to register I2C, SPI and platform devices described by the tables, as well as handlers for some of the hardware already supported in kernel. The 0.8 firmware also provides GPIO tables. Devices are created at boot time or if they are SCU dependant at the point an SCU is discovered. The existing Linux device mechanisms will then handle the device binding. At an abstract level this is an SFI to Linux device translator. Device/platform specific setup/glue is in this file. This is done so that the drivers for the generic I²C and SPI bus devices remain cross platform as they should. (Updated from RFC version to correct the emc1403 name used by the firmware and a wrongly used #define) Signed-off-by: Alek Du LKML-Reference: <20101109112158.20013.6158.stgit@localhost.localdomain> [Clean ups, removal of 0.7 support] Signed-off-by: Feng Tang [Clean ups] Signed-off-by: Alan Cox Signed-off-by: Thomas Gleixner commit d6ff7d0fe22cdf3ea41c48b50da9a9181500d1bf Author: Alexey Charkov Date: Tue Nov 9 02:42:39 2010 +0300 ARM: Add support for the display controllers in VT8500 and WM8505 This adds drivers for the LCD controller found in VIA VT8500 SoC, GOVR display controller found in WonderMedia WM8505 SoC and for the Graphics Engine present in both of them that provides hardware accelerated raster operations (used for copyarea and fillrect). Signed-off-by: Alexey Charkov Signed-off-by: Paul Mundt commit cf655c36fad7b6488a56f18ab56f7d608ca6552b Merge: a7bcf21 2e351ec Author: Paul Mundt Date: Tue Nov 9 16:53:33 2010 +0900 Merge branch 'rmobile/core' into rmobile-latest commit 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 Merge: a9b27bc 37b7a97 99870bd Author: Paul Mundt Date: Tue Nov 9 16:51:46 2010 +0900 Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest commit a9b27bcc6acf2491609f51aa592ec67311d4518d Author: Paul Mundt Date: Mon Nov 1 12:44:25 2010 -0400 sh: Break out cpuinfo_op procfs bits. Presently this is all inlined in setup.c, which is not really the place for it. Follow the x86 example and split it out into its own file. Signed-off-by: Paul Mundt commit f020c92de48246510623162fb22d60d91810cc56 Author: Paul Mundt Date: Mon Nov 1 12:24:48 2010 -0400 sh: Enable optional gpiolib for all CPUs with pinmux tables. All of the CPUs with pinmux tables support gpiolib. At present the boards that depend on it for initialization manually select gpiolib as needed, but there is no reason why it can't be exposed generically to the user regardless. Signed-off-by: Paul Mundt commit 16b259203c513ed28bd31cc9a981e0d3ad517943 Author: Paul Mundt Date: Mon Nov 1 12:18:48 2010 -0400 sh: migrate SH_CLK_MD to mode pin API. This kills off the hardcoded SH_CLK_MD introduced by the SH-2 boards and converts over to the mode pin API. Signed-off-by: Paul Mundt commit 973a34aa8593dbfe84386343c694f5beecb51d8a Author: Eric Dumazet Date: Sun Oct 31 05:38:25 2010 +0000 af_unix: optimize unix_dgram_poll() unix_dgram_poll() is pretty expensive to check POLLOUT status, because it has to lock the socket to get its peer, take a reference on the peer to check its receive queue status, and queue another poll_wait on peer_wait. This all can be avoided if the process calling unix_dgram_poll() is not interested in POLLOUT status. It makes unix_dgram_recvmsg() faster by not queueing irrelevant pollers in peer_wait. On a test program provided by Alan Crequy : Before: real 0m0.211s user 0m0.000s sys 0m0.208s After: real 0m0.044s user 0m0.000s sys 0m0.040s Suggested-by: Davide Libenzi Reported-by: Alban Crequy Acked-by: Davide Libenzi Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 5456f09aaf88731e16dbcea7522cb330b6846415 Author: Eric Dumazet Date: Sun Oct 31 05:36:23 2010 +0000 af_unix: fix unix_dgram_poll() behavior for EPOLLOUT event Alban Crequy reported a problem with connected dgram af_unix sockets and provided a test program. epoll() would miss to send an EPOLLOUT event when a thread unqueues a packet from the other peer, making its receive queue not full. This is because unix_dgram_poll() fails to call sock_poll_wait(file, &unix_sk(other)->peer_wait, wait); if the socket is not writeable at the time epoll_ctl(ADD) is called. We must call sock_poll_wait(), regardless of 'writable' status, so that epoll can be notified later of states changes. Misc: avoids testing twice (sk->sk_shutdown & RCV_SHUTDOWN) Reported-by: Alban Crequy Cc: Davide Libenzi Signed-off-by: Eric Dumazet Acked-by: Davide Libenzi Signed-off-by: David S. Miller commit 67426b756c4d52c511c4b22b269accea171692a8 Author: Eric Dumazet Date: Fri Oct 29 20:44:44 2010 +0000 af_unix: use keyed wakeups Instead of wakeup all sleepers, use wake_up_interruptible_sync_poll() to wakeup only ones interested into writing the socket. This patch is a specialization of commit 37e5540b3c9d (epoll keyed wakeups: make sockets use keyed wakeups). On a test program provided by Alan Crequy : Before: real 0m3.101s user 0m0.000s sys 0m6.104s After: real 0m0.211s user 0m0.000s sys 0m0.208s Reported-by: Alban Crequy Signed-off-by: Eric Dumazet Cc: Davide Libenzi Signed-off-by: David S. Miller commit fc766e4c4965915ab52a1d1fa3c7a7b3e7bc07f0 Author: Eric Dumazet Date: Fri Oct 29 03:09:24 2010 +0000 decnet: RCU conversion and get rid of dev_base_lock While tracking dev_base_lock users, I found decnet used it in dnet_select_source(), but for a wrong purpose: Writers only hold RTNL, not dev_base_lock, so readers must use RCU if they cannot use RTNL. Adds an rcu_head in struct dn_ifaddr and handle proper RCU management. Adds __rcu annotation in dn_route as well. Signed-off-by: Eric Dumazet Acked-by: Steven Whitehouse Signed-off-by: David S. Miller commit e4a7b93bd5d84e1e79917d024d17d745d190fc9a Author: Eric Dumazet Date: Fri Oct 29 01:52:46 2010 +0000 bonding: remove dev_base_lock use bond_info_seq_start() uses a read_lock(&dev_base_lock) to make sure device doesn’t disappear. Same goal can be achieved using RCU. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 840a185dddfd098b78b96a30da4cad722a7aef18 Author: Eric Dumazet Date: Fri Oct 29 01:15:29 2010 +0000 aoe: remove dev_base_lock use from aoecmd_cfg_pkts() dev_base_lock is the legacy way to lock the device list, and is planned to disappear. (writers hold RTNL, readers hold RCU lock) Convert aoecmd_cfg_pkts() to RCU locking. Signed-off-by: Eric Dumazet Cc: "Ed L. Cashin" Signed-off-by: David S. Miller commit 1d5439b9a29b1386d44a617cbaf2f7acde1d697c Author: Arce, Abraham Date: Thu Oct 28 18:57:20 2010 +0000 ks8851: suspend resume support Add suspend/resume support using default open/stop interface methods to do hardware dependant operations. On suspend, same low power state (soft power mode) will be kept, the following blocks will be disabled: - Internal PLL Clock - Tx/Rx PHY - MAC - SPI Interface Signed-off-by: Abraham Arce Signed-off-by: David S. Miller commit 56e2ea346ab4c2ea159ecdec85fffc24f50c2903 Author: Chris Wilson Date: Mon Nov 8 17:10:29 2010 +0000 drm/i915: Fix unload after failed initialisation If modeset init failed we attempted to unload the module, before we finished setting it up and so triggered various oopses. Signed-off-by: Chris Wilson commit 374c479bef7ecd2b41d6dd6e24aa21d73b3afae5 Author: Chris Wilson Date: Mon Nov 8 21:07:24 2010 +0000 drm/i915: POSTING_READs are simply flushes and so irrelevant to tracing As we use POSTING_READ to flush the write to the register before proceeding, we do not care what the return value is and similar we do not care for the read to be recorded whilst tracing register read/writes. Signed-off-by: Chris Wilson commit d0eaeec8e8dfdc31815941054802dcccd7c3fe1d Merge: a7bcf21 aa58163 Author: David S. Miller Date: Mon Nov 8 12:38:28 2010 -0800 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit 8bced693459cec5c3737f2492a2a8f1233b6614f Merge: 0aa34b1 b0fc7b8 Author: Mark Brown Date: Mon Nov 8 16:52:02 2010 +0000 Merge branch 'for-2.6.37' into HEAD commit 0aa34b16f9f34a81bd50c097f1953877614220db Author: Dimitris Papastamos Date: Mon Nov 8 10:41:53 2010 +0000 ASoC: Remove unneeded use of address-of operator There is no need to use '&' in this case. Either way, if a is an array of some type, then a == &a == &a[0]. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5aaa062c27273d21d1f52ddc20e697b6466057d4 Author: Dimitris Papastamos Date: Mon Nov 8 15:37:07 2010 +0000 ASoC: soc-cache: Use BUG_ON() for unsupported hw_read() calls Instead of dereferencing a NULL function pointer and falling apart use BUG_ON() for any unimplemented hw_read() calls. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 5bf68592e72eb0ded154efaaf43b39aab6964fc3 Author: Ben Collins Date: Mon Nov 8 10:07:42 2010 -0500 solo6x10: [P2M] Fix memory leak Signed-off-by: Ben Collins commit 8e1ac6655104bc6e1e79d67e2df88cc8fa9b6e07 Author: Shaohua Li Date: Mon Nov 8 15:01:04 2010 +0100 cfq-iosched: don't idle if a deep seek queue is slow If a deep seek queue slowly deliver requests but disk is much faster, idle for the queue just wastes disk throughput. If the queue delevers all requests before half its slice is used, the patch disable idle for it. In my test, application delivers 32 requests one time, the disk can accept 128 requests at maxium and disk is fast. without the patch, the throughput is just around 30m/s, while with it, the speed is about 80m/s. The disk is a SSD, but is detected as a rotational disk. I can configure it as SSD, but I thought the deep seek queue logic should be fixed too, for example, considering a fast raid. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit d2d59e18a1ea8ecdd1c0a52af320e9a7f5391cc4 Author: Shaohua Li Date: Mon Nov 8 15:01:03 2010 +0100 cfq-iosched: schedule dispatch for noidle queue A queue is idle at cfq_dispatch_requests(), but it gets noidle later. Unless other task explictly does unplug or all requests are drained, we will not deliever requests to the disk even cfq_arm_slice_timer doesn't make the queue idle. For example, cfq_should_idle() returns true because of service_tree->count == 1, and then other queues are added. Note, I didn't see obvious performance impacts so far with the patch, but just thought this could be a problem. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit c1e44756fdb7b363fd22cb5514dced40752e36c5 Author: Shaohua Li Date: Mon Nov 8 15:01:02 2010 +0100 cfq-iosched: do cleanup Some functions should return boolean. Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 2b51dca79a105dea022776ea7874193239df7fbd Author: Pekka Enberg Date: Mon Nov 8 14:44:34 2010 +0100 floppy: replace NO_GEOM macro with a function This patch replaces the NO_GEOM macro with a proper static inline function and converts an open-coded caller in check_floppy_change() to use it. Cc: Stephen Hemminger Cc: Andrew Morton Signed-off-by: Pekka Enberg Signed-off-by: Jens Axboe commit db5e4172a023cff68b3597ace8a5390b02669d27 Author: Yuanhan Liu Date: Mon Nov 8 09:58:16 2010 +0000 drm/i915: filter out the read/write of GPIO registers from debug tracing These registers are written very frequently, are timing sensitive, and not particularly relevant to any debugging, so remove the tracepoints from these. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson commit 65e5ecb066fe54c13c8445d6acfdcdf149ad5df9 Author: Yuanhan Liu Date: Mon Nov 8 09:56:37 2010 +0000 drm/i915: Add untraced register read/write interface This will be used later to hide the frequently written registers from debug traces in order to increase the signal-to-noise. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson commit ba4f01a30480cdcd516b782f77a6e0951b83df1c Author: Yuanhan Liu Date: Mon Nov 8 17:09:41 2010 +0800 drm/i915: trace down all the register write and read Add two tracepoints at I915_WRITE/READ for tracing down all the register write and read. Signed-off-by: Yuanhan Liu Signed-off-by: Chris Wilson commit 67e92af01cb6f7e9a5fd5c930c43cd6f6ef45929 Author: Eric Anholt Date: Sat Nov 6 14:53:33 2010 -0700 drm/i915: Apply display workaround required according to the B-Spec. Not known to fix any current bugs. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit de6e2eaf2c420bb8b0d4485913ef312a5539b489 Author: Eric Anholt Date: Sat Nov 6 14:53:32 2010 -0700 drm/i915: Apply B-spec mandated workaround for read flushes on Ironlake. This is not known to fix any particular bugs we have, but the spec says to do it, and the BIOS hadn't already set it up on my system. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit 6f80dfe55fcbde1e588bc2cfa1273403b710872d Author: Christoph Hellwig Date: Sun Nov 7 23:01:17 2010 +0100 hfsplus: fix option parsing during remount hfsplus only actually uses the force option during remount, but it uses the full option parser with a fake superblock to do so. This means remount will fail if any nls option is set (which happens frequently with older mount tools), even if it is the same. Fix this by adding a simpler version of the parser that only parses the force option for remount. Signed-off-by: Christoph Hellwig commit 629e894173c9de589913cf649deaadec4b0579bd Author: Chris Wilson Date: Sun Nov 7 11:50:02 2010 +0000 drm/i915/ringbuffer: Ignore failure to setup the ring on Sandybridge The ring buffer registers return 0 whilst idle (for some values of idle) on early Sandybridge hw. Persevere even when all appears hopeless... Fortunately the head auto-reporting prevents most hangs. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31370 Signed-off-by: Chris Wilson commit ae69b42a10dafe61adb016e0e52ec1e8d1ba11b4 Author: Chris Wilson Date: Sun Nov 7 11:45:52 2010 +0000 drm/i915/ringbuffer: Be consistent in use of ring->size when initialising Signed-off-by: Chris Wilson commit 045e769ab69ce94dedbcdcfd46c2578b385c2986 Author: Chris Wilson Date: Sun Nov 7 09:18:22 2010 +0000 drm/i915: Handle GPU hangs during fault gracefully. Instead of killing the process, just return no page found and reschedule the process giving the GPU some time to (hopefully) recover. Signed-off-by: Chris Wilson commit 989db2005c328300239da4df4d80b057f8509d3b Merge: c046fd4 197ebd4 Author: Mark Brown Date: Sat Nov 6 11:35:44 2010 -0400 Merge branch 'for-2.6.37' into for-2.6.38 commit c046fd4dd613b22b35379665a8f7656d17bde0b3 Author: Dimitris Papastamos Date: Fri Nov 5 18:41:25 2010 +0000 ASoC: WM8770: Initial driver The WM8770 is a high performance, multi-channel audio codec. The WM8770 is ideal for surround sound processing applications for home hi-fi, automotive and other audio visual equipment. Signed-off-by: Dimitris Papastamos Signed-off-by: Mark Brown commit 3a45b8672d3f8542e430e7a5c7366ec9bdded054 Author: Jarkko Nikula Date: Fri Nov 5 20:35:21 2010 +0200 ASoC: Move pop time from DAPM context to sound card Based on discussion the dapm_pop_time in debugsfs should be per card rather than per device. Single pop time value for entire card is cleaner when the DAPM sequencing is extended to cross-device paths. debugfs/asoc/{card->name}/{codec dir}/dapm_pop_time -> debugfs/asoc/{card->name}/dapm_pop_time Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit d6ce4cf3967dca78f967cd0bf70b175084885f40 Author: Jarkko Nikula Date: Fri Nov 5 20:35:20 2010 +0200 ASoC: Move codec debugfs directories under parent card directory Make use of sound card debugfs directory and move codec directories under the parent card debugfs directory. debugfs/asoc/{codec dir} -> debugfs/asoc/{card->name}/{codec dir}. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit a6052154944c822993d04ca8f8d8926e8b73b749 Author: Jarkko Nikula Date: Fri Nov 5 20:35:19 2010 +0200 ASoC: Add sound card directory under debugfs/asoc/ There will be need to have sound card specific debugfs entries. This patch introduces a new debugfs/asoc/{card->name}/ directory but does not add yet any entries there. Signed-off-by: Jarkko Nikula Signed-off-by: Mark Brown commit ce6120cca2589ede530200c7cfe11ac9f144333c Author: Liam Girdwood Date: Fri Nov 5 15:53:46 2010 +0200 ASoC: Decouple DAPM from CODECs Decoupling Dynamic Audio Power Management (DAPM) from codec devices is required when developing ASoC further. Such as for other ASoC components to have DAPM widgets or when extending DAPM to handle cross-device paths. This patch decouples DAPM related variables from struct snd_soc_codec and moves them to new struct snd_soc_dapm_context that is used to encapsulate DAPM context of a device. ASoC core and API of DAPM functions are modified to use DAPM context instead of codec. This patch does not change current functionality and a large part of changes come because of structure and internal API changes. Core implementation is from Liam Girdwood with some minor core changes, codecs and machine driver conversions from Jarkko Nikula . Signed-off-by: Liam Girdwood Signed-off-by: Jarkko Nikula Cc: Nicolas Ferre Cc: Manuel Lauss Cc: Mike Frysinger Cc: Cliff Cai Cc: Kevin Hilman Cc: Ryan Mallon Cc: Timur Tabi Cc: Sascha Hauer Cc: Lars-Peter Clausen Cc: Arnaud Patard (Rtp) Cc: Wan ZongShun Cc: Eric Miao Cc: Jassi Brar Cc: Daniel Gloeckner Cc: Kuninori Morimoto Signed-off-by: Mark Brown commit 98072e4d977aabe6a39abb95951cd8bf2c2202d5 Author: Pavel Emelyanov Date: Thu Oct 28 13:50:37 2010 +0400 slub: Fix slub_lock down/up imbalance There are two places, that do not release the slub_lock. Respective bugs were introduced by sysfs changes ab4d5ed5 (slub: Enable sysfs support for !CONFIG_SLUB_DEBUG) and 2bce6485 ( slub: Allow removal of slab caches during boot). Acked-by: Christoph Lameter Signed-off-by: Pavel Emelyanov Signed-off-by: Pekka Enberg commit 716ce5d4a6f81653507c21b152eb7629d150ce7a Author: Pekka Enberg Date: Wed Oct 27 18:17:38 2010 +0300 slub: Fix build breakage in Documentation/vm This patch fixes a build breakage introduced by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move slabinfo.c to tools/slub/slabinfo.c") that was repoted by Stephen: After merging the slab tree, today's linux-next build (x86_64 allmodconfig) failed like this: gcc: /scratch/sfr/next/Documentation/vm/slabinfo.c: No such file or directory gcc: no input files Caused by commit f5ac4916e9840292edd33c7a52b10364526547f3 ("slub: move slabinfo.c to tools/slub/slabinfo.c"). Missing update to Documentation/vm/Makefile? Reported-by: Stephen Rothwell Signed-off-by: Pekka Enberg commit 4a92379bdfb48680a5e6775dd53a586df7b6b0b1 Author: Richard Kennedy Date: Thu Oct 21 10:29:19 2010 +0100 slub tracing: move trace calls out of always inlined functions to reduce kernel code size Having the trace calls defined in the always inlined kmalloc functions in include/linux/slub_def.h causes a lot of code duplication as the trace functions get instantiated for each kamalloc call site. This can simply be removed by pushing the trace calls down into the functions in slub.c. On my x86_64 built this patch shrinks the code size of the kernel by approx 36K and also shrinks the code size of many modules -- too many to list here ;) size vmlinux (2.6.36) reports text data bss dec hex filename 5410611 743172 828928 6982711 6a8c37 vmlinux 5373738 744244 828928 6946910 6a005e vmlinux + patch The resulting kernel has had some testing & kmalloc trace still seems to work. This patch - moves trace_kmalloc out of the inlined kmalloc() and pushes it down into kmem_cache_alloc_trace() so this it only get instantiated once. - rename kmem_cache_alloc_notrace() to kmem_cache_alloc_trace() to indicate that now is does have tracing. (maybe this would better being called something like kmalloc_kmem_cache ?) - adds a new function kmalloc_order() to handle allocation and tracing of large allocations of page order. - removes tracing from the inlined kmalloc_large() replacing them with a call to kmalloc_order(); - move tracing out of inlined kmalloc_node() and pushing it down into kmem_cache_alloc_node_trace - rename kmem_cache_alloc_node_notrace() to kmem_cache_alloc_node_trace() - removes the include of trace/events/kmem.h from slub_def.h. v2 - keep kmalloc_order_trace inline when !CONFIG_TRACE Signed-off-by: Richard Kennedy Signed-off-by: Pekka Enberg commit 0d24db337e6d81c0c620ab65cc6947bd6553f742 Author: Christoph Lameter Date: Thu Oct 21 13:01:56 2010 -0500 slub: move slabinfo.c to tools/slub/slabinfo.c We now have a tools directory for these things. Reviewed-by: KOSAKI Motohiro Acked-by: David Rientjes Signed-off-by: Christoph Lameter Signed-off-by: Pekka Enberg commit 62d69e6a57c5b5d52a607b1ce73ff6af65c992eb Author: Enric Balletbo i Serra Date: Sat Oct 23 16:48:58 2010 +0000 omap3: IGEP v2: Remove onenand_setup no-op function Set onenand_setup to NULL instead of adding a no-op function. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 0e4de059d90c96930ab237e7d4fbb7e3814afcb6 Author: Ben Collins Date: Fri Nov 5 10:29:33 2010 -0400 solo6x10: Implement working P2M descriptor more DMA We have to insert 1 dead descriptor first (all zereos), and then the real data descriptors after that. Everything uses descriptor mode now (8800 interrupts per second for display v4l2 is now down to ~96). Signed-off-by: Ben Collins commit 22e2fda5660cdf62513acabdb5c82a5af415f838 Author: Sascha Hauer Date: Thu Nov 4 17:05:45 2010 +0100 ASoC: i.MX: we can do mono Whether we can do mono or not depends on the codec. No need to limit this in the ssi driver. Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit a8ea54da5e47bde9ba19230bb3609b0502a288c3 Merge: 11e16eb 6424dca Author: Mark Brown Date: Fri Nov 5 09:16:07 2010 -0400 Merge branch 'for-2.6.37' into HEAD commit 319fb3bacc517829cbd4d758f3b8969fdbde5c92 Author: Ben Collins Date: Thu Nov 4 23:20:31 2010 -0400 solo6x10: Updates to videobuf-dma-sg functions for latest kernel Signed-off-by: Ben Collins commit f62de9be26ce2144ad0dcf292727e4f58577d401 Author: Ben Collins Date: Thu Nov 4 22:51:17 2010 -0400 solo6x10: Conversion to videobuf-dma-sg (from dma-cont) Full rewrite of the P2M DMA Engine to support scatter gather and take advantage of some of the features of the hardware. This includes using repeat DMA operations and line-mode transfers (for copying OSG and video display buffers). What isn't working: For some reason, descriptor mode is not working. I've implemented a psuedo version (still has one-interrupt per DMA operation), but we would get huge improvements if we could hand off a ring of descriptors to the P2M and get back one interrupt when it was done with all of them. Documentation is very vague on this, and even the ODM example code half attempts to get it right, but comments it out of the driver because it just doesn't work *sigh* Converts all v4l2 to dma-sg. So long slow dma-contiguous, but hello more interrupts :( Signed-off-by: Ben Collins commit 1194cf4308d786c69b808ec3aa8704d01d130e94 Author: Ben Collins Date: Thu Nov 4 22:42:25 2010 -0400 solo6x10: Update TODO Signed-off-by: Ben Collins commit 98e2d5a802518694465368406c5f1b020f4df998 Author: Ben Collins Date: Thu Nov 4 22:37:15 2010 -0400 solo6x10: Spaces to tabs Signed-off-by: Ben Collins commit 75e9e9158f38e5cb21eff23b30bafa6f32e0a606 Author: Daniel Vetter Date: Thu Nov 4 17:11:09 2010 +0100 drm/i915: kill mappable/fenceable disdinction a00b10c360b35d6431a "Only enforce fence limits inside the GTT" also added a fenceable/mappable disdinction when binding/pinning buffers. This only complicates the code with no pratical gain: - In execbuffer this matters on for g33/pineview, as this is the only chip that needs fences and has an unmappable gtt area. But fences are only possible in the mappable part of the gtt, so need_fence implies need_mappable. And need_mappable is only set independantly with relocations which implies (for sane userspace) that the buffer is untiled. - The overlay code is only really used on i8xx, which doesn't have unmappable gtt. And it doesn't support tiled buffers, currently. - For all other buffers it's a bug to pass in a tiled bo. In short, this disdinction doesn't have any practical gain. I've also reverted mapping the overlay and context pages as possibly unmappable. It's not worth being overtly clever here, all the big gains from unmappable are for execbuf bos. Also add a comment for a clever optimization that confused me while reading the original patch by Chris Wilson. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 818f2a3cc34b0673dccd4188ce4a1862d9d90127 Author: Daniel Vetter Date: Thu Nov 4 17:04:29 2010 +0100 drm/i915: revert pageflip/mappable related abi breakage In a00b10c360b35d6431a "Only enforce fence limits inside the GTT" Chris Wilson implemented an optimization to only pin framebuffers as mappable for crtc_set_base (but not for pageflips). This breaks the abi, eg: A double buffering mesa client might leave the last framebuffer in unmappable space on close. A subsequent glReadPix by a frontbuffer rendering client then goes boom. My pretty anal mappable/unmappable consistency checking detected this, see https://bugs.freedesktop.org/show_bug.cgi?id=31286 Chris Wilson tried to fix this in 085ce2643713830cf772c by pinning tiled framebuffers into mappable space. This a) renders the original optimization of not forcing framebuffers for pageflipping clients into mappable pointless because all our scanout buffers are tiled by default. b) doesn't solve the problem for untiled framebuffers. So kill this. Emperically it's no gain anyway because framebuffers are being reused by the ddx and hence there's no chance for them to get constanly bounced between mappable and unmappable. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 90246e79af062fcbb8c3728a5f29cb19b3468f59 Author: Herbert Xu Date: Thu Nov 4 13:00:22 2010 -0500 crypto: hash - Fix async import on shash algorithm The function shash_async_import did not initialise the descriptor correctly prior to calling the underlying shash import function. This patch adds the required initialisation. Reported-by: Miloslav Trmac Signed-off-by: Herbert Xu commit 8a9618f5dfca35edb0d7ab6374ff586e2e9e989b Author: Rob Herring Date: Wed Oct 6 16:18:08 2010 +0100 ARM: 6432/1: move timer-sp.c from versatile to common From: Rob Herring The timer-sp h/w used on versatile platforms can also be used for other platforms, so move it to a common location. Signed-off-by: Rob Herring Signed-off-by: Russell King commit 64d2dc384e41e2b7acead6804593ddaaf8aad8e1 Author: Leif Lindholm Date: Thu Sep 16 18:00:47 2010 +0100 ARM: 6396/1: Add SWP/SWPB emulation for ARMv7 processors The SWP instruction was deprecated in the ARMv6 architecture, superseded by the LDREX/STREX family of instructions for load-linked/store-conditional operations. The ARMv7 multiprocessing extensions mandate that SWP/SWPB instructions are treated as undefined from reset, with the ability to enable them through the System Control Register SW bit. This patch adds the alternative solution to emulate the SWP and SWPB instructions using LDREX/STREX sequences, and log statistics to /proc/cpu/swp_emulation. To correctly deal with copy-on-write, it also modifies cpu_v7_set_pte_ext to change the mappings to priviliged RO when user RO. Signed-off-by: Leif Lindholm Acked-by: Catalin Marinas Acked-by: Kirill A. Shutemov Signed-off-by: Russell King commit 247055aa21ffef1c49dd64710d5e94c2aee19b58 Author: Catalin Marinas Date: Mon Sep 13 16:03:21 2010 +0100 ARM: 6384/1: Remove the domain switching on ARMv6k/v7 CPUs This patch removes the domain switching functionality via the set_fs and __switch_to functions on cores that have a TLS register. Currently, the ioremap and vmalloc areas share the same level 1 page tables and therefore have the same domain (DOMAIN_KERNEL). When the kernel domain is modified from Client to Manager (via the __set_fs or in the __switch_to function), the XN (eXecute Never) bit is overridden and newer CPUs can speculatively prefetch the ioremap'ed memory. Linux performs the kernel domain switching to allow user-specific functions (copy_to/from_user, get/put_user etc.) to access kernel memory. In order for these functions to work with the kernel domain set to Client, the patch modifies the LDRT/STRT and related instructions to the LDR/STR ones. The user pages access rights are also modified for kernel read-only access rather than read/write so that the copy-on-write mechanism still works. CPU_USE_DOMAINS gets disabled only if the hardware has a TLS register (CPU_32v6K is defined) since writing the TLS value to the high vectors page isn't possible. The user addresses passed to the kernel are checked by the access_ok() function so that they do not point to the kernel space. Tested-by: Anton Vorontsov Cc: Tony Lindgren Signed-off-by: Catalin Marinas Signed-off-by: Russell King commit 8b7347aab6865ae8a2e5a8b0f1deea12da3d3aff Author: Michael S. Tsirkin Date: Sun Sep 19 15:56:30 2010 +0200 vhost: get/put_user -> __get/__put_user We do access_ok checks on all ring values on an ioctl, so we don't need to redo them on each access. Signed-off-by: Michael S. Tsirkin commit dfe5ac5b18be5b10d01a17e734a9905c0def6088 Author: Michael S. Tsirkin Date: Tue Sep 21 14:18:01 2010 +0200 vhost: copy_to_user -> __copy_to_user We do access_ok checks at setup time, so we don't need to redo them on each access. Signed-off-by: Michael S. Tsirkin commit 64e1c80748afca3b4818ebb232a9668bf529886d Author: Michael S. Tsirkin Date: Wed Oct 6 15:34:45 2010 +0200 vhost-net: batch use/unuse mm Move use/unuse mm to vhost.c which makes it possible to batch these operations. Signed-off-by: Michael S. Tsirkin commit 533a19b4b88fcf81da3106b94f0ac4ac8b33a248 Author: Michael S. Tsirkin Date: Wed Oct 6 15:34:38 2010 +0200 vhost: put mm after thread stop makes it possible to batch use/unuse mm Signed-off-by: Michael S. Tsirkin commit 46168f39360f419e59952d58cd08a862886ec8cd Merge: 085ce26 16a02cf Author: Chris Wilson Date: Thu Nov 4 09:40:36 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next commit 11e16eb365f4f6979cfcb2a2d379338b383590d9 Author: Mark Brown Date: Wed Nov 3 14:45:07 2010 -0400 ASoC: Use pm_wakeup_event() in WM8962 jack detection Ensure that the system does not suspend while we process a WM8962 jack event by using pm_wakeup_event() to block the suspend while we're waiting for the jack to settle. Use a slightly longer timeout than the jack waits to allow for other stuff to take over and delays in scheduling. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 7b0f42b59a01a2cc563c5f8670133b819e5c9895 Author: Mark Brown Date: Wed Nov 3 13:48:04 2010 -0400 ASoC: Remove register write trace from WM8994 We now have trace in the ASoC core so we don't need to our own trace in the driver. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 9db3b9bcc7f53487da8766b32e2d790ad03c53b9 Author: Ross Kirk Date: Fri Oct 22 16:43:17 2010 +0100 audit: error message typo correction Fixes a typo in the error message raised by audit when auditd has died. Signed-off-by: Ross Kirk -- Signed-off-by: Jiri Kosina commit 11dbf0acb4aba818a4f0600996216be55667b400 Author: Dimitris Papastamos Date: Wed Nov 3 16:50:36 2010 +0000 ASoC: soc-cache: Remove unnecessary debugging info No need to print the register-value pair again, as we've already hooked snd_soc_write() for that matter. Signed-off-by: Dimitris Papastamos Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit c3753707991218aa2c18449a921847877533aa09 Author: Mark Brown Date: Mon Nov 1 15:41:57 2010 -0400 ASoC: Push snd_soc_write() and snd_soc_read() into the source file Facilitating adding trace type stuff. For a first pass add some dev_dbg() statements into them. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 3f58fd84b0c0bd482151259ee0d2921974e1fe4c Author: Mark Brown Date: Wed Nov 3 09:35:31 2010 -0400 ASoC: Convert soc-jack code to use request_any_context_irq() Allow the standard soc-jack GPIO based jack handling to handle the use of GPIOs which may sleep (such as those on GPIO expanders) by converting the code to use request_any_context_irq(). Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit a4bc6926d05b60bf70aab2db2c6715e15118cbdc Author: Jiri Kosina Date: Wed Nov 3 10:42:02 2010 -0400 HID: make translation table selection more clear Reshuffle the code a little bit so that the translation table selection is more obvious and there is only one place performing the actual translation using the selected table. Signed-off-by: Jiri Kosina commit 99b9f758bbc904f22faffcf4d83205f4a5e7bc0c Author: Edgar (gimli) Hucek Date: Wed Nov 3 10:36:18 2010 -0400 HID: add MacBookAir 3,1 and 3,2 support This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the hid driver. Signed-off-by: Edgar (gimli) Hucek Signed-off-by: Jiri Kosina commit 6d2ad1e318adbf593746305746b0c1252d5949ae Author: matt mooney Date: Mon Sep 27 19:04:44 2010 -0700 powerpc: remove cast from void* Unnecessary cast from void* in assignment. Signed-off-by: matt mooney Acked-by: Benjamin Herrenschmidt Signed-off-by: Jiri Kosina commit 414c73abfd0e565950f3b02336cf516147f0e104 Author: Jarkko Nikula Date: Mon Nov 1 14:03:56 2010 +0200 ASoC: tlv320aic3x: Add support to shared common reset line This is aimed to configurations where multiple aic3x codecs share the same reset line and are powered from same supply voltages. Currently aic3x_probe will fail if trying to request already requested gpio_reset and passing -1 to another aic3x instances cause that those instances cannot release reset in aic3x_set_power. That is, another instances can work only if primary aic3x instance is powered and reset is released. Solve this by implementing a list of probed instances that is used for checking if other instance shares the same gpio_reset number. If a shared reset line exists, then only first instance tries to request and configure it and the last instance releases it. Runtime modifications are not needed since aic3x_regulator_event with help of regulator framework takes already care that reset is pulled down only when some or all supplies are disabled meaning that all instances using them are idle. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 79ee820d2aa24ac2577ca4e89ecc49c26d099707 Author: Jarkko Nikula Date: Mon Nov 1 14:03:55 2010 +0200 ASoC: tlv320aic3x: Use gpio_is_valid in checking for valid gpio_reset I promised to convert this at some point. Signed-off-by: Jarkko Nikula Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 33ee617f4dad370bee016e4462e69481257453b0 Merge: 0a27f05 9e3be1e Author: Liam Girdwood Date: Wed Nov 3 14:18:42 2010 +0000 Merge remote branch 'tiwai/topic/asoc' into for-2.6.38 commit 0a27f050abcd661cd4838e1b1ced117ec19d0d99 Merge: 7e6120c c8ddb27 Author: Liam Girdwood Date: Wed Nov 3 14:18:11 2010 +0000 Merge commit 'v2.6.37-rc1' into for-2.6.38 commit 8d814961234fda66f01bb0505f166537913d745c Author: Andrea Gelmini Date: Sat Oct 16 15:19:24 2010 +0200 drivers: scsi: fix typo in comment Signed-off-by: Andrea Gelmini Signed-off-by: Jiri Kosina commit 2146dcfd15ad55cfdd18b45e1e6601d6a86f0cbe Author: Clemens Ladisch Date: Wed Nov 3 12:26:35 2010 +0100 ALSA: oxygen: add HiFier Serenade support Add support for the TempoTec/MediaTek HiFier Serenade sound card. The PCI ID was already there, but the driver handled it like the Fantasia model, which resulted in a dummy recording device. As a stereo output-only card, this model is to be handled exactly like the HG2PCI. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 18f24839f18f1934c1e37e86ce8f3fecbb0328c9 Author: Clemens Ladisch Date: Wed Nov 3 11:36:33 2010 +0100 ALSA: oxygen: reorganize PCI IDs Sort the PCI IDs so that they make logical sense. Also move the card name comments into this list because the model symbols should be (more) self-explanationary. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 085ce2643713830cf772c12c1a16da9d0ba83f36 Author: Chris Wilson Date: Wed Nov 3 09:27:53 2010 +0000 drm/i915: Ensure that if we ever try to pin+fence it is mappable. When merging Daniel's full-gtt patches I had a set of tweaks which I thought I had undone. I was half right... Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=31286 Reported-by: jinjin.wang@intel.com Reported-by: Alexey Fisher Signed-off-by: Chris Wilson commit 31f86bacfc9c8f6a3f25fa991c1f373374a9f25b Author: Clemens Ladisch Date: Tue Nov 2 17:18:23 2010 +0100 ALSA: oxygen: add Kuroutoshikou CMI8787-HG2PCI support Add support for the Kuroutoshikou CMI8787-HG2PCI sound card. [replaced non-latin letters in the patch by tiwai] Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 45c1de8e20cec40b6846def0aeca09cb1bfb839b Author: Clemens Ladisch Date: Tue Nov 2 17:08:37 2010 +0100 ALSA: oxygen: merge HiFier driver into snd-oxygen The snd-hifier driver contains more duplicated code than model-specific code, so it does not make sense for it to be a separate driver. Handling the two-channel output restriction can be easily done in the generic driver. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit e6d06e085bb5e7769c91bd14eb46094034fff8e6 Merge: c8ddb27 87232dd Author: Takashi Iwai Date: Wed Nov 3 08:17:18 2010 +0100 Merge branch 'fix/misc' into topic/misc commit de7fd0fc989727d657d40f6ddf2fb99639bd6262 Author: Michael Witten Date: Wed Oct 27 23:11:10 2010 +0000 Kconfig: typo: boad -> board Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit 1ed7c2077aa236b378dd28319e664422ef010e9b Author: Michael Witten Date: Fri Mar 26 21:41:10 2010 +0000 Docs: typo: Complete -> Completely Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit 9e3be1edbe5ca57df51140b523168237b3a01f4d Merge: 473f89f 29c798f Author: Mark Brown Date: Tue Nov 2 09:58:49 2010 -0400 Merge branch 'for-2.6.37' into HEAD WARN() fix from Joe moved. Conflicts: sound/soc/codecs/wm_hubs.c commit 27153f72d04bcd83b3a66e219418a21d6269553b Author: Chris Wilson Date: Tue Nov 2 11:17:23 2010 +0000 drm/i915: Drop the iomem accessors when writing to the kmapped blt batch I presumed that we would be writing to the batch through the GTT having bound it, so I converted it to use iomem. Even later as I spotted that we didn't even move the batch to the GTT (now an issue since we default to uncached memory on SNB) I still didn't realise that using iomem for kmapped memory was incorrect. Fix it. Signed-off-by: Chris Wilson commit 8c1812ad4879676bec1bd20f8ff478c8a076f3fc Merge: 8d19215 5588978 Author: Chris Wilson Date: Tue Nov 2 10:53:29 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Immediate merge to resolve conflicts from applying a stability fix to both branches. Conflicts: drivers/gpu/drm/i915/intel_ringbuffer.c drivers/gpu/drm/i915/intel_ringbuffer.h commit 8d19215be8254f4f75e9c5a0d28345947b0382db Author: Zou Nan hai Date: Tue Nov 2 16:31:01 2010 +0800 drm/i915: SNB BLT workaround On some stepping of SNB cpu, the first command to be parsed in BLT command streamer should be MI_BATCHBUFFER_START otherwise the GPU may hang. Signed-off-by: Zou Nan hai [ickle: rebased for -next] Signed-off-by: Chris Wilson commit 897ef192514a6b0fc10a0ce3fe7e7aa0de09bc52 Author: Zhenyu Wang Date: Tue Nov 2 17:30:47 2010 +0800 agp/intel: restore cache behavior on sandybridge This restores cache behavior for default AGP_USER_MEMORY as uncached, and leave default AGP_USER_CACHED_MEMORY as LLC only. I've seen different cache behavior on one sandybridge desktop CPU vs. another mobile CPU. Until we figure out how to detect the real cache config, restore back to the original behavior now. Signed-off-by: Zhenyu Wang Signed-off-by: Chris Wilson commit d110852513148a7ec44fad4e036455aeb816d713 Author: Zhenyu Wang Date: Tue Nov 2 17:30:46 2010 +0800 agp/intel: fix cache control for sandybridge This is broken from 97ef1bdd0bc75bce7b2058e9c432b6c277dcf4d3. Let's set the correct bit for LLC+MLC and LLC only. Signed-off-by: Zhenyu Wang Signed-off-by: Chris Wilson commit 328fc1325f144027f4a8269b11e9f8dcf1edcb97 Author: Chris Wilson Date: Tue Nov 2 10:00:34 2010 +0000 Revert "drm/i915: add MMIO debug output" We can use mmiotrace instead of our own debug printks. This reverts commit be282fd48e7492812402a22d73a348c44bf95b63. Conflicts: drivers/gpu/drm/i915/i915_drv.h commit 8b32a92b600e2728c5c438a748a4dc3132c98ef3 Author: Paul Mundt Date: Mon Nov 1 17:05:30 2010 -0400 sh: Add EHCI support for SH7786. This adds in the platform device for SH7786 USB EHCI. Signed-off-by: Paul Mundt commit 63c845522263b2da08f70deba760ed0ab51e841d Author: Paul Mundt Date: Mon Nov 1 17:03:27 2010 -0400 usb: ehci-hcd: Add support for SuperH EHCI. This adds a trivial stub for supporting EHCI mode of the on-chip SH USB host controllers. Signed-off-by: Paul Mundt commit 9cc563968066b55b067bcff132e4d566b020687d Author: Paul Mundt Date: Mon Nov 1 17:01:27 2010 -0400 usb: ohci-sh: Set IRQ as shared. The SH USB interface has both OHCI and EHCI modes that share the same interrupt. Flag the OHCI IRQ as shared in preparation for EHCI support. Signed-off-by: Paul Mundt commit b595076a180a56d1bb170e6eceda6eb9d76f4cd3 Author: Uwe Kleine-König Date: Mon Nov 1 15:38:34 2010 -0400 tree-wide: fix comment/printk typos "gadget", "through", "command", "maintain", "maintain", "controller", "address", "between", "initiali[zs]e", "instead", "function", "select", "already", "equal", "access", "management", "hierarchy", "registration", "interest", "relative", "memory", "offset", "already", Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 6aaccece1c483f189f76f1282b3984ff4c7ecb0a Author: Michael Witten Date: Mon Nov 1 17:50:12 2010 +0000 Kconfig: typo: and -> an Signed-off-by: Michael Witten Signed-off-by: Jiri Kosina commit 04561c5aa243c98cae93cde27e05740df787e692 Author: Ignaz Forster Date: Mon Nov 1 15:13:37 2010 -0400 HID: Add Force Feedback support for EMS Trio Linker Plus II The device has connections for GameCube, PlayStation 2 and Dreamcast controllers, however Force Feedback is only supported for PS2 and GC controllers. When using a PS2 controller it may be necessary to press the "Analog" button to enable support for both motors (this behavior is identical to the Windows driver, I have found no way to avoid that). Signed-off-by: Ignaz Forster Signed-off-by: Jiri Kosina commit e5837cef1d8356e8303585bd13611ecb3edb5747 Merge: c8ddb27 2932af3 Author: Stephen Hemminger Date: Mon Nov 1 14:37:23 2010 -0400 Merge branch 'master' of ../mine commit 2932af344a86cb1bd84ca8cc217ee016e8fb5255 Author: Stephen Hemminger Date: Mon Nov 1 14:18:16 2010 -0400 beceem: update TODO list Signed-off-by: Stephen Hemminger commit 349fa79498df313c70e2a4b7c16688be0a91dd0b Author: Stephen Hemminger Date: Mon Nov 1 14:09:05 2010 -0400 beceem: dump control packet information Add control packet information is useful for debugging. Signed-off-by: Stephen Hemminger commit 4ea4f7a0d3d7a9961bf77f0860df8dd4a213b8a3 Author: Stephen Hemminger Date: Mon Nov 1 14:06:24 2010 -0400 beceem: change startup messages Change the regsister/unregister routines to generate better messages, and control arrival of new frames when USB device is unplugged. Signed-off-by: Stephen Hemminger commit 9c5d77009db6ff09d02a7b0a99a70c0dfd3af6c6 Author: Stephen Hemminger Date: Mon Nov 1 13:59:01 2010 -0400 beceem: don't overrun user buffer on read Serious bug in original code, if app reads 10 bytes but 20 byte msg received memory would get overwritten. Signed-off-by: Stephen Hemminger commit 473f89fff76568a9f30c53b458e6323d48b0ab95 Author: Jarkko Nikula Date: Fri Oct 29 16:47:44 2010 +0300 ASoC: Fix SND_SOC_ALL_CODECS typo for alc5623 Include alc5623.c in SND_SOC_ALL_CODECS when dependencies are met. Signed-off-by: Jarkko Nikula Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6e1bd1ab1d9ab8e83cdc940df82fbf8418e2593f Merge: fec6dd8 76a6106 Author: Mark Brown Date: Mon Nov 1 13:58:18 2010 -0400 Merge branch 'for-2.6.37' into for-2.6.38 commit 5cf084f44ac24189ef3373010da49e26d651aa06 Author: Stephen Hemminger Date: Mon Nov 1 13:57:35 2010 -0400 beceem: eliminate unused bcm_jiffies Unused, unneeded, and bogus. Signed-off-by: Stephen Hemminger commit 78afa9990fdbbf01227104300a657be3f3caa167 Author: Stephen Hemminger Date: Mon Nov 1 13:54:21 2010 -0400 beceem: fix definition of VLAN header type Signed-off-by: Stephen Hemminger commit cacd92222dd4e04424fa532cf1a222e67c30709b Author: Stephen Hemminger Date: Mon Nov 1 13:34:35 2010 -0400 beceem: statistics and transmit queue changes Use standard network statistics variables and routines. Transmit counters are per queue, and skb mapping is already in skb and does not need to be recomputed. Move SearchVcId to only place it is used. Signed-off-by: Stephen Hemminger commit b5ebd85b2bcc0c0a2171e4cc74c61debdc903ddf Author: Stephen Hemminger Date: Mon Nov 1 12:28:39 2010 -0400 beceem: do classification even if device is offline Since classification and queue control are separate, allow classification even if device is down now; this avoids races on startup/shutdown. Signed-off-by: Stephen Hemminger commit 429a5908fe3bc4d9ca2512b94cd10b69d50bf91f Author: Stephen Hemminger Date: Mon Nov 1 12:27:20 2010 -0400 beceem: off by one on queue index The driver allocates 18 queues (0..16) are for traffic, and 17 is a bit bucket. Signed-off-by: Stephen Hemminger commit 9dd47ee7dd535649a2c32d509631c7a3d793f2e1 Author: Stephen Hemminger Date: Mon Nov 1 12:24:00 2010 -0400 beceem: make local functions static Use namespace tool from kernel scripts to identify dead code and functions that should be static. Signed-off-by: Stephen Hemminger commit 45400554923867c8479621e55a76e0612192dafb Author: Stephen Hemminger Date: Mon Nov 1 12:21:32 2010 -0400 beceem: remove unused code to dump header Signed-off-by: Stephen Hemminger commit ac1b1ae7f84dcde6d6fefc7f8ca27c4e5bd92c22 Author: Stephen Hemminger Date: Mon Nov 1 12:20:09 2010 -0400 beceem: transmit code cleanup Eliminate global variable in transmit path The Leader can be on the stack, and get rid of unnecessary timeval. Signed-off-by: Stephen Hemminger commit 1da9badcf02dd6532df9bde8fc05648e74982f2c Author: Stephen Hemminger Date: Mon Nov 1 11:58:01 2010 -0400 beceem: allow multicast/broadcast Even though wimax isn't really a broadcast medium, pretend it is. Signed-off-by: Stephen Hemminger commit 9ec4475bf10bb2c30cd5e927bc453aa307f58123 Author: Stephen Hemminger Date: Mon Nov 1 12:18:36 2010 -0400 beceem: debug message format changes Add more debug messages and make them similar to other drivers Signed-off-by: Stephen Hemminger commit e4d46254da76106e48b7cadc59fb410291e2da4b Author: Stephen Hemminger Date: Mon Nov 1 11:39:05 2010 -0400 beceem: use get_seconds for elapsed time get_seconds is lower overhead and fine if all driver wants to do is keep track of seconds. Signed-off-by: Stephen Hemminger commit 2d08748ae53bf07fe6fcaf4f3d40449b471ce351 Author: Stephen Hemminger Date: Mon Nov 1 12:14:01 2010 -0400 beceem: module initialization Get rid of boot messages and put in correct place. Signed-off-by: Stephen Hemminger commit 4fd64dd0c1b9317ffe6fdaf3de788e14df880d8d Author: Stephen Hemminger Date: Mon Nov 1 12:12:31 2010 -0400 beceem: add network device message level control Provide standard interface to control verbosity of debug messages Signed-off-by: Stephen Hemminger commit e39e3be66eed17f27a9de322e5220d33e70a90a6 Author: Stephen Hemminger Date: Mon Nov 1 11:14:29 2010 -0400 beceem: change format of debug message Statistic point is now u32 (like it has to be). Signed-off-by: Stephen Hemminger commit 3349d95b3f8c3becb9e6dbe0be978bf663174fef Author: Stephen Hemminger Date: Mon Nov 1 11:12:56 2010 -0400 beceem: clean up adapter structure Remove dead fields, change fields that only have true/false to boolean; and rearrange to save space. Signed-off-by: Stephen Hemminger commit 9e0a3169a34ba5fd04bde058a63fa0a36f2d7ed3 Author: Stephen Hemminger Date: Mon Nov 1 10:17:54 2010 -0400 beceem: create class on module installation First step to supporting multiple devices, create device class when module is initialized. Signed-off-by: Stephen Hemminger commit 46c3790eb523931a803bb3c28c5bf8bbfc8acf48 Author: Stephen Hemminger Date: Mon Nov 1 10:16:29 2010 -0400 beceem: convert to kernel coding style Change indentation etc, to conform to acceptable kernel style Signed-off-by: Stephen Hemminger commit 5afb5145a13ac26f3c7ab273140a83958bc038f0 Author: Stephen Hemminger Date: Mon Nov 1 10:07:20 2010 -0400 beceem: remove useless debug function entry messages Signed-off-by: Stephen Hemminger commit 957ea3b57056e79c945d8bc39fd6eeb3c2a7ed9e Author: Stephen Hemminger Date: Mon Nov 1 10:05:34 2010 -0400 beceem: remove problematic debug print messages Not worth bothering to change printf format of messages which are basically noise. Signed-off-by: Stephen Hemminger commit 032100f65295d594fc0481e840efe8b6c1e398af Author: Stephen Hemminger Date: Mon Nov 1 10:03:29 2010 -0400 beceem: remove unnecessary usb class Signed-off-by: Stephen Hemminger commit ada692b09f4707a8e06b087b1546d9f5b3f2d37d Author: Stephen Hemminger Date: Mon Nov 1 09:26:47 2010 -0400 beceem: fix character device ioctl Sparse caught several places where ioctl interface was incorrectly using user memory. Fix all the ioctl cases for casting and __user annotation. Signed-off-by: Stephen Hemminger commit c5ebe2278ba600ff48663ec84c6e7f34d291503f Author: Stephen Hemminger Date: Mon Nov 1 08:42:44 2010 -0400 beceem: fix printf format strings Signed-off-by: Stephen Hemminger commit 0980f2e8144ea0021a09be41176b736d76ca3db7 Author: Stephen Hemminger Date: Mon Nov 1 00:04:52 2010 -0400 beceem: reserve one queue for bit-bucket This preserves the semantics of the original driver (unclassified packets are dropped), but does it in a clean way; and fixes crash when packet is sent to offline device. Signed-off-by: Stephen Hemminger commit 3644c1a2f12b15e1c8bfb9ebfaacbd177011a72d Author: Stephen Hemminger Date: Mon Nov 1 00:03:03 2010 -0400 beceem: remove dead code Remove commented out with '#if 0' Signed-off-by: Stephen Hemminger commit 937110581650eaa517f045fb7b86b9828ba693ad Author: Stephen Hemminger Date: Sun Oct 31 23:55:21 2010 -0400 beceem: support multiple queues Current kernels have multi-queue support which can be used by this device. This has the advantage that a single type of traffic will not block other types. Signed-off-by: Stephen Hemminger commit 20f48653fcf51f6d1246b5f3f86b40ed779385b2 Author: Stephen Hemminger Date: Sun Oct 31 23:52:36 2010 -0400 beceem: get rid of unnecessary inline usage Many routines were tagged with inline_ but GCC does a better job of deciding this. Signed-off-by: Stephen Hemminger commit 26a0e39ac8ed1f38b31baeb901bc76501466d34e Author: Stephen Hemminger Date: Sun Oct 31 23:47:35 2010 -0400 beceem: fold unregister_netdevice into AdapterFree The function unregister_netdevice only called unregister_netdev. Signed-off-by: Stephen Hemminger commit 7441698fe9eb0eb473cf1699d9cd8dd06dfeaf77 Author: Stephen Hemminger Date: Mon Nov 1 09:53:58 2010 -0400 beceem: remove ARP spoofing Linux support NOARP flag, so the whole Arp spoofing routines are not needed. Signed-off-by: Stephen Hemminger commit 6ba8fe77ddd3a25daa8409333295b90c26a43bae Author: Stephen Hemminger Date: Sun Oct 31 23:43:55 2010 -0400 beceem: print better message on bad ioctl Signed-off-by: Stephen Hemminger commit e614e28eac1afcdc3d1275f3e1478aa3e5acc500 Author: Stephen Hemminger Date: Mon Nov 1 09:52:14 2010 -0400 beceem: remove indirection to Adapter structure Allocate Adapter structure as part of network device. Signed-off-by: Stephen Hemminber commit 2515ab628f227b0711393993fe3228e167cc988f Author: Stephen Hemminger Date: Fri Oct 29 21:39:54 2010 -0700 beceem: Add proper carrier and link management Start with carrier off. Don't track up/down status in driver private flag. Signed-off-by: Stephen Hemminger commit d7affd0f58c9f68441b4ce631d07fad2e6a448db Author: Stephen Hemminger Date: Fri Oct 29 17:15:06 2010 -0700 beceem: reduce transmit queue len Reduce transmit queue length to avoid excess buffering Signed-off-by: Stephen Hemminger commit 9c6e9aa830071a442fb72ab05c15e2b2609636e3 Author: Stephen Hemminger Date: Fri Oct 29 17:13:52 2010 -0700 beceem: remove dead code Signed-off-by: Stephen Hemminger commit d21d6dde0280f0897ce6de1948bfaa5633867b28 Author: Stephen Hemminger Date: Fri Oct 29 17:12:37 2010 -0700 beceem: add ethtool support This adds basic ethtool support to get driver info and settings Signed-off-by: Stephen Hemminger commit 71e253b1699fb777be68cb1028a90e21ea6ff8d8 Author: Stephen Hemminger Date: Mon Nov 1 09:49:30 2010 -0400 beceem: make transmit thread interruptible Kernel complains loudly if thread does long uninterruptible sleep. Also, dont wake up every 10ms even if no data present (wastes power). Signed-off-by: Stephen Hemminger commit 37b7a97884ba64bf7d403351ac2a9476ab4f1bba Author: Paul Mundt Date: Mon Nov 1 09:49:04 2010 -0400 sh: machvec IO death. This takes a bit of a sledgehammer to the machvec I/O routines. The iomem case requires no special casing and so can just be dropped outright. This only leaves the ioport casing for PCI and SuperIO mangling. With the SuperIO case going through the standard ioport mapping, it's possible to replace everything with generic routines. With this done the standard I/O routines are tidied up and NO_IOPORT now gets default-enabled for the vast majority of boards. Signed-off-by: Paul Mundt commit f2a630bfeccc87c3f89aaf8b4a8902f1e4e9f7ca Merge: 0f8c6d7 c6afd65 Author: Chris Wilson Date: Mon Nov 1 13:42:29 2010 +0000 Merge branch 'drm-intel-fixes' into drm-intel-next Conflicts: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_evict.c commit de85f9858969f50467bf39ee992ef871ae2492d3 Author: Stephen Hemminger Date: Fri Oct 29 17:02:39 2010 -0700 beceem: name threads with device name This is the convention used by Intel Wimax Signed-off-by: Stephen Hemminger commit 082e889b475c46e71be6e779f15ab095f888e03f Author: Stephen Hemminger Date: Mon Nov 1 09:35:21 2010 -0400 beceem: remove OS wrapper library Use native kernel functions for kmalloc/kfree directly Signed-off-by: Stephen Hemminger commit c5113e3c111b03c8eaf3fb0ef39e33dc25171adc Author: Stephen Hemminger Date: Fri Oct 29 21:26:06 2010 -0700 beceem: use kernel print_hex_dump function No longer need special hex dump routine Signed-off-by: Stephen Hemminger commit 0f8c6d7ca9257d6a01671ab69b897860d3ae9bc0 Author: Chris Wilson Date: Mon Nov 1 12:38:44 2010 +0000 drm/i915: Move the invalidate|flush information out of the device struct ... and into a local structure scoped for the single function in which it is used. Signed-off-by: Chris Wilson commit 13b2928933919c5344716d49620a52493a243f8c Author: Chris Wilson Date: Mon Nov 1 12:22:48 2010 +0000 drm/i915: Apply big hammer to serialise buffer access between rings Signed-off-by: Chris Wilson commit e5c652603680404683fd1f262b511340545179a2 Author: Chris Wilson Date: Mon Nov 1 11:35:28 2010 +0000 drm/i915/debugfs: Report ring in error state Signed-off-by: Chris Wilson commit 4b6ba8aacbb3185703b797286547d0f8f3859b02 Author: David Daney Date: Tue Oct 26 15:07:13 2010 -0700 of/net: Move of_get_mac_address() to a common source file. There are two identical implementations of of_get_mac_address(), one each in arch/powerpc/kernel/prom_parse.c and arch/microblaze/kernel/prom_parse.c. Move this function to a new common file of_net.{c,h} and adjust all the callers to include the new header. Signed-off-by: David Daney [grant.likely@secretlab.ca: protect header with #ifdef] Signed-off-by: Grant Likely commit 100519e2f1c20286158746f92f27c3aa14f5a893 Author: Chris Wilson Date: Sun Oct 31 10:37:02 2010 +0000 agp/intel: the GMCH is always enabled for integrated processor graphics ... and trying to set the bit is ineffectual. Fixes the regression from e380f60 which detected that we were trying to do undefined operations on the I830_GMCH_CTRL. Reported-by: Alexey Fisher Signed-off-by: Chris Wilson commit 5eac3ab45955b32f3a9d89e633918c4d6f133dfa Author: Chris Wilson Date: Sun Oct 31 08:49:47 2010 +0000 drm/i915: Evict just the purgeable GTT entries on the first pass Take two passes to evict everything whilst searching for sufficient free space to bind the batchbuffer. After searching for sufficient free space using LRU eviction, evict everything that is purgeable and try again. Only then if there is insufficient free space (or the GTT is too badly fragmented) evict everything from the aperture and try one last time. Signed-off-by: Chris Wilson commit ff75b9bc489710ff223bc0d805bf3b862dc347ea Author: Chris Wilson Date: Sat Oct 30 22:52:31 2010 +0100 drm/i915: Fix typo from e5281ccd in i915_gem_attach_phys_object() Accessing the uninitialised obj->pages instead of the local page lead to an OOPs. Reported-by: Xavier Chantry Signed-off-by: Chris Wilson commit bf01ca1b35ff26a4c16c22b9ce7554f0d3a45ba7 Author: Jesper Juhl Date: Sat Oct 30 15:32:32 2010 +0200 VIA Chrome camera: remove duplicate includes The VIA Chrome integrated camera controller driver includes both 'linux/pci.h' and 'linux/device.h' twice. This gets rid of the duplicates. Signed-off-by: Jesper Juhl Acked-by: Jonathan Corbet Signed-off-by: Jiri Kosina commit f1e095f1d206b81b44160f41278ce5c78641e9b7 Merge: b0438a1 1792f17 Author: Jiri Kosina Date: Sat Oct 30 22:16:56 2010 +0200 Merge branch 'master' into for-next commit 0ad008fcbc39572ab7078975cdf7e902fbc39ce6 Author: Stephen Hemminger Date: Fri Oct 29 16:44:07 2010 -0700 beceem: cleanup network device setup Change how network device is setup: * set pointer to device object so sysfs has eth0/device symlink * set network device type * eliminate all the compatiablity with older kernels. Signed-off-by: Stephen Hemminger commit 92bc60580e55d18494a23ba8ae642a464ebfd7a6 Author: Stephen Hemminger Date: Fri Oct 29 08:22:10 2010 -0700 beceem: get rid of OS dependent data structure The only part of this structure still used was the network device stats, and in recent kernel these are available in network device itself. Signed-off-by: Stephen Hemminger commit 2b5e625882a7130c339e4ad2ac2b8f0422f11919 Author: Stephen Hemminger Date: Fri Oct 29 08:20:11 2010 -0700 beceem: eliminate dead code Get rid of empty header file and unused declarations Signed-off-by: Stephen Hemminger commit d52db0b4b34410019e1546e3ccbe761b9e4ddd76 Author: Stephen Hemminger Date: Fri Oct 29 08:18:27 2010 -0700 beceem: eliminate network registered state variable Just use presence of pointer Signed-off-by: Stephen Hemminger commit 3705a843bd98b3ccb7c4b6addfc182fe805a73ed Author: Stephen Hemminger Date: Fri Oct 29 08:14:16 2010 -0700 beceem: remove bogus network device notifier Network device should not be messing with refcounts directly. See Documentation/networking/netdevices.txt Signed-off-by: Stephen Hemminger commit 2564a148d5326f1d36202e497b3dd0a17422c636 Author: Stephen Hemminger Date: Fri Oct 29 08:11:12 2010 -0700 beceem: cleanup debug level infrastructure Add module parameter to control debug level and do code cleanup The whole debug stuff should eventually be removed. Signed-off-by: Stephen Hemminger commit 047a5f2b503d0ba17704c9714b296cbf06ec087e Author: Stephen Hemminger Date: Fri Oct 29 08:04:18 2010 -0700 beceem: eliminate unused USB stubs USB layer does not require these reset function stubs Signed-off-by: Stephen Hemminger commit 5abe61ade9a137b35aa29919334dde7f3a30b248 Author: Stephen Hemminger Date: Fri Oct 29 08:02:08 2010 -0700 beceem: remove version ifdef's Remove code to support older kernel API's Signed-off-by: Stephen Hemminger commit 91d29ee1a82fedcd7d1bbf24007b31a49c47e90a Author: Stephen Hemminger Date: Fri Oct 29 07:51:47 2010 -0700 beceem: remove ifdef's There were a lot of ifdef's for driver options which have no configuration options. Choose the current value and remove the ifdef. Signed-off-by: Stephen Hemminger commit 2e44f765dfd3a8592c2d6b6005be061eccdee137 Author: Stephen Hemminger Date: Fri Oct 29 07:44:45 2010 -0700 beceem: add module information Add description and version information to the driver. Make USB device table exported as alias so device will be autoloaded. Get rid of useless noise message on boot. Signed-off-by: Stephen Hemminger commit add354ddf62beac55ca3ba64835dd703a0649867 Author: Chris Wilson Date: Fri Oct 29 19:00:51 2010 +0100 drm/i915: Record BSD engine error state Signed-off-by: Chris Wilson commit 6aa56062eaba67adfb247cded244fd877329588d Author: Chris Wilson Date: Fri Oct 29 21:44:37 2010 +0100 drm/i915/ringbuffer: Use the HEAD auto-reporting mechanism My Sandybridge only reports 0 for the ring buffer registers, causing it to hang as soon as we exhaust the available ring. As a workaround, take advantage of our huge ring buffers and use the auto-reporting mechanism to update the status page with the HEAD location every 64 KiB. Signed-off-by: Chris Wilson commit f4e0b29bf23687ac16dc476bd90cd4d8b0eacd5c Author: Chris Wilson Date: Fri Oct 29 21:06:16 2010 +0100 drm/i915: Check if the GPU hung whilst waiting for the ring to clear Signed-off-by: Chris Wilson commit 6dda569fe0fb71a03e2a2e815761796f98232cdb Author: Chris Wilson Date: Fri Oct 29 21:02:18 2010 +0100 drm/i915: Switch to using pci_iounmap in conjunction with pci_iomap After switching the MMIO registers to use pci_iomap, remember to dispose of the mapping with pci_iounmap (for symmetry). Signed-off-by: Chris Wilson commit 4066c0ae13a8388b9f2a29cad60da330b578eff2 Author: Chris Wilson Date: Fri Oct 29 21:00:54 2010 +0100 drm/i915/debugfs: Display the contents of the BLT and BSD status pages Signed-off-by: Chris Wilson commit e380f60b22eddec7825224b8d788572c82b63161 Author: Chris Wilson Date: Fri Oct 29 18:11:26 2010 +0100 agp/intel: Sandybridge doesn't require GMCH enabling Signed-off-by: Chris Wilson commit c584fe47e4d92934c10e5d7f932ee042587dbcff Author: Chris Wilson Date: Fri Oct 29 18:15:52 2010 +0100 drm/i915/ringbuffer: Remove duplicate initialisation of ring control Signed-off-by: Chris Wilson commit 1d8f38f4e7146d22f7fbc94eef0508bd75463f54 Author: Chris Wilson Date: Fri Oct 29 19:00:51 2010 +0100 drm/i915: Record BLT engine error state Signed-off-by: Chris Wilson commit 33626e6a08669b1a5834e76363dcd5c8733a4278 Author: Chris Wilson Date: Fri Oct 29 16:18:36 2010 +0100 drm/i915/ringbuffer: Disable the ringbuffer on cleanup. It should be idle on cleanup anyway... Signed-off-by: Chris Wilson commit 872d860c85e30cdc97e7c91723257f4fcf04d5e9 Author: Chris Wilson Date: Thu Oct 28 23:43:30 2010 +0100 drm/i915: Remove the duplicate domain-change tracepoint for GPU flush Signed-off-by: Chris Wilson commit a00b10c360b35d6431a94cbf130a4e162870d661 Author: Chris Wilson Date: Fri Sep 24 21:15:47 2010 +0100 drm/i915: Only enforce fence limits inside the GTT. So long as we adhere to the fence registers rules for alignment and no overlaps (including with unfenced accesses to linear memory) and account for the tiled access in our size allocation, we do not have to allocate the full fenced region for the object. This allows us to fight the bloat tiling imposed on pre-i965 chipsets and frees up RAM for real use. [Inside the GTT we still suffer the additional alignment constraints, so it doesn't magic allow us to render larger scenes without stalls -- we need the expanded GTT and fence pipelining to overcome those...] Signed-off-by: Chris Wilson commit 7465378fd7c681f6cf2b74b3494c4f0991d8c8ac Author: Chris Wilson Date: Fri Oct 29 10:41:23 2010 +0100 drm/i915: Convert BUG_ON(pin_count) from an impossible condition Also spotted by Dan Carpenter. obj->pin_count is unsigned so the BUG_ON(obj->pin_count<0) will never trigger. Signed-off-by: Chris Wilson commit b0438a1b71955c425c304a2a483765ef24841766 Author: Nicolas Kaiser Date: Fri Oct 29 11:41:42 2010 +0200 telephony: fix return value If copy_from_user fails, the return value gets overwritten. Signed-off-by: Nicolas Kaiser Signed-off-by: Jiri Kosina commit bbe2e11a4b683ead070ad5823cdf756e1525b903 Author: Chris Wilson Date: Thu Oct 28 22:35:07 2010 +0100 drm/i915: Do not return -1 from shrinker when nr_to_scan == 0 The error code is only expected during the actual pruning and not during the first measurement (nr_to_scan == 0) pass. Signed-off-by: Chris Wilson commit 4a684a4117abd756291969336af454e8a958802f Author: Chris Wilson Date: Thu Oct 28 14:44:08 2010 +0100 drm/i915: Kill GTT mappings when moving from GTT domain In order to force a page-fault on a GTT mapping after we start using it from the GPU and so enforce correct CPU/GPU synchronisation, we need to invalidate the mapping. Pointed out by Owain G. Ainsworth. Signed-off-by: Chris Wilson commit e5281ccd2e0049e2b9e8ce82449630d25082372d Author: Chris Wilson Date: Thu Oct 28 13:45:36 2010 +0100 drm/i915: Eliminate nested get/put pages By using read_cache_page() for individual pages during pwrite/pread we can eliminate an unnecessary large allocation (and immediate free) of obj->pages. Also this eliminates any potential nesting of get/put pages, simplifying the code and preparing the path for greater things. Signed-off-by: Chris Wilson commit 39a01d1fb63cf8ebc1a8cf436f5c0ba9657b55c6 Author: Chris Wilson Date: Thu Oct 28 13:03:06 2010 +0100 drm/i915: Remove mmap_offset Since we rarely use the mmap_offset and it is easily computable from the obj->map_list.hash, remove it. Signed-off-by: Chris Wilson commit 17250b71553680bc6e927497aa619ab06ab1015b Author: Chris Wilson Date: Thu Oct 28 12:51:39 2010 +0100 drm/i915: Make the inactive object shrinker per-device Eliminate the racy device unload by embedding a shrinker into each device. Smaller, simpler code. Signed-off-by: Chris Wilson commit fec6dd833e733b5d9588a1f1e4d81118b79b5774 Author: Mark Brown Date: Wed Oct 27 13:48:36 2010 -0700 ASoC: Store DC offset correction for wm_hubs devices in class W mode Providing the analogue configuration of the output path remains the same the DC offset corrected by the DC servo will remain identical so we can skip the callibration, reducing the startup time for the headphone output. Implement this for the wm_hubs devices as has been done for several other CODECs. Don't do this if we have any analogue paths enabled since offsets may be being introduced by the analogue paths which could vary outside the control of the driver. Signed-off-by: Mark Brown Acked-by: Liam Girdwood commit 176f28ebf4303b4f7e3a5bd8be7842a8bbecd9c3 Author: Chris Wilson Date: Thu Oct 28 11:18:07 2010 +0100 drm/i915/ringbuffer: Check that we setup the ringbuffer Signed-off-by: Chris Wilson commit b4ce0f85159f77f208a62930f67b4e548576a5a3 Author: Chris Wilson Date: Thu Oct 28 11:26:06 2010 +0100 drm/i915: Use pci_iomap for remapping the MMIO registers. Play safe and use the common routines which take care of the cachability of the memory when setting up the iomapping for the PCI registers. Whilst they should be cacheable for the current generations, actually honouring what the device requires is a better long term strategy. Signed-off-by: Chris Wilson commit f406839f094ef24bb201c9574fdb9ce8e799a975 Author: Chris Wilson Date: Wed Oct 27 20:36:41 2010 +0100 drm/i915: Capture ERROR register on Sandybridge hangs This holds error state from the main graphics arbiter mainly involving the DMA engine and address translation. Signed-off-by: Chris Wilson commit 71e9339c3389de6a685ecb26261a81b8a583aa1c Author: Chris Wilson Date: Wed Oct 27 18:46:52 2010 +0100 drm/i915: Use the agp_size determined from the GTT This is the same value as before, but it just makes the code slightly more readable to use the local variable than converting the aperture size into bytes every time. Signed-off-by: Chris Wilson commit da761a6edf5c12ba2e7566c5e6bc98899d46ff12 Author: Chris Wilson Date: Wed Oct 27 17:37:08 2010 +0100 drm/i915: Bail early if we try to mmap an object too large to be mapped. Signed-off-by: Chris Wilson commit fb7d516af11837126eb1e4a44ab0653bf9b57702 Author: Daniel Vetter Date: Fri Oct 1 22:05:20 2010 +0200 drm/i915: add accounting for mappable objects in gtt v2 More precisely: For those that _need_ to be mappable. Also add two BUG_ONs in fault and pin to check the consistency of the mappable flag. Changes in v2: - Add tracking of gtt mappable space (to notice mappable/unmappable balancing issues). - Improve the mappable working set tracking by tracking fault and pin separately. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit ec57d2602a985b54b53e53098f74fdefc24723af Author: Daniel Vetter Date: Thu Sep 30 23:42:15 2010 +0200 drm/i915: add mappable to gem_object_bind tracepoint This way we can make some more educated guesses as to why exactly we can't use 2G apertures to their full potential ;) Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 201728429d6cf336cfd7483fcd1bce47291b2901 Author: Daniel Vetter Date: Fri Sep 24 18:25:59 2010 +0200 intel-gtt: maximize ggtt size on platforms that support this On VT-d supporting platforms the GGTT is allocated in a stolen mem section separate from graphcis stolen mem. The GMCH register contains a bitfield specifying the size of that region. Docs suggest that this region can only be used for GGTT and PPGTT. Hence ensure that the PPGTT is disabled and use the complete area for the GGTT. Unfortunately the graphics core on G33/Pineview can't cope with really large GTTs and the BIOS usually enables the maximum of 512MB. So don't bother with maximizing the GTT on these platforms. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit b3eafc5af02a799650757f2c5b2b0d4835dd0a5f Author: Daniel Vetter Date: Thu Sep 23 20:04:17 2010 +0200 intel-gtt: save PGETBL_CTL later in the setup process ... and switch to a more classical store-reg-on-suspend, restore-on-resume way of doing things. Obviously this is just preparation for the future, the code is not there at all, yet. This is needed because the next patch adjusts this register and everything in it (not just the pagetable address) needs to be restored on resume. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 53984635a659e360f206a81ada4ae813152d72f1 Author: Daniel Vetter Date: Wed Sep 22 23:44:24 2010 +0200 drm/i915: use the complete gtt At least the part that's currently enabled by the BIOS. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 16e809acc167c3ede231cafcdab1be93bab3e429 Author: Daniel Vetter Date: Thu Sep 16 19:37:04 2010 +0200 drm/i915: unbind unmappable objects on fault/pin In i915_gem_object_pin obviously unbind only if mappable is true. This is the last part to enable gtt_mappable_end != gtt_size, which the next patch will do. v2: Fences on g33/pineview only work in the mappable part of the gtt. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 920afa77ced7124c8bb7d0c4839885618a3b4a54 Author: Daniel Vetter Date: Thu Sep 16 17:54:23 2010 +0200 drm/i915: range-restricted bind_to_gtt Like before add a parameter mappable (also to gem_object_pin) and set it depending upon the context. Only bos that are brought into the gtt due to an execbuffer call can be put into the unmappable part of the gtt, everything else (especially pinned objects) need to be put into the mappable part of the gtt. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit a6e0aa421406dc4cfd736c6d07d26ed39ab4f7bc Author: Daniel Vetter Date: Thu Sep 16 15:45:15 2010 +0200 drm/i915: range-restricted eviction support Add a mappable parameter to i915_gem_evict_something to distinguish the two cases (non-restricted vs. mappable gtt allocations). No functional changes because the mappable limit is set to the end of the gtt currently. Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit d935cc61d466f6cc7514032835f4fc379cb7e2ca Author: Daniel Vetter Date: Thu Sep 16 15:13:11 2010 +0200 drm_mm: add support for range-restricted fair-lru scans Signed-off-by: Daniel Vetter Signed-off-by: Chris Wilson commit 3cce469cab880ef8990d2d16d745bf85443fc998 Author: Chris Wilson Date: Wed Oct 27 16:11:02 2010 +0100 drm/i915: Propagate error from failing to queue a request Signed-off-by: Chris Wilson commit b2223497b44a4701d1be873d1e9453d7f720043b Author: Chris Wilson Date: Wed Oct 27 15:27:33 2010 +0100 drm/i915: Remove the confusing global waiting/irq seqno Signed-off-by: Chris Wilson commit c2c347a9eeda1b9b69c8fc393fd933747fbb2e11 Author: Chris Wilson Date: Wed Oct 27 15:11:53 2010 +0100 drm/i915/debugfs: Include info for the other rings The render ring is not alone any more! And the other rings are just as troublesome... Signed-off-by: Chris Wilson commit 893eead092f14e42cac054a394a86e3c6e016b68 Author: Chris Wilson Date: Wed Oct 27 14:44:35 2010 +0100 drm/i915: Fix hangcheck to handle multiple rings Currently, we believe the GPU is idle if just the RENDER ring is idle. This is obviously wrong if we only using either the BLT or the BSD rings and so masking genuine hangs. Signed-off-by: Chris Wilson commit 7e318e18f248416a3d32a1649a9b4538e7f8b0eb Author: Chris Wilson Date: Wed Oct 27 13:43:39 2010 +0100 drm/i915: Move object to GPU domains after dispatching execbuffer In the event that we fail to dispatch the execbuffer, for example if there is insufficient space on the ring, we were leaving the objects in an inconsistent state. Notably they were marked as being in the GPU write domain, but were not added to the ring or any list. This would lead to inevitable oops: [ 1010.522940] [drm:i915_gem_do_execbuffer] *ERROR* dispatch failed -16 [ 1010.523055] BUG: unable to handle kernel NULL pointer dereference at 0000000000000088 [ 1010.523097] IP: [] i915_gem_flush_ring+0x26/0x140 [ 1010.523120] PGD 14cf2f067 PUD 14ce04067 PMD 0 [ 1010.523140] Oops: 0000 [#1] SMP [ 1010.523154] last sysfs file: /sys/devices/virtual/vc/vcsa2/uevent [ 1010.523173] CPU 0 [ 1010.523183] Pid: 716, comm: X Not tainted 2.6.36+ #34 LosLunas CRB/SandyBridge Platform [ 1010.523206] RIP: 0010:[] [] i915_gem_flush_ring+0x26/0x140 [ 1010.523233] RSP: 0018:ffff88014bf97cd8 EFLAGS: 00010296 [ 1010.523249] RAX: ffff88014e2d1808 RBX: 0000000000000000 RCX: 0000000000000000 [ 1010.523270] RDX: 0000000000000002 RSI: 0000000000000000 RDI: 0000000000000000 [ 1010.523290] RBP: ffff88014e2d1000 R08: 0000000000000002 R09: 00000000400c645f [ 1010.523311] R10: 0000000000000001 R11: 0000000000000246 R12: 0000000000000002 [ 1010.523331] R13: ffff88014e29a000 R14: 00000000000000c8 R15: ffffffff8162eb28 [ 1010.523352] FS: 00007fc62379d700(0000) GS:ffff88001fc00000(0000) knlGS:0000000000000000 [ 1010.523375] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 1010.523392] CR2: 0000000000000088 CR3: 000000014bf87000 CR4: 00000000000406f0 [ 1010.523412] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 1010.523433] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 1010.523454] Process X (pid: 716, threadinfo ffff88014bf96000, task ffff88014cc1ee40) [ 1010.523475] Stack: [ 1010.523483] ffff88014d5199c0 0000000000000200 0000000000000000 ffff88014bcc6400 [ 1010.523509] <0> 0000000000000000 0000000000000001 ffff88014e29a000 ffff88014bcc6400 [ 1010.523537] <0> ffffffff8162eb28 ffffffff8122faa8 ffff88014e29a000 ffff88014bcc6400 [ 1010.523568] Call Trace: [ 1010.523578] [] ? i915_gem_object_flush_gpu_write_domain+0x48/0x80 [ 1010.523601] [] ? i915_gem_object_set_to_gtt_domain+0x2e/0xb0 [ 1010.523623] [] ? i915_gem_set_domain_ioctl+0xdb/0x1f0 [ 1010.523644] [] ? drm_ioctl+0x3d1/0x460 [ 1010.523660] [] ? i915_gem_set_domain_ioctl+0x0/0x1f0 [ 1010.523682] [] ? vma_prio_tree_insert+0x28/0x120 [ 1010.523701] [] ? vma_link+0x99/0xf0 [ 1010.523717] [] ? mmap_region+0x1ed/0x4f0 [ 1010.523734] [] ? do_vfs_ioctl+0x9f/0x580 [ 1010.523750] [] ? sys_ioctl+0x49/0x80 [ 1010.523767] [] ? system_call_fastpath+0x16/0x1b [ 1010.523785] Code: 00 00 00 00 00 41 57 89 ce 41 56 41 55 41 54 45 89 c4 55 48 89 fd 53 48 89 d3 44 89 c2 48 89 df 4c 8d b3 c8 00 00 00 48 83 ec 18 93 88 00 00 00 48 8b 83 c8 00 00 00 4c 8b bd 30 03 00 00 48 [ 1010.523946] RIP [] i915_gem_flush_ring+0x26/0x140 [ 1010.523966] RSP [ 1010.523977] CR2: 0000000000000088 Signed-off-by: Chris Wilson commit e1f99ce6cac3b6a95551642be5ddb5d9c46bea76 Author: Chris Wilson Date: Wed Oct 27 12:45:26 2010 +0100 drm/i915: Propagate errors from writing to ringbuffer Preparing the ringbuffer for adding new commands can fail (a timeout whilst waiting for the GPU to catch up and free some space). So check for any potential error before overwriting HEAD with new commands, and propagate that error back to the user where possible. Signed-off-by: Chris Wilson commit 78501eac34f372bfbeb4e1d9de688c13efa916f6 Author: Chris Wilson Date: Wed Oct 27 12:18:21 2010 +0100 drm/i915/ringbuffer: Drop the redundant dev from the vfunc interface The ringbuffer keeps a pointer to the parent device, so we can use that instead of passing around the pointer on the stack. Signed-off-by: Chris Wilson commit cdefba03e44bd3b3311a3849a81ec7030dfa1519 Author: Thomas Renninger Date: Mon Oct 25 21:11:16 2010 +0200 PNP: Set up pnp_debug via module and not via boot param. Cleanup only, no functional change (pnp.debug can be enabled and disabled at runtime, but that's not a real enhancement). This one depends on another PNP cleanup patch: PNP: Compile all pnp built-in stuff in one module namespace Signed-off-by: Thomas Renninger Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 803711afdbea5c6a6dd2b46eca76097f6d50fb53 Author: Thomas Renninger Date: Mon Oct 25 21:11:15 2010 +0200 PNP: Compile all pnp built-in stuff in one module namespace This is cleanup mostly, nothing urgent. I came up with it when looking at dynamic debug which can enable pr_debug messages at runtime or boot param for a specific module. Advantages: - Any pnp code can make use of the moduleparam.h interface, the modules will show up as pnp.param. - Passing pnp.ddebug as kernel boot param will enable all pnp debug messages with my previous patch and CONFIG_DYNAMIC_DEBUG enabled. Signed-off-by: Thomas Renninger Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 3fcedec752108de5d99b9f0373ff880756a1e87d Author: Julia Lawall Date: Tue Oct 26 12:25:32 2010 +0200 drivers/vhost/vhost.c: delete double assignment Delete successive assignments to the same location. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression i; @@ *i = ...; i = ...; // Signed-off-by: Julia Lawall Signed-off-by: Michael S. Tsirkin commit 7e6120c57cf92f005f72c6345c0961415099881e Author: Peter Ujfalusi Date: Mon Oct 25 11:34:23 2010 +0300 ASoC: TWL4030: Use usleep_range when appropriate Change the busy loop delays with usleep_range or msleep calls. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit eb48c9cb2053e7bb5f7f8f0371cb578a0d439450 Author: Robert Richter Date: Mon Oct 25 16:03:39 2010 +0200 apic, amd: Make firmware bug messages more meaningful This improves error messages in case the BIOS was setting up wrong LVT offsets. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-6-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 0a17941e71f089b128514f7b5b486e20072ca7dc Author: Robert Richter Date: Mon Oct 25 16:03:38 2010 +0200 mce, amd: Remove goto in threshold_create_device() Removing the goto in threshold_create_device(). Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-5-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit bbaff08dca3c34d0fb6b4c4051354184e33e3df8 Author: Robert Richter Date: Mon Oct 25 16:03:37 2010 +0200 mce, amd: Add helper functions to setup APIC This patch reworks and cleans up mce_amd_feature_init() by introducing helper functions to setup and check the LVT offset. It also fixes line endings in pr_err() calls. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-4-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 7203a0494084541575bac6dfc4e153f9e28869b8 Author: Robert Richter Date: Mon Oct 25 16:03:36 2010 +0200 mce, amd: Shorten local variables mci_misc_{hi,lo} Shorten this variables to make later changes more readable. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-3-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 9c37c9d89773ee9da9f6af28ee37d931bd045711 Author: Robert Richter Date: Mon Oct 25 16:03:35 2010 +0200 mce, amd: Implement mce_threshold_block_init() helper function This patch adds a helper function for the initial setup of an mce threshold block. The LVT offset is passed as argument. Also making variable threshold_defaults local as it is only used in function mce_amd_feature_init(). Function threshold_restart_bank() is extended to setup the LVT offset, the change is backward compatible. Thus, now there is only a single wrmsrl() to setup the block. Signed-off-by: Robert Richter Acked-by: Borislav Petkov LKML-Reference: <1288015419-29543-2-git-send-email-robert.richter@amd.com> Signed-off-by: Ingo Molnar commit 7fb2b870d6a3b92f6750ac2b72858fd098dc9e3f Author: Thomas Gleixner Date: Sun Oct 24 11:11:22 2010 +0200 x86: io_apic: Fix CONFIG_X86_IO_APIC=n breakage Stupid me forgot to change the function name for the CONFIG_X86_IO_APIC=n case in commit 23f9b2671 (x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings()) Signed-off-by: Thomas Gleixner commit fe7de49f9d4e53f24ec9ef762a503f70b562341c Author: KOSAKI Motohiro Date: Wed Oct 20 16:01:12 2010 -0700 sched: Make sched_param argument static in sched_setscheduler() callers Andrew Morton pointed out almost all sched_setscheduler() callers are using fixed parameters and can be converted to static. It reduces runtime memory use a little. Signed-off-by: KOSAKI Motohiro Reported-by: Andrew Morton Acked-by: James Morris Cc: Ingo Molnar Cc: Steven Rostedt Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner Signed-off-by: Ingo Molnar commit 23f9b267159b4c7ff59d2e6c8ed31693eff841e3 Author: Thomas Gleixner Date: Fri Oct 15 15:38:50 2010 -0700 x86: apic: Move probe_nr_irqs_gsi() into ioapic_init_mappings() probe_br_irqs_gsi() is called right after ioapic_init_mappings() and there are no other users. Move it into ioapic_init_mappings() so the declaration can disappear and the function can become static. Rename ioapic_init_mappings() to ioapic_and_gsi_init() to reflect that change. Signed-off-by: Thomas Gleixner LKML-Reference: <1287510389-8388-2-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Dirk Brandewie commit 5a7ae78fd478624df3059cb6f55056b85d074acc Author: Thomas Gleixner Date: Tue Oct 19 10:46:28 2010 -0700 x86: Allow platforms to force enable apic Some embedded x86 platforms don't setup the APIC in the BIOS/bootloader and would be forced to add "lapic" on the kernel command line. That's a bit akward. Split out the force enable code from detect_init_APIC() and allow platform code to call it from the platform setup. That avoids the command line parameter and possible replication of the MSR dance in the force enable code. Signed-off-by: Thomas Gleixner LKML-Reference: <1287510389-8388-1-git-send-email-dirk.brandewie@gmail.com> Signed-off-by: Dirk Brandewie commit fd35fbcdd1b2579a6e00a1545f7124e4005d0474 Author: H. Peter Anvin Date: Fri Oct 22 15:33:38 2010 -0700 x86-64, asm: Use fxsaveq/fxrestorq in more places Checkin d7acb92fea932ad2e7846480aeacddc2c03c8485 made use of fxsaveq in fpu_fxsave() if the assembler supports it; this adds fxsaveq/fxrstorq to fxrstor_checking() and fxsave_user() as well. Reported-by: Linus Torvalds LKML-Reference: Signed-off-by: H. Peter Anvin commit 466bd3030973910118ca601da8072be97a1e2209 Author: Yong Zhang Date: Wed Oct 20 15:57:33 2010 -0700 timer: Warn when del_timer_sync() is called in hardirq context Add explict warning when del_timer_sync() is called in hardirq context. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Acked-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 1118e2cd33d47254854e1ba3ba8e32802ff14fdf Author: Yong Zhang Date: Wed Oct 20 15:57:32 2010 -0700 timer: Del_timer_sync() can be used in softirq context Actually we have used del_timer_sync() in softirq context for a long time, e.g. in __dst_free()::cancel_delayed_work(). So change the comments of it to warn on hardirq context only, and make lockdep know about this change. Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 6f1bc451e6a79470b122a37ee1fc6bbca450f444 Author: Yong Zhang Date: Wed Oct 20 15:57:31 2010 -0700 timer: Make try_to_del_timer_sync() the same on SMP and UP On UP try_to_del_timer_sync() is mapped to del_timer() which does not take the running timer callback into account, so it has different semantics. Remove the SMP dependency of try_to_del_timer_sync() by using base->running_timer in the UP case as well. [ tglx: Removed set_running_timer() inline and tweaked the changelog ] Signed-off-by: Yong Zhang Cc: Ingo Molnar Cc: Peter Zijlstra Acked-by: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit d906401114861585c990ff0290c002b5d22fc71a Author: Arnaud Patard (Rtp) Date: Thu Oct 21 19:40:03 2010 +0200 ASoC: kirkwood: Add audio support to hp t5325 thin clients This patch is adding support for hp t5325 thin clients. There's a alc5623 codec connected to the i2s interface. Signed-off-by: Arnaud Patard Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 6f4bc952c60b26ecfcb013fb9a7e9474023e046e Author: Arnaud Patard (Rtp) Date: Thu Oct 21 19:40:02 2010 +0200 ASoC: add support for alc562[123] codecs This patch is adding support for alc562[123] codecs. It's based on the source code available in HP source code and other places. Signed-off-by: Arnaud Patard Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 20f33a03f0cf87e51165f7084f697acfb68e865b Author: Namhyung Kim Date: Wed Oct 20 15:57:34 2010 -0700 posix-timers: Annotate lock_timer() lock_timer() conditionally grabs it_lock in case of returning non-NULL but unlock_timer() releases it unconditionally. This leads sparse to complain about the lock context imbalance. Rename and wrap lock_timer using __cond_lock() macro to make sparse happy. Signed-off-by: Namhyung Kim Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit dd6414b50fa2b1cd247a8aa8f8bd42414b7453e1 Author: Phil Carmody Date: Wed Oct 20 15:57:33 2010 -0700 timer: Permit statically-declared work with deferrable timers Currently, you have to just define a delayed_work uninitialised, and then initialise it before first use. That's a tad clumsy. At risk of playing mind-games with the compiler, fooling it into doing pointer arithmetic with compile-time-constants, this lets clients properly initialise delayed work with deferrable timers statically. This patch was inspired by the issues which lead Artem Bityutskiy to commit 8eab945c5616fc984 ("sunrpc: make the cache cleaner workqueue deferrable"). Signed-off-by: Phil Carmody Acked-by: Artem Bityutskiy Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 2bf1c05e3c406925e498d06da66b4828f0209ea6 Author: Nikitas Angelinas Date: Wed Oct 20 15:57:31 2010 -0700 time: Use ARRAY_SIZE macro in timecompare.c Replace sizeof(buffer)/sizeof(buffer[0]) with ARRAY_SIZE(buffer) in kernel/time/timecompare.c Signed-off-by: Nikitas Angelinas Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit aaabe31c25a439b92cc281b14ca18b85bae7e7a6 Author: Changli Gao Date: Wed Oct 20 15:57:30 2010 -0700 timer: Initialize the field slack of timer_list TIMER_INITIALIZER() should initialize the field slack of timer_list as __init_timer() does. Signed-off-by: Changli Gao Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit d0959024d8fb6555ba8bfdc6624cc7b7c2e675fd Author: Richard Kennedy Date: Wed Oct 20 15:57:30 2010 -0700 timer_list: Remove alignment padding on 64 bit when CONFIG_TIMER_STATS Reorder struct timer_list to remove 8 bytes of alignment padding on 64 bit builds when CONFIG_TIMER_STATS is selected. timer_list is widely used across the kernel so many structures will benefit and shrink in size. For example, with my config on x86_64 per_cpu_dm_data shrinks from 136 to 128 bytes and ahci_port_priv shrinks from 1032 to 968 bytes. Signed-off-by: Richard Kennedy Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit a386b5af8edda1c742ce9f77891e112eefffc005 Author: Kasper Pedersen Date: Wed Oct 20 15:55:15 2010 -0700 time: Compensate for rounding on odd-frequency clocksources When the clocksource is not a multiple of HZ, the clock will be off. For acpi_pm, HZ=1000 the error is 127.111 ppm: The rounding of cycle_interval ends up generating a false error term in ntp_error accumulation since xtime_interval is not exactly 1/HZ. So, we subtract out the error caused by the rounding. This has been visible since 2.6.32-rc2 commit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601 time: Implement logarithmic time accumulation That commit raised NTP_INTERVAL_FREQ and exposed the rounding error. testing tool: http://n1.taur.dk/permanent/testpmt.c Also tested with ntpd and a frequency counter. Signed-off-by: Kasper Pedersen Acked-by: john stultz Cc: John Kacur Cc: Clark Williams Cc: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit 8e8be45e8e55daa381028aec339829929ddb53a5 Author: Paul E. McKenney Date: Thu Sep 2 16:16:14 2010 -0700 rcu: add priority-inversion testing to rcutorture Add an optional test to force long-term preemption of RCU read-side critical sections, controlled by new test_boost, test_boost_interval, and test_boost_duration module parameters. This is to be used to test RCU priority boosting. Signed-off-by: Paul E. McKenney commit e39d5ef678045d61812c1401f04fe8edb14d6359 Author: Anatolij Gustschin Date: Mon Aug 9 07:58:48 2010 +0200 powerpc/5xxx: extend mpc8xxx_gpio driver to support mpc512x gpios The GPIO controller of MPC512x is slightly different from 8xxx GPIO controllers. The register interface is the same except the external interrupt control register. The MPC512x GPIO controller differentiates between four interrupt event types and therefore provides two interrupt control registers, GPICR1 and GPICR2. GPIO[0:15] interrupt event types are configured in GPICR1 register, GPIO[16:31] - in GPICR2 register. This patch adds MPC512x speciffic set_type() callback and updates config file and comments. Additionally the gpio chip registration function is changed to use for_each_matching_node() preventing multiple registration if a node claimes compatibility with another gpio controller type. Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit d3b8f889a220aed825accc28eb64ce283a0d51ac Author: john stultz Date: Mon Aug 17 16:40:47 2009 -0700 x86: Make tsc=reliable override boot time stability checks This patch makes the tsc=reliable option disable the boot time stability checks. Currently the option only disables the runtime watchdog checks. This change allows folks who want to override the boot time TSC stability checks and use the TSC when the system would otherwise disqualify it. There still are some situations that the TSC will be disqualified, such as cpufreq scaling. But these are situations where the box will hang if allowed. Patch also includes a fix for an issue found by Thomas Gleixner, where the TSC disqualification message wouldn't be printed after a call to unsynchronized_tsc(). Signed-off-by: John Stultz Cc: Andrew Morton Cc: akataria@vmware.com Cc: Stephen Hemminger LKML-Reference: <1250552447.7212.92.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner commit f8e53553f452dcbf67cb89c8cba63a1cd6eb4cc0 Author: Paul Mundt Date: Wed Jun 24 19:54:48 2009 +0900 serial: sh-sci: Kill off more unused defines. Signed-off-by: Paul Mundt commit 8e6986149129acc6528a7231350c31ce3e3dadc5 Author: Paul Mundt Date: Wed Jun 24 19:44:32 2009 +0900 serial: sh-sci: Convert from old SCSR control flags to common defines. Many of these flags were duplicated, and as we now need this visibility to set them from the platform code, we can just use the linux/serial_sci.h variants instead. Signed-off-by: Paul Mundt commit 706622c920232bc79ca20eaca252d3eb9103ae96 Author: Paul Mundt Date: Wed Jun 24 19:40:54 2009 +0900 serial: sh-sci: Kill off unused register accessors. Several of these registers are defined but never used, kill them off in the interest of increased sanity. Signed-off-by: Paul Mundt commit 26c92f3728d738aaa7e4859d5581323cd68096dd Author: Paul Mundt Date: Wed Jun 24 18:23:52 2009 +0900 serial: sh-sci: Move SCBRR calculation algo in to platform data. This permits each port to select its own SCBRR calculation algorithm, rather than having it all ifdef'ed in the header. There are presently only 5 different variations that all parts fall under. Signed-off-by: Paul Mundt commit 00b9de9c249f51f09c19aa41cbbb3e3eb4eea807 Author: Paul Mundt Date: Wed Jun 24 17:53:33 2009 +0900 serial: sh-sci: Move SCSCR_INIT in to platform data. This moves all of the SCSCR_INIT definitions in to the platform data, for future consolidation. Signed-off-by: Paul Mundt