commit 25cf84cf377c0aae5dbcf937ea89bc7893db5176 Merge: 322aafa 335a64a5c Author: Linus Torvalds Date: Sun Mar 7 16:04:03 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console * git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console: virtio: console: Use better variable names for fill_queue operation virtio: console: Fix type of 'len' as unsigned int commit 322aafa6645a48c3b7837ca7385f126ab78127fd Merge: dd04265 c7bbf52 Author: Linus Torvalds Date: Sun Mar 7 15:59:39 2010 -0800 Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (30 commits) x86, mrst: Fix whitespace breakage in apb_timer.c x86, mrst: Fix APB timer per cpu clockevent x86, mrst: Remove X86_MRST dependency on PCI_IOAPIC x86, olpc: Use pci subarch init for OLPC x86, pci: Add arch_init to x86_init abstraction x86, mrst: Add Kconfig dependencies for Moorestown x86, pci: Exclude Moorestown PCI code if CONFIG_X86_MRST=n x86, numaq: Make CONFIG_X86_NUMAQ depend on CONFIG_PCI x86, pci: Add sanity check for PCI fixed bar probing x86, legacy_irq: Remove duplicate vector assigment x86, legacy_irq: Remove left over nr_legacy_irqs x86, mrst: Platform clock setup code x86, apbt: Moorestown APB system timer driver x86, mrst: Add vrtc platform data setup code x86, mrst: Add platform timer info parsing code x86, mrst: Fill in PCI functions in x86_init layer x86, mrst: Add dummy legacy pic to platform setup x86/PCI: Moorestown PCI support x86, ioapic: Add dummy ioapic functions x86, ioapic: Early enable ioapic for timer irq ... Fixed up semantic conflict of new clocksources due to commit 17622339af25 ("clocksource: add argument to resume callback"). commit dd04265b028c00c365a78f9ff78a05e217f98656 Merge: 6dc3eb5 3f4ae86 Author: Linus Torvalds Date: Sun Mar 7 15:56:25 2010 -0800 Merge branch 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux * 'for-linus/i2c' of git://git.fluff.org/bjdooks/linux: i2c: Add support for Xilinx XPS IIC Bus Interface i2c: omap: Add support for 16-bit registers i2c-pnx: fix setting start/stop condition powerpc: doc/dts-bindings: update doc of FSL I2C bindings i2c-mpc: add support for the MPC512x processors from Freescale i2c-mpc: rename "setclock" initialization functions to "setup" i2c-mpc: use __devinit[data] for initialization functions and data i2c/imx: don't add probe function to the driver struct i2c: Add support for Ux500/Nomadik I2C controller commit 6dc3eb5c1f96641cda7056aa34393e317076d6cf Merge: 8fe900b 2c08583 Author: Linus Torvalds Date: Sun Mar 7 15:56:04 2010 -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: (66 commits) mfd: Fix ucb1x00 build failure for collie_defconfig mfd: Fix lpc_sch related depends/selects, fix build error gpio: Fix sch_gpio warning gpio: add Intel SCH GPIO controller driver i2c: convert i2c-isch to platform_device mfd: Use completion interrupt for WM831x AUXADC mfd: Use completion interrupt for WM835x AUXADC mfd: Introduce remove_script function for twl4030 mfd/mmc: SDHI Kconfig update mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support gpiolib: Force wm831x GPIOs into GPIO mode when requested mfd: Add WM831x revision B support gpiolib: Correct debugfs display of WM831x GPIO inversion gpiolib: Actually set output state in wm831x_gpio_direction_output() tmio_mmc: Balance cell enable()/disable() calls tmio_mmc: Remove const from platform data V3 tmio_mmc: Use 100ms mmc_detect_change() delay tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2 tmio_mmc: Keep card-detect interrupts enabled mfd: Add twl6030 base addr for ID0, ID1, ID2 ... commit 8fe900b8c7aa6a307e552ff776e0c04c28dcf9c8 Merge: 138860b a71b676 Author: Linus Torvalds Date: Sun Mar 7 15:49:12 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (368 commits) Staging: winbond: fix up wireless api errors Staging: dream: camera: sk5k3e2fx: fix code style issues Staging: dream: camera: msm_camera: fix code style issues Staging: wlan-ng: More checkpatch.pl error cleanups Staging: wlan-ng - checkpatch.pl fixups Staging: comedi: comedi_fops.c: Checkpatch cleanup Staging: comedi: fix suspect code indent in ni_labpc.c Staging: comedi: fix yet another brace coding style issue in ni_labpc.c Staging: comedi: fix another brace coding style issues in ni_labpc.c Staging: comedi: fix brace coding style issue in ni_labpc.c Staging: comedi: poc: Adding some KERN_ facility level Staging: dream: camera: msm_camera: fix some code style issues Staging: wlan-ng: fix most of the style issues in hfa384x.h Staging: dream: camera: msm_camera: fix coding style issues Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c Staging: comedi: fix bracing coding style issue in ni_65xx.c Staging: comedi: pcmad: Checkpatch cleanups Staging: comedi: poc: fix coding style issues staging: dt3155: revert u_long to u64 usage Staging: comedi: drivers.c: Checkpatch cleanup ... commit 138860b95359feee49a31fb12be87825e4cd84ac Author: Randy Dunlap Date: Thu Mar 4 09:37:12 2010 -0800 seq_file: fix new kernel-doc warnings Fix kernel-doc notation in new seq-file functions and correct spelling. Signed-off-by: Randy Dunlap Cc: Li Zefan Cc: Alexander Viro Signed-off-by: Linus Torvalds commit 4a31c08d2fecc74a630653828f5388fbb037f8c2 Merge: 2ddb3b1 0272282 Author: Linus Torvalds Date: Sun Mar 7 15:47:19 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (26 commits) sh: Convert sh to use read/update_persistent_clock sh: Move PMB debugfs entry initialization to later stage sh: Fix up flush_cache_vmap() on SMP. sh: fix up MMU reset with variable PMB mapping sizes. sh: establish PMB mappings for NUMA nodes. sh: check for existing mappings for bolted PMB entries. sh: fixed virt/phys mapping helpers for PMB. sh: make pmb iomapping configurable. sh: reworked dynamic PMB mapping. sh: Fix up cpumask_of_pcibus() for the NUMA build. serial: sh-sci: Tidy up build warnings. sh: Fix up ctrl_read/write stragglers in migor setup. serial: sh-sci: Add DMA support. dmaengine: shdma: extend .device_terminate_all() to record partial transfer sh: merge sh7722 and sh7724 DMA register definitions sh: activate runtime PM for dmaengine on sh7722 and sh7724 dmaengine: shdma: add runtime PM support. dmaengine: shdma: separate DMA headers. dmaengine: shdma: convert to platform device resources dmaengine: shdma: fix DMA error handling. ... commit 2ddb3b15f1b46836c61cfac5b00d8f08a24236e6 Merge: 5980bb3 6ee7765 Author: Linus Torvalds Date: Sun Mar 7 15:45:53 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: parisc: use __ratelimit in unaligned.c parisc: Convert to read/update_persistent_clock parisc: Simplify param.h by including parisc: drop unnecessary cast in __ldcw_align() macro parisc: add strict copy size checks (v2) parisc: remove trailing space in messages parisc: ditto sys_accept4 parisc: wire up sys_recvmmsg commit 5980bb3ee6e733d66eea04c221a140dea15d52de Merge: 68ae6b5 d690b2c Author: Linus Torvalds Date: Sun Mar 7 15:45:35 2010 -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: PM: Provide generic subsystem-level callbacks PM / Runtime: Document power.runtime_auto and related functions commit 68ae6b5cc1e8b88754a64140b88e467e02abfea2 Merge: 08b8499 bc505f3 Author: Linus Torvalds Date: Sun Mar 7 15:38:23 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: virtio: set pci bus master enable bit commit 3f4ae8605261e6f71e721e026bc18cb1851a7276 Merge: 2086f84 e1d5b65 Author: Ben Dooks Date: Sun Mar 7 22:29:28 2010 +0000 Merge branch 'next-i2c-xilinx' into next-i2c commit 2086f848e0f7bd71d49a92c6acb127e3bf766907 Merge: aaa02ab d84d3ea Author: Ben Dooks Date: Sun Mar 7 22:29:21 2010 +0000 Merge branch 'next-i2c-omap' into next-i2c commit aaa02ab55796341e713f798c57c5099153869278 Merge: ad0194e 192505b Author: Ben Dooks Date: Sun Mar 7 22:29:13 2010 +0000 Merge branch 'next-i2c-mpc-v8' into next-i2c commit e1d5b6598cdc33257fe68302ae9db81d2f7bb883 Author: Richard Röjfors Date: Thu Feb 11 10:42:00 2010 +0100 i2c: Add support for Xilinx XPS IIC Bus Interface This patch adds support for the Xilinx XPS IIC Bus Interface. The driver uses the dynamic mode, supporting to put several I2C messages in the FIFO to reduce the number of interrupts. It has the same feature as ocores, it can be passed a list of devices that will be added when the bus is probed. Signed-off-by: Richard Röjfors Signed-off-by: Ben Dooks commit d84d3ea317ce0db89ce0903b4037f800c5d4c477 Author: Cory Maccarrone Date: Sat Dec 12 17:54:02 2009 -0800 i2c: omap: Add support for 16-bit registers The current i2c-omap driver is set up for 32-bit registers, which corresponds to most OMAP devices. However, OMAP730/850 based devices use a 16-bit register size. This change modifies the driver to perform a runtime CPU type check to determine the register sizes, and uses a bit shift of either 1 or 2 bits to compute the proper register sizes for all registers. Signed-off-by: Cory Maccarrone Acked-by: Tony Lindgren Signed-off-by: Ben Dooks commit ad0194e8d624df67a970a36e8ef9e61514e25553 Author: Luotao Fu Date: Mon Mar 1 13:24:24 2010 +0100 i2c-pnx: fix setting start/stop condition The start/stop condtions are set in different places repetedly in the i2c-pnx driver. Beside in i2c_pnx_start and i2c_pnx_stop the start/stop bit are also set during the transfer of a i2c message in the master_xmit/rcv calls. This is wrong since we can't set the start/stop condition during the transaction of a single message any way. As a matter of fact, the driver will sometimes set both the start and the stop bits at one time. This can be easily reproduced by sending a simple read request like e.g struct i2c_msg msgs[] = { { addr, 0, 1, buf }, { addr, I2C_M_RD, offset, buf } }; While processing the first message the i2c_pnx_master_xmit will set both the start_bit and the stop_bit, which will eventually confuse the slave. Fixed by remove setting start/stop condition from the transmit routines. Signed-off-by: Luotao Fu Signed-off-by: Ben Dooks commit 192505bdb4e43ecbd11627bc0e205875edba473c Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:20 2010 +0100 powerpc: doc/dts-bindings: update doc of FSL I2C bindings This patch adds the MPC5121 to the list of supported devices, enhances the doc of the "clock-frequency" property and removes the obsolete "cell-index", "device_type" and "fsl-i2c" property. Furthermore an example for the MPC5121 has been added. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: Ben Dooks commit f00d738f04899534e2c372b2ad8b670050a945e2 Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:19 2010 +0100 i2c-mpc: add support for the MPC512x processors from Freescale As I2C interrupts must be enabled for the MPC512x by the setup function as well, "fsl,preserve-clocking" is handled in a slighly different way. Also, the old settings are now reported calling dev_dbg(). For the MPC512x the clock setup function of the MPC52xx can be re-used. Furthermore, the Kconfig help has been updated and corrected. Signed-off-by: Wolfgang Grandegger Reviewed-by: Wolfram Sang Signed-off-by: Ben Dooks commit a93522116ee5aa13eeb74c0fd73d8c5d15211e64 Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:18 2010 +0100 i2c-mpc: rename "setclock" initialization functions to "setup" To prepare support for the MPC512x processors from Freescale the "setclock" initialization functions have been renamed to "setup" because I2C interrupts must be enabled for the MPC512x by this function as well. Signed-off-by: Wolfgang Grandegger Acked-by: Wolfram Sang Signed-off-by: Ben Dooks commit 6e56dd3d0e1e899a824c247aa72bc4250ce7668a Author: Wolfgang Grandegger Date: Wed Feb 17 11:19:17 2010 +0100 i2c-mpc: use __devinit[data] for initialization functions and data "__devinit[data]" has not yet been used for all initialization functions and data. To avoid truncating lines, the struct "mpc_i2c_match_data" has been renamed to "mpc_i2c_data", which is even the better name. Signed-off-by: Wolfgang Grandegger Tested-by: Wolfram Sang Signed-off-by: Ben Dooks commit 96eb7164e3c2f8c1b53118078e5c06f7c34c2d49 Author: Uwe Kleine-König Date: Mon Feb 1 15:57:25 2010 +0100 i2c/imx: don't add probe function to the driver struct Having a pointer to the probe function is unnecessary when using platform_driver_probe and yields a section mismatch warning after removing the white list entry "*driver" for { .data$, .data.rel$ } -> { .init.* } mismatches in modpost. Signed-off-by: Uwe Kleine-König Signed-off-by: Ben Dooks commit 3f9900f17cdb0366d234c0487df80a6b0d18c852 Author: srinidhi kasagar Date: Mon Feb 1 19:44:54 2010 +0530 i2c: Add support for Ux500/Nomadik I2C controller This adds support for ST-Ericsson's I2C block found in Ux500 and Nomadik 8815 platforms. Signed-off-by: srinidhi kasagar Acked-by: Andrea Gallo Acked-by: Linus Walleij Reviewed-by: Linus Walleij Signed-off-by: Ben Dooks commit 2c08583c6a6b4c5f5dea4cb0931eca82af7db6fe Author: Peter Huewe Date: Sat Mar 6 14:36:38 2010 +0100 mfd: Fix ucb1x00 build failure for collie_defconfig This patch fixes a build failure[1], by adding the missing semaphore.h include References: [1] http://kisskb.ellerman.id.au/kisskb/buildresult/2234322/ Signed-off-by: Peter Huewe Signed-off-by: Samuel Ortiz commit 860fb8c134ebca9be8bc2ddd2b13e19ac10c192e Author: Randy Dunlap Date: Fri Mar 5 09:43:06 2010 -0800 mfd: Fix lpc_sch related depends/selects, fix build error LPC_SCH is selected by GPI_SCH and I2C_ISCH, even when PCI is not enabled, but LPC_SCH depends on PCI, so make GPI_SCH and I2C_ISCH also depend on PCI. Those 2 selects also need to select what LPC_SCH selects, since kconfig does not follow selects. Signed-off-by: Randy Dunlap Cc: Denis Turischev Signed-off-by: Samuel Ortiz commit 8e7aafe41be2a7cd5c181ed68876e9ec55ccdba7 Author: Samuel Ortiz Date: Fri Mar 5 17:14:01 2010 +0100 gpio: Fix sch_gpio warning We need to check for gpiochip_remove() errors. Signed-off-by: Samuel Ortiz commit be9b06b2d80fe661491138c6993f944babb26260 Author: Denis Turischev Date: Tue Mar 2 10:48:55 2010 +0100 gpio: add Intel SCH GPIO controller driver Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit fd46a0064af171c90664e5b7165c0c9f94478a87 Author: Denis Turischev Date: Mon Mar 1 18:59:55 2010 +0200 i2c: convert i2c-isch to platform_device Convert i2c-isch to platform_device for the lpc mfd core to add it at probe time. Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit 473fe73650b9f92114edbedfbb616561c1a0026c Author: Mark Brown Date: Tue Feb 23 11:08:06 2010 +0000 mfd: Use completion interrupt for WM831x AUXADC Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the status of the AUXADC if we don't get a completion, mostly for systems that don't have the WM831x interrupt infrastructure hooked up. Also reduce the timeout for completion of conversions to 5ms from the previous 10ms, the lower timeout should be sufficient. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit d19663ac61a6e36eec655d3c84a106686ebddd2c Author: Mark Brown Date: Tue Feb 23 11:08:05 2010 +0000 mfd: Use completion interrupt for WM835x AUXADC Use the completion interrupt generated by the device rather than polling for conversions to complete. As a backup we still check the state of the AUXADC if we don't get a completion, mostly for systems that don't have the WM8350 interrupt infrastructure hooked up. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 11a441ce82d6ffecfd39b324024de0cd630b36c1 Author: Mike Turquette Date: Mon Feb 22 11:16:30 2010 -0600 mfd: Introduce remove_script function for twl4030 New function twl4030_remove_script(u8 flags) takes a script type as defined in twl.h and prevents any script already loaded in that position from running. This is accomplished by programming SEQ_ADD_* to 0x3f, the END_OF_SCRIPT value, where SEQ_ADD_* is determined by flags. (Future) users of this function include OMAP board files for machines facing a race condition between sleep and warm reset. Signed-off-by: Mike Turquette Signed-off-by: Samuel Ortiz commit 3d8ca8c0b9fe42d005360e255fbf7a6f8580ef87 Author: Magnus Damm Date: Mon Feb 22 13:40:59 2010 +0900 mfd/mmc: SDHI Kconfig update Enable the sh_mobile_sdhi mfd driver on SH-Mobile ARM processors. While at it, make CONFIG_TMIO_MMC depend on CONFIG_MFD_SH_MOBILE_SDHI. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 3c49e810507c9d0659b8aa61f7f91aecda428ee3 Author: Magnus Damm Date: Mon Feb 22 13:37:09 2010 +0900 mfd: sh_mobile_sdhi MMC_CAP_MMC_HIGHSPEED support Add MMC_CAP_MMC_HIGHSPEED support to the sh_mobile_sdhi driver. Also, remove type cast and FIXME comment. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 1bca748cccec1c7f30b4424882de965100744432 Author: Mark Brown Date: Wed Feb 17 18:45:26 2010 +0000 gpiolib: Force wm831x GPIOs into GPIO mode when requested This is the chip default but it's possible the bootloader or OTP will have been configured to a different mode (eg, to provide feedback during startup). Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit f92e8f8144243a3651b2e350b706ea2d04931f8c Author: Mark Brown Date: Wed Feb 17 18:45:25 2010 +0000 mfd: Add WM831x revision B support Revision B of the WM831x devices changes the sense of the tristate bit for GPIO configuration, inverting it to become an enable instead. Take account of this in the gpiolib driver. A current sink regulation status bit has also been added in revision B, add a flag indicating if it's present but don't use it yet. This revision also adds an interrupt on key up for the ON pin event which the existing code is able to take advantage of. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 6b8274fafeec9b112cee5b6ced5f9189957c889f Author: Mark Brown Date: Wed Feb 17 18:45:24 2010 +0000 gpiolib: Correct debugfs display of WM831x GPIO inversion Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 3383d23d86791503559cb87837491af37469d9e5 Author: Mark Brown Date: Wed Feb 17 18:04:35 2010 +0000 gpiolib: Actually set output state in wm831x_gpio_direction_output() wm831x_gpio_direction_output() ignored the state passed into it. Signed-off-by: Mark Brown Cc: stable@kernel.org Signed-off-by: Samuel Ortiz commit 7ee422dc6e947fcdc153246d47f26ae0b7cf083d Author: Magnus Damm Date: Wed Feb 17 16:38:23 2010 +0900 tmio_mmc: Balance cell enable()/disable() calls This patch adds cell->disable() calls to the tmio-mmc probe() error handling and the remove() function. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 707f0b2fbc65876e8abd94d26d8d0620600c05d4 Author: Magnus Damm Date: Wed Feb 17 16:38:14 2010 +0900 tmio_mmc: Remove const from platform data V3 Remove const from the tmio-mmc platform data hclk V3. This change makes it possible to remove the type cast from the sh_mobile_sdhi driver which is using the clock framework to get the clock rate. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit 6d9af5af61a6c30676ef6f56a791d4036c92d249 Author: Magnus Damm Date: Wed Feb 17 16:38:04 2010 +0900 tmio_mmc: Use 100ms mmc_detect_change() delay This patch changes the tmio_mmc driver to wait 100ms before checking the card detect status. This type of delay is quite common among mmc drivers, it seems that most hardware platforms need to give the hardware some time to settle before checking card availabilty. Hotplug is half-broken without this patch on the sh7724 Ecovec board. Hot insertion seems ok but eject is never detected without this patch. Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit b741d440a97c376af309e902eeb2f3c5673d2c92 Author: Yusuke Goda Date: Wed Feb 17 16:37:55 2010 +0900 tmio_mmc: Add MMC_CAP_MMC_HIGHSPEED support V2 Enable MMC_CAP_XX support in the tmio_mmc driver if pdata->capabilities is set. Signed-off-by: Yusuke Goda Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit a8c39d8deb8341d15fc0eabaa9750f7a1db9d0df Author: Guennadi Liakhovetski Date: Wed Feb 17 16:37:45 2010 +0900 tmio_mmc: Keep card-detect interrupts enabled On SuperH platforms the SDHI controller does not produce any command IRQs after a completed IO. This leads to card-detect interrupts staying disabled. Do not disable card-detect interrupts on DATA IRQs. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Magnus Damm Signed-off-by: Samuel Ortiz commit fa0d976298b25d090fafc3460c63fee1c8eea854 Author: Balaji T K Date: Fri Feb 19 12:39:38 2010 +0100 mfd: Add twl6030 base addr for ID0, ID1, ID2 Add base address for generic slave ID0, ID1, ID2 and introduced one more entry to align RTC module number between twl4030 and twl6030 Signed-off-by: Balaji T K Signed-off-by: Samuel Ortiz commit a29aaf55cd6faa75e35abfe00bd3ffc537490485 Author: Moiz Sonasath Date: Tue Feb 16 18:57:21 2010 -0600 mfd: Disable TWL4030/5030 I2C1/I2C4 internal pull-ups This patch disables TWL4030/5030 I2C1 adn I2C4(SR) internal pull-up, to use only the external HW resistor >=470 Ohm for the assured functionality in HS mode. While testing the I2C in High Speed mode, it was discovered that without a proper pull-up resistor, there is data corruption during multi-byte transfer. RTC(time_set) test case was used for testing. From the analysis done, it was concluded that ideally we need a pull-up of 1.6k Ohm(recomended) or atleast 470 Ohm or greater for assured performance in HS mode. Signed-off-by: Moiz Sonasath Signed-off-by: Allen Pais Signed-off-by: Samuel Ortiz commit e82c60ae7d3a7f19c4b9b3e7bd6ea298fa5efe93 Author: Denis Turischev Date: Fri Feb 19 11:26:25 2010 +0100 mfd: Introduce lpc_sch for Intel SCH LPC bridge Intel Poulsbo (SCH) chipset LPC bridge controller contains several functions. Creating and MFD driver for the LPC bridge controller allows simultaneous use of SMBus and GPIO interfaces on the SCH. Signed-off-by: Denis Turischev Signed-off-by: Samuel Ortiz commit 91fedede0338eb6203cdd618d8ece873fdb7c22c Author: Samuel Ortiz Date: Fri Feb 19 11:07:59 2010 +0100 mfd: Check for ACPI conflicts For ACPI based systems, we should check for ACPI conflicts when adding the platform devices. The test will always succeed for non ACPI platforms. Signed-off-by: Samuel Ortiz commit 14e5c82ca32870698b7cbe54196e00682d929ca5 Author: Eduardo Valentin Date: Thu Feb 11 13:47:09 2010 +0100 mfd: Fix twl_has_pwrbutton typo Change the typo CONFIG_INPUT_TWL4030_PWBUTTON_MODULE in the twl_has_pwrbutton definition to CONFIG_INPUT_TWL4030_PWRBUTTON_MODULE. Signed-off-by: Eduardo Valentin Signed-off-by: Christoph Egger Signed-off-by: Samuel Ortiz commit 6985403138b74ad28c8ddac8baf88869556bec9a Author: Haojian Zhuang Date: Wed Feb 3 15:40:59 2010 -0500 input: Support onkey in 88pm860x Signed-off-by: Haojian Zhuang Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit 2afa62ea76027b00e472ddb672191e6e15425b43 Author: Haojian Zhuang Date: Mon Feb 8 05:02:00 2010 -0500 mfd: Use genirq in 88pm860x Use genirq to simplify IRQ handling in 88pm860x. Remove the interface of mask/free IRQs on 88pm860x. All these work is taken by genirq. Update the touchscreen driver of 88pm860x since IRQ handling is changed. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 7731074ab21745cde00578148ce760df107eaf27 Author: Joonyoung Shim Date: Sun Feb 7 10:16:14 2010 +0900 mfd: Fix WM8994 error handling This patch fixes wrong goto statement for error handling on probe. Signed-off-by: Myungjoo Ham Signed-off-by: Joonyoung Shim Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit e8343ddaccb322b1a2a989ac362cabd1e94597ad Author: Haojian Zhuang Date: Wed Feb 3 15:38:12 2010 -0500 mfd: Use i2c_dummy in 88pm860x Use i2c_dummy in 88pm860x driver to avoid using static in probe function. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 34c9120805ff4b3f7a8053bd64157ba564774433 Author: Haojian Zhuang Date: Wed Feb 3 15:37:23 2010 -0500 mfd: Clean code in max8925 Remove unused definitions. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 28db38888b2a53b6bdd70104c2d2a199632ca507 Author: Haojian Zhuang Date: Mon Jan 25 10:38:35 2010 -0500 power_supply: Enable power supply of max8925 MAX8925 is a PMIC that contains charger component Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit a39069f6ce6500a5ca39e534108247f25169d8e0 Author: Haojian Zhuang Date: Mon Jan 25 06:30:29 2010 -0500 rtc: Enable rtc in max8925 MAX8925 is a PMIC that contains RTC component. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e Author: Haojian Zhuang Date: Fri Feb 5 16:07:54 2010 +0100 mfd: Update irq handler in max8925 Update thread irq handler. Simply the interface of using thread irq. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit b13c0df517bedbc40cff4ab5f797b08b1111918b Author: Haojian Zhuang Date: Mon Jan 25 06:26:34 2010 -0500 mfd: Update i2c driver for max8925 Update I2C driver in order to fit all of three I2C components in max8925. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1ea933f4cdbb88197139b9e62778beba0120e229 Author: Mike Turquette Date: Fri Feb 5 09:51:37 2010 +0100 mfd: Program twl4030 remap_sleep correctly Variable remap was incorrectly referencing remap_off for the remap_sleep case when configuring TWL4030 power scripts. Signed-off-by: Mike Turquette Signed-off-by: Samuel Ortiz commit 2955c309921e23d592ef585cf8e7ded1e11565b7 Author: Mark Brown Date: Fri Jan 29 18:20:30 2010 +0000 gpiolib: Add WM8994 GPIO support The WM8994 has 11 GPIO lines. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 9e50108668a70a9927257298bd4e679300124420 Author: Mark Brown Date: Fri Jan 29 18:20:29 2010 +0000 mfd: Add initial WM8994 support The WM8994 is a highly integrated ultra low power audio hub CODEC. Since it includes on-board regulators and GPIOs it is represented as a multi-function device, though the overwhelming majority of the functionality is provided by the ASoC CODEC driver. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 1c4d3b70a40c666331052adf77933e6994590b74 Author: Mark Brown Date: Fri Jan 29 18:20:28 2010 +0000 mfd: Add WM8994 register definitions As a separate patch due to the large size. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit bef3e20c9f8ce5cb8809cf33494d95a78db07857 Author: Randy Dunlap Date: Wed Jan 20 19:55:34 2010 -0800 mfd: htc-i2cpld depends on GPIOLIB htc-i2cpld should depend on GPIOLIB, otherwise there are many build errors: drivers/mfd/htc-i2cpld.c:50: error: field 'chip_out' has incomplete type drivers/mfd/htc-i2cpld.c:54: error: field 'chip_in' has incomplete type drivers/mfd/htc-i2cpld.c:243: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:243: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:278: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:278: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:282: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:282: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:315: error: dereferencing pointer to incomplete type drivers/mfd/htc-i2cpld.c:322: warning: type defaults to 'int' in declaration of '__mptr' drivers/mfd/htc-i2cpld.c:322: warning: initialization from incompatible pointer type drivers/mfd/htc-i2cpld.c:467+: error: dereferencing pointer to incomplete type [19X] drivers/mfd/htc-i2cpld.c:490: error: implicit declaration of function 'gpiochip_add' drivers/mfd/htc-i2cpld.c:504: error: implicit declaration of function 'gpiochip_remove' Signed-off-by: Randy Dunlap Signed-off-by: Samuel Ortiz commit f7ea2dc59ed46dcd0f1cfaccda02211f4507207b Author: Christoph Egger Date: Fri Jan 15 15:33:46 2010 +0100 mfd: Remove leftover from discontinued TWL4030 battery patch The TWL4030_BCI_BATTERY config option originates from a patch to the omap git tree. However inclusion in linux was seemingly rejected and the functionality nears inclusion under a different name so this removes the bits of the old version that made it into the mainline kernel again. Signed-off-by: Christoph Egger Signed-off-by: Samuel Ortiz commit ca229f1b624a72a1c9eb1d94bbca7a0c094a1b8b Author: Linus Walleij Date: Sun Jan 17 20:57:43 2010 +0100 mfd: Fix debugfs code in AB3100 OTP driver This fixes the aged and unreachable debugfs code in the AB3100 OTP driver so that it's (A) reachable and (B) works. Bug detected in parallell by Christoph Egger using VAMOS and Robert P. J. Day by his kernel scanning script. Signed-off-by: Linus Walleij Cc: Christoph Egger Cc: Robert P. J. Day Signed-off-by: Samuel Ortiz commit 2071db4848ea809887e97248dd3dec02a2e3dd6b Author: Linus Walleij Date: Tue Jan 19 11:41:52 2010 +0100 mfd: Use AB3100 MFD core IRQ for interrupt randomness This reintroduces the entropy sampling of the AB3100 IRQ as the IRQF_SAMPLE_RANDOM is going out according to the feature removal schedule. I'm trying to do this the right way then, so CC:ing some random people for a quick review. We add entropy for interrupt events in the AB3100 which are truly random in nature, like external cables being connected, voltages on batteries dropping below certain ranges, ADC triggers or overheating. Signed-off-by: Linus Walleij Cc: Robin Getz Acked-by: Matt Mackall Signed-off-by: Samuel Ortiz commit 6048a3dd2371c58611ea0ab8b306f8f1469399ae Author: Cory Maccarrone Date: Tue Jan 19 11:22:45 2010 +0100 mfd: Add HTCPLD driver This change introduces a driver for the HTC PLD chip found on some smartphones, such as the HTC Wizard and HTC Herald. It works through the I2C bus and acts as a GPIO extender. Specifically: * it can have several sub-devices, each with its own I2C address * Each sub-device provides 8 output and 8 input pins * The chip attaches to one GPIO to signal when any of the input GPIOs change -- at which point all chips must be scanned for changes This driver implements the GPIOs throught the kernel's GPIO and IRQ framework. This allows any GPIO-servicing drivers to operate on htcpld pins, such as the gpio-keys and gpio-leds drivers. Signed-off-by: Cory Maccarrone Signed-off-by: Samuel Ortiz commit 08ff6f2a9908c87b0adffe6453291be22db3a62f Author: Haojian Zhuang Date: Mon Jan 11 13:10:08 2010 +0100 regulator: Add max8925 support MAX8925 contains 3 Buck and 20 LDO regulator. Signed-off-by: Haojian Zhuang Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit 4f811ef0d40048ae80b6ea77080b814725bffc58 Author: Haojian Zhuang Date: Fri Dec 18 10:01:45 2009 -0500 backlight: Enable max8925 backlight Enable max8925 backlight sub device. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 1ad998934e9c6cbae91662a05e0cb8772b1f4f75 Author: Haojian Zhuang Date: Fri Jan 8 12:43:29 2010 -0500 mfd: Add subdevs in max8925 Add subdevs in MAX8925. MAX8925 includes regulator, backlight and touch components. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit d50f8f339f6901fccc9d4292b65ce8b69d7413d4 Author: Haojian Zhuang Date: Fri Jan 8 12:29:23 2010 +0100 mfd: Initial max8925 support Basic Max8925 support, which is a power management IC from Maxim Semiconductor. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 34a4b2391e9fbd12de9817de4ae409528bd7d7b6 Author: Haojian Zhuang Date: Thu Dec 10 06:06:17 2009 -0500 regulator: Unsupport 88pm8607 A0 and A1 Remove the support 88PM8607 A0/A1 stepping. There's some register definition changes in B0 stepping. It can make software more efficient. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 866a98ae6e1a9768cd25fe1185481569c7e4b4a9 Author: Haojian Zhuang Date: Tue Dec 15 16:06:17 2009 -0500 input: Enable touch on 88pm860x Enable touchscreen driver for the 88pm860x multi function core. Signed-off-by: Haojian Zhuang Acked-by: Dmitry Torokhov Signed-off-by: Samuel Ortiz commit 0a2f915b405ac1a8d19d9b7cf7873f26ba682a24 Author: Haojian Zhuang Date: Wed Jan 6 17:10:09 2010 -0500 led: Enable led in 88pm860x Enable led sub device in Marvell 88PM860x. Two LED arrays can be supported. Each LED array can be used for R,G,B leds. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit d07e8bf83fd71567aaf9c27c3b133ab3cf8f3c4c Author: Haojian Zhuang Date: Mon Nov 9 12:41:07 2009 -0500 backlight: Enable backlight in 88pm860x At most, three backlight device can be supported in 88pm860x driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit a16122bcacf050e7f83015183053cf799713cc37 Author: Haojian Zhuang Date: Tue Dec 15 16:04:36 2009 -0500 mfd: Append subdev into 88pm860x driver Append backlight, led & touch subdevs into 88pm860x driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 5c42e8c4a9c86ea26ed4ecb732a842dea0dfb6b6 Author: Haojian Zhuang Date: Tue Dec 15 16:01:47 2009 -0500 mfd: Add irq support in 88pm860x 88PM860x is a complex PMIC device. It contains touch, charger, sound, rtc, backlight, led, and so on. Host communicates to 88PM860x by I2C bus. Use thread irq to support this usage case. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 2cc50bee9934deb6dfe32929a4c1742cf83d6db3 Author: Haojian Zhuang Date: Wed Jan 6 17:07:13 2010 -0500 mfd: Rename 88pm8607 to 88pm860x in mfd Rename 88PM8607 to 88PM860X in both Makefile and Kconfig under mfd directory. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 53dbab7af9ca13fa95605e9a5c31bb803dcba363 Author: Haojian Zhuang Date: Fri Jan 8 06:01:24 2010 -0500 mfd: Support 88pm8606 in 860x driver 88PM8606 and 88PM8607 are two discrete chips used for power management. Hardware designer can use them together or only one of them according to requirement. There's some logic tightly linked between these two chips. For example, USB charger driver needs to access both chips by I2C interface. Now share one driver to these two devices. Only one I2C client is identified in platform init data. If another chip is also used, user should mark it in companion_addr field of platform init data. Then driver could create another I2C client for the companion chip. All I2C operations are accessed by 860x-i2c driver. In order to support both I2C client address, the read/write API is changed in below. reg_read(client, offset) reg_write(client, offset, data) The benefit is that client drivers only need one kind of read/write API. I2C and MFD driver can be shared in both 8606 and 8607. Since API is changed, update API in 8607 regulator driver. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit bbd51b1ff1bf57b9ed7f062486a415509968d4d9 Author: Haojian Zhuang Date: Wed Jan 6 17:04:18 2010 -0500 mfd: Split 88pm8607 driver Create 88pm8607-i2c driver to support all I2C operation of 88PM8607. Signed-off-by: Haojian Zhuang Signed-off-by: Samuel Ortiz commit 0df883df8e8aea79b501f6262b595e66dec175dc Author: Linus Walleij Date: Fri Jan 8 10:44:16 2010 +0100 mfd: Convert AB3100 driver to threaded IRQ This converts the AB3100 core MFD driver to use a threaded interrupt handler instead of the explicit top/bottom-half construction with a workqueue. This saves some code and make it more similar to other modern MFD drivers. Signed-off-by: Linus Walleij Signed-off-by: Samuel Ortiz commit 38f6ce45f0bca04ac653c57cacd375c469995321 Author: Mark Brown Date: Thu Jan 7 16:10:08 2010 +0000 gpiolib: Add support for WM8350 GPIO controller Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 59f25070df0325067d7916b467ad15725657fedc Author: Mark Brown Date: Wed Jan 6 19:24:25 2010 +0000 mfd: Update WM8350 drivers for changed interrupt numbers The headphone detect and charger are using the IRQ numbers so need to take account of irq_base with the genirq conversion. I obviously picked the wrong system for initial testing. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit ecf926bcda5ba1da7269dcaa71a1b6920dc48349 Author: Mark Brown Date: Tue Jan 5 20:40:47 2010 +0000 mfd: Don't allow WM8350 to be built modular The genirq implementation does not allow modules to implement irq_chips so the conversion of WM8350 to genirq means we can no longer allow the driver to be built as a module. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 760e4518788df6762700e6bb9dd8692379f11168 Author: Mark Brown Date: Tue Jan 5 13:59:09 2010 +0000 mfd: Convert WM8350 to genirq This gives us use of the diagnostic facilities genirq provides and will allow implementation of interrupt support for the WM8350 GPIOs. Stub functions are provided to ease the transition of the individual drivers, probably after additional work to pass the IRQ numbers via the struct devices. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 29c71b138c83c8191f1f7e46fcc28b9d6bc8a5dd Author: Mark Brown Date: Tue Jan 5 13:59:08 2010 +0000 rtc: Suppress duplicate enable/disable of WM8350 update interrupt Unlike the wm8350-custom code genirq nests enable and disable calls so we can't just unconditionally mask or unmask the interrupt, we need to remember the state we set and only mask or unmask when there is a real change. Signed-off-by: Mark Brown Acked-by: Alessandro Zummo Cc: rtc-linux@googlegroups.com Signed-off-by: Samuel Ortiz commit f99344fc69c3df46786a39ea4283a4175ea40b3f Author: Mark Brown Date: Tue Jan 5 13:59:07 2010 +0000 mfd: Add a data argument to the WM8350 IRQ free function To better match genirq. Signed-off-by: Mark Brown Signed-off-by: Samuel Ortiz commit 0e820ab60118e06db62ef4e55b6dd96db807a34e Author: Julia Lawall Date: Tue Dec 22 21:31:43 2009 +0100 mfd: Correct use after free for t7l66xb The structure t7l66xb should not be freed before the subsequent references to its fields in the arguments to clk_put. Furthermore, this structure is allocated near the beginning of the function, and a goto to the label err_noirq appears after a successful allocation, so it would seem that the kfree should be moved down below this label. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,e; identifier f; iterator I; statement S; @@ *kfree(x); ... when != &x when != x = e when != I(x,...) S *x->f // Signed-off-by: Julia Lawall commit 1ecc09e765d3ae16ef42a4d454836d9ed804fd18 Author: H Hartley Sweeten Date: Tue Jan 5 20:01:16 2010 +0100 mfd: Use resouce_size for tc6393xb Use resource_size() for ioremap. Signed-off-by: H Hartley Sweeten Cc: Ian Molton Signed-off-by: Samuel Ortiz commit c02e6a5ff43d24d73cf7830c2925e213fc72e037 Author: H Hartley Sweeten Date: Tue Jan 5 19:58:34 2010 +0100 mfd: Use resource_size() for t7l66xb Use resource_size() for ioremap. Signed-off-by: H Hartley Sweeten Cc: Ian Molton Signed-off-by: Samuel Ortiz commit 311e54c07e784fe63d421f724dcc597d1f82ccad Author: H Hartley Sweeten Date: Tue Jan 5 19:55:54 2010 +0100 mfd: Use resource_size() in sm501 The requested memory region is smaller than the actual ioremap(). Use resource_size() to get the correct size. Signed-off-by: H Hartley Sweeten Cc: Ben Dooks Signed-off-by: Samuel Ortiz commit 08b8499bdd26822df16f962db88215d02e40850a Merge: 3ceb85a fb46359 Author: Linus Torvalds Date: Sun Mar 7 12:52:38 2010 -0800 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq: [CPUFREQ] Fix cast warning in pcc driver. [CPUFREQ] Processor Clocking Control interface driver commit 3ceb85ae35421c5bc560c7af8d0dd1c73d071ad0 Author: Dmitry Torokhov Date: Sun Mar 7 12:37:17 2010 -0800 USB: remove unused defintion of struct usb_device_status The recent rework of /proc/bus/usb/devices polling support made this structure unused so let's remove it. Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit b8fa05719ba4349be80ce929237249b57886a203 Author: Linus Torvalds Date: Sun Mar 7 09:54:44 2010 -0800 Revert "lib: build list_sort() only if needed" This reverts commit a069c266ae5fdfbf5b4aecf2c672413aa33b2504. It turns ou that not only was it missing a case (XFS) that needed it, but perhaps more importantly, people sometimes want to enable new modules that they hadn't had enabled before, and if such a module uses list_sort(), it can't easily be inserted any more. So rather than add a "select LIST_SORT" to the XFS case, just leave it compiled in. It's not all _that_ big, after all, and the inconvenience isn't worth it. Requested-by: Alexey Dobriyan Cc: Christoph Hellwig Cc: Don Mullis Cc: Andrew Morton Cc: Dave Chinner Signed-off-by: Linus Torvalds commit 4da0b66c6e9ea7ba78a19f9f186779826d89f8b0 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:37 2010 -0700 vsprintf: move %pR resource printf_specs off the stack This adds separate I/O and memory specs, so we don't have to change the field width in a shared spec, which then lets us make all the specs const and static, since they never change. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit b89dc5d6b0981c1096ccffbf8f4413c7bb1bcc0a Author: Bjorn Helgaas Date: Fri Mar 5 10:47:31 2010 -0700 vsprintf: clarify comments for printf_spec flags Add clues about what the SMALL and SPECIAL flags do. Signed-off-by: Bjorn Helgaas Signed-off-by: Linus Torvalds commit ef0658f3de484bf9b173639cd47544584e01efa5 Author: Joe Perches Date: Sat Mar 6 17:10:14 2010 -0800 vsprintf.c: Reduce sizeof struct printf_spec from 24 to 8 bytes Reducing the size of struct printf_spec is a good thing because multiple instances are commonly passed on stack. It's possible for type to be u8 and field_width to be s8, but this is likely small enough for now. Signed-off-by: Joe Perches Signed-off-by: Linus Torvalds commit 7bc80cd935a4d5fd8574f6994bd95d0aad273d56 Author: Linus Torvalds Date: Sat Mar 6 16:34:34 2010 -0800 usbfs: fix deadlock on 'usbfs_mutex', clean up poll The caller of usbfs_conn_disc_event() in some cases (but not always) already holds usbfs_mutex, so trying to protect the event counter with that lock causes nasty deadlocks. The problem was introduced by commit 554f76962d ("USB: Remove BKL from poll()") when the BLK protection was turned into using the mutex instead. So fix this by using an atomic variable instead. And while we're at it, get rid of the atrocious naming of said variable and the waitqueue it is associated with. This also cleans up the unnecessary locking in the poll routine, since the whole point of how the pollwait table works is that you can just add yourself to the waiting list, and then check the condition you're waiting for afterwards - avoiding all races. It also gets rid of the unnecessary dynamic allocation of the device status that just contained a single word. We should use f_version for this, as Dmitry Torokhov points out. That simplifies everything further. Reported-and-tested-by: Jeff Chua Acked-by: Greg Kroah-Hartman Acked-by: Alan Stern Cc: Oliver Neukum Cc: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 Author: Akinobu Mita Date: Sun Feb 28 10:58:15 2010 +0000 parisc: use __ratelimit in unaligned.c Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Signed-off-by: Kyle McMartin commit c60185248fd1c7b777f08d3f3337836331da3d17 Author: john stultz Date: Wed Dec 23 04:14:03 2009 +0000 parisc: Convert to read/update_persistent_clock This patch converts the parisc architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. I have not built or tested this patch, so help from arch maintainers would be appreciated. Signed-off-by: John Stultz Acked-by: Helge Deller Signed-off-by: Kyle McMartin commit eef83afbd6c2577c9fd07e1a280bb0beb603b293 Author: Robert P. J. Day Date: Thu Dec 31 20:43:55 2009 +0000 parisc: Simplify param.h by including Signed-off-by: Robert P. J. Day Signed-off-by: Kyle McMartin commit 1d747c7e7b754cacb9bc8d31854bdc3a58d70597 Author: Helge Deller Date: Tue Feb 2 19:06:23 2010 +0000 parisc: drop unnecessary cast in __ldcw_align() macro __ldcw_align() can directly access the slock member of struct arch_spinlock_t instead of using an ugly cast. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 888c31fc83ddc7fcd9947cb67c5718b4e3dd5e1b Author: Helge Deller Date: Mon Feb 1 19:56:33 2010 +0000 parisc: add strict copy size checks (v2) Add CONFIG_DEBUG_STRICT_USER_COPY_CHECKS, copied from the x86 implementation. Tested with 32 and 64bit kernel. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit a3bee03e718c9251456676b71a723a34c999e891 Author: Frans Pop Date: Sat Feb 6 17:47:14 2010 +0000 parisc: remove trailing space in messages Signed-off-by: Frans Pop Cc: linux-parisc@vger.kernel.org Cc: Kyle McMartin Cc: Helge Deller Signed-off-by: Kyle McMartin commit 81e4a5e3057740a625cf556879ae0becf6199f8c Author: Kyle McMartin Date: Sat Dec 26 17:19:17 2009 +0000 parisc: ditto sys_accept4 tested with test_accept4.c from de11defebf00007677fb7ee91d9b089b78786fbb Signed-off-by: Kyle McMartin commit 9ceb38e6b691debe4bf04cb63165c503a8556177 Author: Helge Deller Date: Tue Dec 22 22:50:33 2009 +0000 parisc: wire up sys_recvmmsg Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 66b89159c25a47d2177743526c61b5ada7acc39e Merge: 87c7ae0 c2f843f Author: Linus Torvalds Date: Sat Mar 6 13:18:03 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs: [LogFS] Change magic number [LogFS] Remove h_version field [LogFS] Check feature flags [LogFS] Only write journal if dirty [LogFS] Fix bdev erases [LogFS] Silence gcc [LogFS] Prevent 64bit divisions in hash_index [LogFS] Plug memory leak on error paths [LogFS] Add MAINTAINERS entry [LogFS] add new flash file system Fixed up trivial conflict in lib/Kconfig, and a semantic conflict in fs/logfs/inode.c introduced by write_inode() being changed to use writeback_control' by commit a9185b41a4f84971b930c519f0c63bd450c4810d ("pass writeback_control to ->write_inode") commit d690b2cd222afc75320b9b8e9da7df02e9e630ca Author: Rafael J. Wysocki Date: Sat Mar 6 21:28:37 2010 +0100 PM: Provide generic subsystem-level callbacks There are subsystems whose power management callbacks only need to invoke the callbacks provided by device drivers. Still, their system sleep PM callbacks should play well with the runtime PM callbacks, so that devices suspended at run time can be left in that state for a system sleep transition. Provide a set of generic PM callbacks for such subsystems and define convenience macros for populating dev_pm_ops structures. Signed-off-by: Rafael J. Wysocki commit 87d1b3e60b55ef65f10054ccc319e5d67cf010e9 Author: Rafael J. Wysocki Date: Sat Mar 6 21:28:17 2010 +0100 PM / Runtime: Document power.runtime_auto and related functions The power.runtime_auto device flag and the helper functions pm_runtime_allow() and pm_runtime_forbid() used to modify it are a part of the run-time power management framework and therefore they should be described in Documentation/power/runtime_pm.txt. Signed-off-by: Rafael J. Wysocki commit 87c7ae06cc50bcbcdcc60d64a959ca0b9b71f892 Merge: dff6d1c f070304 Author: Linus Torvalds Date: Sat Mar 6 11:34:04 2010 -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: dm raid1: fix deadlock when suspending failed device dm: eliminate some holes data structures dm ioctl: introduce flag indicating uevent was generated dm: free dm_io before bio_endio not after dm table: remove unused dm_get_device range parameters dm ioctl: only issue uevent on resume if state changed dm raid1: always return error if all legs fail dm mpath: refactor pg_init dm mpath: wait for pg_init completion when suspending dm mpath: hold io until all pg_inits completed dm mpath: avoid storing private suspended state dm: document when snapshot has finished merging dm table: remove dm_get from dm_table_get_md dm mpath: skip activate_path for failed paths dm mpath: pass struct pgpath to pg init done commit dff6d1c5ef9116a4478908001d72ee67127ecf01 Merge: 66ce3cf a0a5e34 Author: Linus Torvalds Date: Sat Mar 6 11:33:09 2010 -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: (23 commits) hwmon: Remove the deprecated adt7473 driver hwmon: Fix off-by-one kind values hwmon: (tmp421) Fix temperature conversions hwmon: (tmp421) Restore missing inputs hwmon: Driver for Andigilog aSC7621 family monitoring chips hwmon: (adt7411) Improve locking hwmon: Add driver for ADT7411 voltage and temperature sensor hwmon: (w83793) Add watchdog functionality hwmon: (g760a) Make rpm_from_cnt static hwmon: (it87) Validate auto pwm settings hwmon: (it87) Add support for old automatic fan speed control hwmon: (it87) Drop dead web links in documentation hwmon: (it87) Add an entry in MAINTAINERS hwmon: (it87) Use strict_strtol instead of simple_strtol hwmon: (it87) Fix many checkpatch errors and warnings hwmon: (it87) Add support for beep on alarm hwmon: (it87) Create vid attributes by group hwmon: (it87) Refactor attributes creation and removal hwmon: (it87) Expose the PWM/temperature mappings hwmon: (it87) Display fan outputs in automatic mode as such ... commit 66ce3cf84deba6cc71dcf43c9d56a4278e5f712d Merge: 05c5cb3 9b1f56d Author: Linus Torvalds Date: Sat Mar 6 11:32:21 2010 -0800 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: (21 commits) xfs: return inode fork offset in bulkstat for fsr xfs: Increase the default size of the reserved blocks pool xfs: truncate delalloc extents when IO fails in writeback xfs: check for more work before sleeping in xfssyncd xfs: Fix a build warning in xfs_aops.c xfs: fix locking for inode cache radix tree tag updates xfs: remove xfs_ipin/xfs_iunpin xfs: cleanup xfs_iunpin_wait/xfs_iunpin_nowait xfs: kill xfs_lrw.h xfs: factor common xfs_trans_bjoin code xfs: stop passing opaque handles to xfs_log.c routines xfs: split xfs_bmap_btalloc xfs: fix xfs_fsblock_t tracing xfs: fix inode pincount check in fsync xfs: Non-blocking inode locking in IO completion xfs: implement optimized fdatasync xfs: remove wrapper for the fsync file operation xfs: remove wrappers for read/write file operations xfs: merge xfs_lrw.c into xfs_file.c xfs: fix dquota trace format ... commit 05c5cb31ec47cacf38db56d9efaa37ca9d473132 Merge: 4582a30 4ea41e2 Author: Linus Torvalds Date: Sat Mar 6 11:31:38 2010 -0800 Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux * 'for-2.6.34' of git://linux-nfs.org/~bfields/linux: (22 commits) nfsd4: fix minor memory leak svcrpc: treat uid's as unsigned nfsd: ensure sockets are closed on error Revert "sunrpc: move the close processing after do recvfrom method" Revert "sunrpc: fix peername failed on closed listener" sunrpc: remove unnecessary svc_xprt_put NFSD: NFSv4 callback client should use RPC_TASK_SOFTCONN xfs_export_operations.commit_metadata commit_metadata export operation replacing nfsd_sync_dir lockd: don't clear sm_monitored on nsm_reboot_lookup lockd: release reference to nsm_handle in nlm_host_rebooted nfsd: Use vfs_fsync_range() in nfsd_commit NFSD: Create PF_INET6 listener in write_ports SUNRPC: NFS kernel APIs shouldn't return ENOENT for "transport not found" SUNRPC: Bury "#ifdef IPV6" in svc_create_xprt() NFSD: Support AF_INET6 in svc_addsock() function SUNRPC: Use rpc_pton() in ip_map_parse() nfsd: 4.1 has an rfc number nfsd41: Create the recovery entry for the NFSv4.1 client nfsd: use vfs_fsync for non-directories ... commit 4582a30c2fdca5d2b40f63a20ea082b93230ff2b Merge: 9cc0cb3 6e9065d Author: Linus Torvalds Date: Sat Mar 6 11:30:18 2010 -0800 Merge git://git.infradead.org/ubi-2.6 * git://git.infradead.org/ubi-2.6: UBI: add write checking UBI: simplify debugging return codes UBI: fix attaching error path UBI: support attaching by MTD character device name UBI: mark few variables as __initdata commit 9cc0cb3c7d54f320b9eede6f4a49072ecadd864d Author: Denis Turischev Date: Fri Mar 5 13:44:39 2010 -0800 gpio: introduce it8761e_gpio driver for IT8761E Super I/O chip Signed-off-by: Denis Turischev Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8a5164c297c16c2f4be776714ca47dba252cc3d Author: Ben Gardner Date: Fri Mar 5 13:44:38 2010 -0800 gpio: cs5535-gpio: fix input direction The cs5535-gpio driver's get() function was returning the output value. This means that the GPIO pins would never work as an input, even if configured as an input. The driver should return the READ_BACK value, which is the sensed line value. To make that work when the direction is 'output', INPUT_ENABLE needs to be set. In addition, the driver was not disabling OUTPUT_ENABLE when the direction is set to 'input'. That would cause the GPIO to continue to drive the pin if the direction was ever set to output. This issue was noticed when attempting to use the gpiolib driver to read an external input. I had previously been using the char/cs5535-gpio driver. Signed-off-by: Ben Gardner Acked-by: Andres Salomon Cc: Andrew Morton Cc: David Brownell Cc: Mark Brown Cc: [2.6.33.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 89ea8bbe9c3eb2ea0cb57a4ecf283cab7326f0b0 Author: Marc Zyngier Date: Fri Mar 5 13:44:36 2010 -0800 gpio: pca953x.c: add interrupt handling capability Most of the GPIO expanders controlled by the pca953x driver are able to report changes on the input pins through an *INT pin. This patch implements the irq_chip functionality (edge detection only). The driver has been tested on an Arcom Zeus. [akpm@linux-foundation.org: the compiler does inlining for us nowadays] Signed-off-by: Marc Zyngier Cc: Eric Miao Cc: Haojian Zhuang Cc: David Brownell Cc: Nate Case Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c35c89aa3d7e0f253c3a10456a8b075288b4565 Author: Richard Röjfors Date: Fri Mar 5 13:44:35 2010 -0800 timbgpio: add support for interrupt triggering on both flanks Introduce support for triggering interrupts on both rising and falling edge. This feature requires version 3 or newer of the IP, a version check is done when triggering on both edges is requested. Signed-off-by: Richard Röjfors Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e45f1d1155894e6f4291f5536b224874d52d8e2 Author: Eric Miao Date: Fri Mar 5 13:44:35 2010 -0800 gpio: introduce gpio_request_one() and friends gpio_request() without initial configuration of the GPIO is normally useless, introduce gpio_request_one() together with GPIOF_ flags for input/output direction and initial output level. gpio_{request,free}_array() for multiple GPIOs. Signed-off-by: Eric Miao Cc: David Brownell Cc: Ben Nizette Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 62fecb70cfaa9b4c6aa1981acd53b18f4ad925f0 Author: Olof Johansson Date: Fri Mar 5 13:44:34 2010 -0800 pca953x: minor include cleanup linux/i2c/pca953x.h is a very bare include file. Fix check for multiple includes of linux/i2c/pca953x.h, and add dependent includes into the header file. Signed-off-by: Olof Johansson Acked-by: Wolfram Sang Acked-by: Jean Delvare Cc: David Brownell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e952805d2d2e706aed182723e5ab3ec0b1f91de3 Author: Wolfram Sang Date: Fri Mar 5 13:44:33 2010 -0800 gpio: add driver for MAX7300 I2C GPIO extender Add the MAX7300-I2C variant of the MAX7301-SPI version. Both chips share the same core logic, so the generic part of the in-kernel SPI-driver is refactored into a generic part. The I2C and SPI specific funtions are then wrapped into seperate drivers picking up the generic part. Signed-off-by: Wolfram Sang Cc: Juergen Beisert Cc: David Brownell Cc: Jean Delvare Cc: Anton Vorontsov Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a98c04d78c896d52baef20ffc11f6d1ba6eb786 Author: James Hogan Date: Fri Mar 5 13:44:31 2010 -0800 rtc-coh901331: fix braces in resume code The else part of the if statement is indented but does not have braces around it. It clearly should since it uses clk_enable and clk_disable which are supposed to balance. Signed-off-by: James Hogan Acked-by: Linus Walleij Acked-by: Alessandro Zummo Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9407351d7cce01a9ada942f00201e92e2541d9cb Author: Uwe Kleine-König Date: Fri Mar 5 13:44:30 2010 -0800 rtc/mc13783: implement alarm Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c014e872e02baa5b0bde38b2b2867ccf1f9df76 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:30 2010 -0800 rtc/mc13783: protect rtc {,un}registration by mc13783 lock This is to protect from interrupt handlers using an unregistered rtc device. To assert that the reset irq is considered now before the rtc is registered the corresponding status is checked before. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86c3400810a7a33e176bf33b6b074d881e829374 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:29 2010 -0800 mfd/mc13783: new function reading irq mask and status register The driver for the mc13783 rtc needs to know if the TODA irq is pending. Instead of tracking in the rtc driver if the irq is enabled provide that information, too. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dd4dd655cedb7c5c0bf45bc1d012ebbe21e8319 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:28 2010 -0800 rtc/mc13783: don't use deprecated mc13783 API calls mc13783_ackirq, mc13783_unmask and mc13783_mask are deprecated, use the drop in replacements with the nicer names. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a83319182afe9ba7d958180b3bd3a32a9e3d1be Author: Uwe Kleine-König Date: Fri Mar 5 13:44:26 2010 -0800 input/mc13783-ts: don't use deprecated mc13783 API calls mc13783_ackirq is deprecated, use the drop in replacement mc13783_irq_ack. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Acked-by: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57205026da070b59e9546df352fe465f1aeacf99 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:25 2010 -0800 mc13783: rename mc13783_{{un,}mask,ack_irq} to have a mc13783_irq prefix In the source file group these functions together. The mc13783 header file provides fallback implementations for the old names to prevent build failures. When all users of the old names are fixed to use the new names these can go away. Signed-off-by: Uwe Kleine-König Cc: Alessandro Zummo Cc: Paul Gortmaker Cc: Valentin Longchamp Cc: Sascha Hauer Cc: Samuel Ortiz Cc: Dmitry Torokhov Cc: Luotao Fu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2a7a06a0cdd86d572e91657603180da5992be6d3 Author: Aaro Koskinen Date: Fri Mar 5 13:44:24 2010 -0800 rtc-core: fix memory leak The idr should be destroyed when the module is unloaded. Found with kmemleak. Signed-off-by: Aaro Koskinen Cc: Alessandro Zummo Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e84067b6e557b0b85cdbceaf9a9189fc2c26536 Author: Tobias Klauser Date: Fri Mar 5 13:44:23 2010 -0800 rtc-twl: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 870a2761a8df7dea7449b4225c9babcf22c6ead4 Author: Julia Lawall Date: Fri Mar 5 13:44:23 2010 -0800 rtc-at91sam9: Correct size given to memset Memset should be given the size of the structure, not the size of the pointer. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ type T; T *x; expression E; @@ memset(x, E, sizeof( + * x)) // Signed-off-by: Julia Lawall Signed-off-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b51e8293182764ca7b1a1bdb28a5c5dc60152c76 Author: Uwe Kleine-König Date: Fri Mar 5 13:44:21 2010 -0800 rtc-pcf2123: move pcf2123_remove to .devexit.text The function pcf2123_remove is used only wrapped by __devexit_p so define it using __devexit. Signed-off-by: Uwe Kleine-König Signed-off-by: Alessandro Zummo Cc: Christian Pellegrin Cc: Chris Verges Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4877d2b3678f4455f2b8b0211868ac57c3b1ff6 Author: H Hartley Sweeten Date: Fri Mar 5 13:44:20 2010 -0800 rtc-ep93xx.c: cleanup probe/remove routines Fix issue with rtc device not getting unregistered in probe error path. Use the devres managed resource functions in the probe routine to cleanup the error path. Use sysfs_{create/remove}_group to add/remove the sysfs files. Reduces the text size by 132 bytes, increases data by 12 bytes: text data bss dec hex filename - 937 124 0 1061 425 rtc-ep93xx.o + 805 136 0 941 3ad rtc-ep93xx.o Signed-off-by: H Hartley Sweeten Acked-by: Alessandro Zummo Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49908e739e23e2672d3efb9b1a35f877f8e86342 Author: Alexander Beregalov Date: Fri Mar 5 13:44:19 2010 -0800 rtc: mxc: fix memory leak Free pdata before exit. Found by cppcheck. [yuasa@linux-mips.org: add missing iounmap()] Signed-off-by: Alexander Beregalov Reviewed-by: WANG Cong Acked-by: Daniel Mack Acked-by: Alessandro Zummo Cc Yoichi Yuasa Cc: Paul Gortmaker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 27fb7f009bdb1ff13d4e4c008a2fd36b2305055b Author: Randy Dunlap Date: Fri Mar 5 13:44:18 2010 -0800 xen: add kconfig menu Currently the xen support drivers are displayed in the main Device Drivers menu of the config tools instead of in their own sub-menu, so move them to their own sub-menu, like the rest of the driver world uses. This keeps the main Device Drivers menu from becoming messy. Signed-off-by: Randy Dunlap Cc: Jeremy Fitzhardinge Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6aed359df4d82c38145d95957b741f0b08d24074 Author: Thiago Farina Date: Fri Mar 5 13:44:17 2010 -0800 console/vgacon.c: mark file-local symbol static warning: symbol 'vgacon_text_mode_force' was not declared. Should it be static? Signed-off-by: Thiago Farina Acked-by: Matthew Garrett Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a52712af5a7473b9f85d8499153f4bbfe875f942 Author: Amerigo Wang Date: Fri Mar 5 13:44:17 2010 -0800 console: limit the range of VGACON_SOFT_SCROLLBACK_SIZE BuraphaLinux reported that we will trigger a mm warning when we CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=65536, this is because mm cann't allocate so many pages. We should limit the range of CONFIG_VGACON_SOFT_SCROLLBACK_SIZE, don't give a user any chance to trigger that. Reported-by: BuraphaLinux Server Tested-by: BuraphaLinux Server Signed-off-by: WANG Cong Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76595f79d76fbe6267a51b3a866a028d150f06d4 Author: Neil Horman Date: Fri Mar 5 13:44:16 2010 -0800 coredump: suppress uid comparison test if core output files are pipes Modify uid check in do_coredump so as to not apply it in the case of pipes. This just got noticed in testing. The end of do_coredump validates the uid of the inode for the created file against the uid of the crashing process to ensure that no one can pre-create a core file with different ownership and grab the information contained in the core when they shouldn' tbe able to. This causes failures when using pipes for a core dumps if the crashing process is not root, which is the uid of the pipe when it is created. The fix is simple. Since the check for matching uid's isn't relevant for pipes (a process can't create a pipe that the uermodehelper code will open anyway), we can just just skip it in the event ispipe is non-zero Reverts a pipe-affecting change which was accidentally made in : commit c46f739dd39db3b07ab5deb4e3ec81e1c04a91af : Author: Ingo Molnar : AuthorDate: Wed Nov 28 13:59:18 2007 +0100 : Commit: Linus Torvalds : CommitDate: Wed Nov 28 10:58:01 2007 -0800 : : vfs: coredumping fix Signed-off-by: Neil Horman Cc: Andi Kleen Cc: Oleg Nesterov Cc: Alan Cox Cc: Al Viro Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c99cbf49a6e1a1efd25b11f4604c65c455e1612 Author: Oleg Nesterov Date: Fri Mar 5 13:44:14 2010 -0800 coredump: set ->group_exit_code for other CLONE_VM tasks too User visible change. do_coredump() kills all threads which share the same ->mm but only the coredumping process gets the proper exit_code. Other tasks which share the same ->mm die "silently" and return status == 0 to parent. This is historical behaviour, not actually a bug. But I think Frank Heckenbach rightly dislikes the current behaviour. Simple test-case: #include #include #include #include int main(void) { int stat; if (!fork()) { if (!vfork()) kill(getpid(), SIGQUIT); } wait(&stat); printf("stat=%x\n", stat); return 0; } Before this patch it prints "stat=0" despite the fact the child was killed by SIGQUIT. After this patch the output is "stat=3" which obviously makes more sense. Even with this patch, only the task which originates the coredumping gets "|= 0x80" if the core was actually dumped, but at least the coredumping signal is visible to do_wait/etc. Reported-by: Frank Heckenbach Signed-off-by: Oleg Nesterov Acked-by: WANG Cong Cc: Roland McGrath Cc: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 30736a4d43f4af7f1a7836d6a266be17082195c4 Author: Masami Hiramatsu Date: Fri Mar 5 13:44:12 2010 -0800 coredump: pass mm->flags as a coredump parameter for consistency Pass mm->flags as a coredump parameter for consistency. --- 1787 if (mm->core_state || !get_dumpable(mm)) { <- (1) 1788 up_write(&mm->mmap_sem); 1789 put_cred(cred); 1790 goto fail; 1791 } 1792 [...] 1798 if (get_dumpable(mm) == 2) { /* Setuid core dump mode */ <-(2) 1799 flag = O_EXCL; /* Stop rewrite attacks */ 1800 cred->fsuid = 0; /* Dump root private */ 1801 } --- Since dumpable bits are not protected by lock, there is a chance to change these bits between (1) and (2). To solve this issue, this patch copies mm->flags to coredump_params.mm_flags at the beginning of do_coredump() and uses it instead of get_dumpable() while dumping core. This copy is also passed to binfmt->core_dump, since elf*_core_dump() uses dump_filter bits in mm->flags. [akpm@linux-foundation.org: fix merge] Signed-off-by: Masami Hiramatsu Acked-by: Roland McGrath Cc: Hidehiro Kawai Cc: Oleg Nesterov Cc: Ingo Molnar Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d9032bbe4671dc481261ccd4e161cd96e54b118 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:10 2010 -0800 elf coredump: add extended numbering support The current ELF dumper implementation can produce broken corefiles if program headers exceed 65535. This number is determined by the number of vmas which the process have. In particular, some extreme programs may use more than 65535 vmas. (If you google max_map_count, you can find some users facing this problem.) This kind of program never be able to generate correct coredumps. This patch implements ``extended numbering'' that uses sh_info field of the first section header instead of e_phnum field in order to represent upto 4294967295 vmas. This is supported by AMD64-ABI(http://www.x86-64.org/documentation.html) and Solaris(http://docs.sun.com/app/docs/doc/817-1984/). Of course, we are preparing patches for gdb and binutils. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93eb211e6c9ff6054fcf9c5b9e344d8d9ad29175 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:09 2010 -0800 elf coredump: make offset calculation process and writing process explicit By the next patch, elf_core_dump() and elf_fdpic_core_dump() will support extended numbering and so will produce the corefiles with section header table in a special case. The problem is the process of writing a file header offset of the section header table into e_shoff field of the ELF header. ELF header is positioned at the beginning of the corefile, while section header at the end. So, we need to take which of the following ways: 1. Seek backward to retry writing operation for ELF header after writing process for a whole part 2. Make offset calculation process and writing process totally sequential The clause 1. is not always possible: one cannot assume that file system supports seek function. Consider the no_llseek case. Therefore, this patch adopts the clause 2. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1fcccbac89f5bbc5e41aa72086960059fce372da Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:07 2010 -0800 elf coredump: replace ELF_CORE_EXTRA_* macros by functions elf_core_dump() and elf_fdpic_core_dump() use #ifdef and the corresponding macro for hiding _multiline_ logics in functions. This patch removes #ifdef and replaces ELF_CORE_EXTRA_* by corresponding functions. For architectures not implemeonting ELF_CORE_EXTRA_*, we use weak functions in order to reduce a range of modification. This cleanup is for my next patches, but I think this cleanup itself is worth doing regardless of my firnal purpose. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 088e7af73a962fcc8883b7a6392544d8342553d6 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:06 2010 -0800 coredump: move dump_write() and dump_seek() into a header file My next patch will replace ELF_CORE_EXTRA_* macros by functions, putting them into other newly created *.c files. Then, each files will contain dump_write(), where each pair of binfmt_*.c and elfcore.c should be the same. So, this patch moves them into a header file with dump_seek(). Also, the patch deletes confusing DUMP_WRITE macros in each files. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05f47fda9fc5b17bfab189e9d54228025befc996 Author: Daisuke HATAYAMA Date: Fri Mar 5 13:44:05 2010 -0800 coredump: unify dump_seek() implementations for each binfmt_*.c The current ELF dumper can produce broken corefiles if program headers exceed 65535. In particular, the program in 64-bit environment often demands more than 65535 mmaps. If you google max_map_count, then you can find many users facing this problem. Solaris has already dealt with this issue, and other OSes have also adopted the same method as in Solaris. Currently, Sun's document and AMD 64 ABI include the description for the extension, where they call the extension Extended Numbering. See Reference for further information. I believe that linux kernel should adopt the same way as they did, so I've written this patch. I am also preparing for patches of GDB and binutils. How to fix ========== In new dumping process, there are two cases according to weather or not the number of program headers is equal to or more than 65535. - if less than 65535, the produced corefile format is exactly the same as the ordinary one. - if equal to or more than 65535, then e_phnum field is set to newly introduced constant PN_XNUM(0xffff) and the actual number of program headers is set to sh_info field of the section header at index 0. Compatibility Concern ===================== * As already mentioned in Summary, Sun and AMD64 has already adopted this. See Reference. * There are four combinations according to whether kernel and userland tools are respectively modified or not. The next table summarizes shortly for each combination. --------------------------------------------- Original Kernel | Modified Kernel --------------------------------------------- < 65535 | >= 65535 | < 65535 | >= 65535 ------------------------------------------------------------- Original Tools | OK | broken | OK | broken (#) ------------------------------------------------------------- Modified Tools | OK | broken | OK | OK ------------------------------------------------------------- Note that there is no case that `OK' changes to `broken'. (#) Although this case remains broken, O-M behaves better than O-O. That is, while in O-O case e_phnum field would be extremely small due to integer overflow, in O-M case it is guaranteed to be at least 65535 by being set to PN_XNUM(0xFFFF), much closer to the actual correct value than the O-O case. Test Program ============ Here is a test program mkmmaps.c that is useful to produce the corefile with many mmaps. To use this, please take the following steps: $ ulimit -c unlimited $ sysctl vm.max_map_count=70000 # default 65530 is too small $ sysctl fs.file-max=70000 $ mkmmaps 65535 Then, the program will abort and a corefile will be generated. If failed, there are two cases according to the error message displayed. * ``out of memory'' means vm.max_map_count is still smaller * ``too many open files'' means fs.file-max is still smaller So, please change it to a larger value, and then retry it. mkmmaps.c == #include #include #include #include #include int main(int argc, char **argv) { int maps_num; if (argc < 2) { fprintf(stderr, "mkmmaps [number of maps to be created]\n"); exit(1); } if (sscanf(argv[1], "%d", &maps_num) == EOF) { perror("sscanf"); exit(2); } if (maps_num < 0) { fprintf(stderr, "%d is invalid\n", maps_num); exit(3); } for (; maps_num > 0; --maps_num) { if (MAP_FAILED == mmap((void *)NULL, (size_t) 1, PROT_READ, MAP_SHARED | MAP_ANONYMOUS, (int) -1, (off_t) NULL)) { perror("mmap"); exit(4); } } abort(); { char buffer[128]; sprintf(buffer, "wc -l /proc/%u/maps", getpid()); system(buffer); } return 0; } Tested on i386, ia64 and um/sys-i386. Built on sh4 (which covers fs/binfmt_elf_fdpic.c) References ========== - Sun microsystems: Linker and Libraries. Part No: 817-1984-17, September 2008. URL: http://docs.sun.com/app/docs/doc/817-1984 - System V ABI AMD64 Architecture Processor Supplement Draft Version 0.99., May 11, 2009. URL: http://www.x86-64.org/ This patch: There are three different definitions for dump_seek() functions in binfmt_aout.c, binfmt_elf.c and binfmt_elf_fdpic.c, respectively. The only for binfmt_elf.c. My next patch will move dump_seek() into a header file in order to share the same implementations for dump_write() and dump_seek(). As the first step, this patch unify these three definitions for dump_seek() by applying the past commits that have been applied only for binfmt_elf.c. Specifically, the modification made here is part of the following commits: * d025c9db7f31fc0554ce7fb2dfc78d35a77f3487 * 7f14daa19ea36b200d237ad3ac5826ae25360461 This patch does not change a shape of corefiles. Signed-off-by: Daisuke HATAYAMA Cc: "Luck, Tony" Cc: Jeff Dike Cc: David Howells Cc: Greg Ungerer Cc: Roland McGrath Cc: Oleg Nesterov Cc: Ingo Molnar Cc: Alexander Viro Cc: Andi Kleen Cc: Alan Cox Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12bac0d9f4dbf3445a0319beee848d15fa32775e Author: Alexey Dobriyan Date: Fri Mar 5 13:44:00 2010 -0800 proc: warn on non-existing proc entries * warn if creation goes on to non-existent directory * warn if removal goes on from non-existing directory * warn if non-existing proc entry is removed Signed-off-by: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17a5765f20d1219c3f05eb17aab11671978e0ec Author: Alexey Dobriyan Date: Fri Mar 5 13:43:59 2010 -0800 proc: do translation + unlink atomically at remove_proc_entry() remove_proc_entry() does lock lookup parent unlock lock unlink proc entry from lists unlock which can be made bit more correct by doing parent translation + unlink without dropping lock. Signed-off-by: Alexey Dobriyan Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5748150eabdacd3f870c311b63d32f5e312bf624 Author: José Miguel Gonçalves Date: Fri Mar 5 13:43:58 2010 -0800 drivers/hwmon/adcxx.c: fix for single-channel ADCs While testing an ADC121S021 in an embedded board with a S3C2142 SoC (ARM core), I have found that the 'adcxx' driver does not handle correctly single channel ADCs from this chip family. For single channel chips you must only issue one read transfer for correct measurement. Signed-off-by: Jose Miguel Goncalves Cc: Marc Pignat Cc: Anton Vorontsov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cae787840ae82aa02649f45c46839b349034435 Author: Joe Perches Date: Fri Mar 5 13:43:56 2010 -0800 drivers/hwmon/vt8231.c: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Cc: Roger Lucas Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f2a9463d18517a9839401c3de6419ee1435875b Author: Joakim Tjernlund Date: Fri Mar 5 13:43:55 2010 -0800 crc32: some minor cleanups Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e79d96eed306a8b4af67b3f35f6867edfabeebc Author: Joe Perches Date: Fri Mar 5 13:43:55 2010 -0800 checkpatch: warn on unnecessary spaces before quoted newlines Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08e4436566250cb98b3f3ac37643b1cf09481256 Author: Alberto Panizzo Date: Fri Mar 5 13:43:54 2010 -0800 checkpatch.pl: warn if an adding line introduce spaces before tabs. Signed-off-by: Alberto Panizzo Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79404849e90a41ea2109bd0e2f7c7164b0c4ce73 Author: Emese Revfy Date: Fri Mar 5 13:43:53 2010 -0800 checkpatch.pl: extend list of expected-to-be-const structures Based on Arjan's suggestion, extend the list of ops structures that should be const. Signed-off-by: Emese Revfy Cc: Andy Whitcroft Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22fd2d3e4f75a2596ccdfdcbdfd505c9c60bf346 Author: Stefani Seibold Date: Fri Mar 5 13:43:52 2010 -0800 checkpatch.pl: add union and struct to the exceptions list Here is a small code snippet, which will be complained about by checkpatch.pl: #define __STRUCT_KFIFO_COMMON(recsize, ptrtype) \ union { \ struct { \ unsigned int in; \ unsigned int out; \ }; \ char rectype[recsize]; \ ptrtype *ptr; \ const ptrtype *ptr_const; \ }; This construct is legal and safe, so checkpatch.pl should accept this. It should be also true for struct defined in a macro. Add the `struct' and `union' keywords to the exceptions list of the checkpatch.pl script, to prevent error message "Macros with multiple statements should be enclosed in a do - while loop". Otherwise it is not possible to build a struct or union with a macro. Signed-off-by: Stefani Seibold Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52131292c069b74f4b5f3c786ff66ff6e82b0e69 Author: Wolfram Sang Date: Fri Mar 5 13:43:51 2010 -0800 checkpatch: fix false positive on __initconst checkpatch falsely complained about '__initconst' because it thought the 'const' needed a space before. Fix this by changing the list of attributes: - add '__initconst' - force plain 'init' to contain a word-boundary at the end Signed-off-by: Wolfram Sang Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 691e669ba8c64d31ac08d87b1751e6acfa3ff65e Author: Joe Perches Date: Fri Mar 5 13:43:51 2010 -0800 checkpatch.pl: allow > 80 char lines for logging functions not just printk Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42bdf74c95b6935f3c09a09ba4bead6cad11b540 Author: Hidetoshi Seto Date: Fri Mar 5 13:43:50 2010 -0800 checkpatch: trivial fix for trailing statements check In case if the statement and the conditional are in one line, the line appears in the report doubly. And items of this check have no blank line before the next item. This patch fixes these trivial problems, to improve readability of the report. [sample.c] > if (cond1 > && cond2 > && cond3) func_foo(); > > if (cond4) func_bar(); Before: > ERROR: trailing statements should be on next line > #1: FILE: sample.c:1: > +if (cond1 > [...] > + && cond3) func_foo(); > ERROR: trailing statements should be on next line > #5: FILE: sample.c:5: > +if (cond4) func_bar(); > +if (cond4) func_bar(); > total: 2 errors, 0 warnings, 5 lines checked After: > ERROR: trailing statements should be on next line > #1: FILE: sample.c:1: > +if (cond1 > [...] > + && cond3) func_foo(); > > ERROR: trailing statements should be on next line > #5: FILE: sample.c:5: > +if (cond4) func_bar(); > > total: 2 errors, 0 warnings, 5 lines checked Signed-off-by: Hidetoshi Seto Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f53a9b80f011080555c498d2ca2dc6b1a77c42c Author: Joe Perches Date: Fri Mar 5 13:43:48 2010 -0800 scripts/checkpatch.pl: add WARN on sizeof(&foo) sizeof(&foo) is frequently an error. Warn on its use. Signed-off-by: Joe Perches Cc: Andy Whitcroft Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 849382948992cc6482c778b1e854c19368b60c05 Author: Vasily Khoruzhick Date: Fri Mar 5 13:43:46 2010 -0800 mmc: enable DMA on Ricoh sdhci reader by default This card reader doesn't advertise, however DMA works well. Probably windows SDHCI driver assumes that all readers support DMA and thus we see that bug. Signed-off-by: Vasily Khoruzhick Tested-by: Maxim Levitsky Signed-off-by: Maxim Levitsky Cc: Harald Welte Cc: Norbert Preining Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 752993ef8e40d1863b26c7dc51e12223588d0fe0 Author: Nicolas Ferre Date: Fri Mar 5 13:43:45 2010 -0800 mmc: at91_mci: correct kunmap_atomic() kunmap_atomic() accepts a pointer to any location in the page so we do not need the subtraction and cast. Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5b27a1a566c5a4cce81d75107a0f130e43c6a5f8 Author: Nicolas Ferre Date: Fri Mar 5 13:43:44 2010 -0800 mmc: at91_mci: introduce per-mci-revision conditional code We used to manage features and differences on a per-cpu basis. As several cpus share the same mci revision, this patch aggregates cpus that have the same IP revision in one defined constant. We use the at91mci_is_mci1rev2xx() funtion name not to mess with newer Atmel sd/mmc IP called "MCI2". _rev2 naming could have been confusing... Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 541e7ef0399c6c5753cc8d3e8f371dcb3627e8a4 Author: Nicolas Ferre Date: Fri Mar 5 13:43:43 2010 -0800 mmc: at91_mci: Enable MMC_CAP_SDIO_IRQ only when it actually works. According to the datasheets AT91SAM9261 does not support SDIO interrupts, and AT91SAM9260/9263 have an erratum requiring 4bit mode while using slot B for the interrupt to work. Signed-off-by: Nicolas Ferre Cc: Wolfgang Muees Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9af13be2acac60ca5593e41a601d4a5b6bc35302 Author: Wolfgang Muees Date: Fri Mar 5 13:43:42 2010 -0800 mmc: at91_mci: enable large data blocks This patch is setting some max_ variables for the IO elevator, so the elevator will put requests for large data blocks to the driver. This is critical for a) speed and b) wear leveling of the flash chip controller: Otherwise the controller will treat the SD card badly with millions of single 4 KByte write commands. This will lead to a shorter life time for the SD cards. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86ee26f5b0a889bf7e9f6351bbf01516d0686461 Author: Wolfgang Muees Date: Fri Mar 5 13:43:41 2010 -0800 mmc: at91_mci: use DMA buffer for read Convert the read to use the DMA buffer as well. The old code was doing double-buffering DMA with the PDC; no way to make it work. Replace it with a single-PDC approach. It also simplify things removing the need for a pre_dma_read() function. [nicolas.ferre@atmel.com coding style modifications] Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3780d90602dfef6df3d8b39b203d6bf7fb99f22a Author: Wolfgang Muees Date: Fri Mar 5 13:43:40 2010 -0800 mmc: at91_mci: use one coherent DMA buffer The TX DMA buffer is allocated only once, because the allocation/deallocation of the buffer for EACH chunk of data is time-consuming and prone to memory fragmentation. Using a coherent DMA buffer avoids extra data cache calls. [nicolas.ferre@atmel.com: coding style modifications] Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a04ac5b9b45a7adec7d3ee3968e677b6e4b98f25 Author: Wolfgang Muees Date: Fri Mar 5 13:43:39 2010 -0800 mmc: at91_mci: fix timeout errors Fix two timeout errors, one for slow SDHC cards and one for slow users while inserting SD cards. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b3520f2df8e4e5dad6a7b2743d037bf06c22024 Author: Wolfgang Muees Date: Fri Mar 5 13:43:38 2010 -0800 mmc: at91_mci: fix pointer errors Fixes two pointer errors, one which leads to memory overwrites if used with large chunks of data. Signed-off-by: Wolfgang Muees Signed-off-by: Nicolas Ferre Cc: Andrew Victor Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc2ed552804f3a2ae41c0ffe4bc09879ec8f7396 Author: Lars-Peter Clausen Date: Fri Mar 5 13:43:37 2010 -0800 s3cmci: s3cmci_card_present: Use no_detect to decide whether there is a card detect pin Signed-off-by: Lars-Peter Clausen Cc: Ben Dooks Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c212808a1ba6bfba489006399b8152a047305acf Author: Lars-Peter Clausen Date: Fri Mar 5 13:43:35 2010 -0800 s3cmci: initialize default platform data no_wprotect and no_detect with 1 If no platform_data was givin to the device it's going to use it's default platform data struct which has all fields initialized to zero. As a result the driver is going to try to request gpio0 both as write protect and card detect pin. Which of course will fail and makes the driver unusable Previously to the introduction of no_wprotect and no_detect the behavior was to assume that if no platform data was given there is no write protect or card detect pin. This patch restores that behavior. Signed-off-by: Lars-Peter Clausen Cc: Ben Dooks Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6b5eda369ac3772dad416ef96d86064204d74770 Author: Daniel Drake Date: Fri Mar 5 13:43:34 2010 -0800 sdio: put active devices into 1-bit mode during suspend And bring them back to 4-bit mode during resume. Signed-off-by: Daniel Drake Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40216842dca4fa485cb1aa5eb231149a4a57cc85 Author: Nicolas Pitre Date: Fri Mar 5 13:43:34 2010 -0800 sdio: kick the interrupt thread upon a resume Some SDIO cards may suspend while keeping function interrupts active especially in the powered suspend case. Upon resume we need to kick the SDIO interrupt thread to check for pending interrupts and to restart card IRQ detection at the host controller level. Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bca4cf703826fcb2bbabbe19c6fc7b2fc4fd7cc Author: Chris Ball Date: Fri Mar 5 13:43:33 2010 -0800 sdio: don't use CMD[357] as part of a powered SDIO resume Seen on a Marvell 8686 SDIO card and Via VX855 controller: we must avoid sending CMD3/5/7 on a resume where power has been maintained, because the 8686 will refuse to respond to them and the MMC stack will give up on the card. Signed-off-by: Chris Ball Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f4cbb3d834922ffa0309b6a08fa42dac87ef9d2 Author: Nicolas Pitre Date: Fri Mar 5 13:43:32 2010 -0800 sdio: sdhci support for suspend mode PM features Tested with an XO v1.5 from OLPC. Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da68c4eb258cd9f3f0b8aeb7e46b8118bb6358b6 Author: Nicolas Pitre Date: Fri Mar 5 13:43:31 2010 -0800 sdio: introduce API for special power management features This patch series provides the core changes needed to allow SDIO cards to remain powered and active while the host system is suspended, and let them wake up the host system when needed. This is used to implement wake-on-lan with SDIO wireless cards at the moment. Patches to add that support to the libertas driver will be posted separately. This patch: Some SDIO cards have the ability to keep on running autonomously when the host system is suspended, and wake it up when needed. This however requires that the host controller preserve power to the card, and configure itself appropriately for wake-up. There is however 4 layers of abstractions involved: the host controller driver, the MMC core code, the SDIO card management code, and the actual SDIO function driver. To make things simple and manageable, host drivers must advertise their PM capabilities with a feature bitmask, then function drivers can query and set those features from their suspend method. Then each layer in the suspend call chain is expected to act upon those bits accordingly. [akpm@linux-foundation.org: fix typo in comment] Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e506f35b1dc327c448d4791bc098f07b9b2efe9 Author: Ben Dooks Date: Fri Mar 5 13:43:29 2010 -0800 sdhci: improve sdhci sdhci_set_adma_desc() code sdhci_set_adma_desc() is using byte-writes to write data in a specified order into memory. Change to using __le16 for the two byte and __le32 for the four byte cases and use the cpu_to_{le16,le32} to do the conversion before writing. This will reduce the size of the code and the number of writes as we no longer need to chop the data up before writing. As an example on ARM S3C64XX SoC, in little-endian configuration: 000000d4 : - d8: e1a0c423 lsr ip, r3, #8 - dc: e1a0ec21 lsr lr, r1, #24 - e0: e1a04821 lsr r4, r1, #16 - e4: e1a05421 lsr r5, r1, #8 - e8: e1a06442 asr r6, r2, #8 - ec: e5c0c001 strb ip, [r0, #1] - f0: e5c0e007 strb lr, [r0, #7] - f4: e5c04006 strb r4, [r0, #6] - f8: e5c05005 strb r5, [r0, #5] - fc: e5c01004 strb r1, [r0, #4] - 100: e5c06003 strb r6, [r0, #3] - 104: e5c02002 strb r2, [r0, #2] - 108: e5c03000 strb r3, [r0] + d4: e5801004 str r1, [r0, #4] + d8: e1c030b0 strh r3, [r0] + dc: e1c020b2 strh r2, [r0, #2] Signed-off-by: Ben Dooks Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 118cd17d4137f34c747c32765c1cb4d3910c04d4 Author: Ben Dooks Date: Fri Mar 5 13:43:26 2010 -0800 sdhci: add adma descriptor set call The code to write the ADMA descriptor into memory is repeated several times throughout sdhci_adma_table_pre, and thus should be moved into a common function. This will also be useful if the patch to make the write more efficient is accepted. Signed-off-by: Ben Dooks Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3fb7fb4a01d09f81d1daaf65e52d929734bd691f Author: Bing Zhao Date: Fri Mar 5 13:43:25 2010 -0800 sdio: add quirk to clamp byte mode transfer Some SDIO cards expect byte transfers not to exceed the configured block transfer size. Add a quirk to that effect. Patches to make use of this quirk will be sent separately. Signed-off-by: Bing Zhao Signed-off-by: Nicolas Pitre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 729adf1b5f4562f67fe8bf6c1df97edc1128fac7 Author: Cliff Cai Date: Fri Mar 5 13:43:25 2010 -0800 mmc: bfin_sdh: set timeout based on actual card data The hardcoded value doesn't really work for all cards. Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 05dabcc4a51eab7342b2220f0121b4f4a5109386 Author: Mike Frysinger Date: Fri Mar 5 13:43:24 2010 -0800 mmc: bfin_sdh: drop redundant MMC depend string The host/Kconfig file is only included when MMC is selected. Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c744d988729db9be37d1c877d143cfe63941c25c Author: Mike Frysinger Date: Fri Mar 5 13:43:23 2010 -0800 mmc: bfin_sdh: fix unused sg warning on BF51x/BF52x systems The local sg variable is only used with BF54x code. Signed-off-by: Mike Frysinger Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 09591dd3183d5aeae515bd5fcba718ec49e11ece Author: Nicolas Ferre Date: Fri Mar 5 13:43:22 2010 -0800 mmc: Atmel host kconfig cleanup for everyone else This prevents those without an Atmel chip having a line in kernel configuration which says "Atmel SD/MMC Driver" without any option. Signed-off-by: Jonathan Cameron Signed-off-by: Nicolas Ferre Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 132f10746c2bb2e4bcfc3fadff12f390ace2d183 Author: Vipin Bhandari Date: Fri Mar 5 13:43:21 2010 -0800 davinci: MMC: add support for 8bit MMC cards Add support for 8bit MMC cards. The controller data width is configurable depending on the wires setting in the platform data structure. MMC 8bit is tested on OMAPL137 and MMC 4bit is tested on OMAPL138 EVM. Signed-off-by: Vipin Bhandari Cc: David Brownell Cc: Chaithrika U S Cc: Sudhakar Rajashekhara Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03cd8f7ebe0cbef5ca7eed349774085e92a3d726 Author: Maxim Levitsky Date: Fri Mar 5 13:43:20 2010 -0800 ricoh_mmc: port from driver to pci quirk This patch solves nasty problem original driver has. Original goal of the ricoh_mmc was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding writing of yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into the pci quirk section, thus it is executes before the pci is enumerated, and therefore solving that issue, also same sequence of commands is performed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky Acked-by: Philip Langdale Acked-by: Wolfram Sang Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45bf5cd7be624712ef1591e9de71f0ff7ad21cf1 Author: Andrew Morton Date: Fri Mar 5 13:43:19 2010 -0800 fs/compat_ioctl.c: suppress two warnings fs/compat_ioctl.c: In function 'do_ioctl_trans': fs/compat_ioctl.c:534: warning: 'karg' may be used uninitialized in this function fs/compat_ioctl.c:533: warning: 'kcmd' may be used uninitialized in this function fs/compat_ioctl.c:656: warning: 'ret' may be used uninitialized in this function Reduces text size by 44 bytes. If someone calls one of these functions with an unexpected argument, the code's buggy as-is. Amerigo Wang Cc: Alexander Viro Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08564fb7ab9ead9226b6154439c3fecd17972eb0 Author: Akinobu Mita Date: Fri Mar 5 13:43:18 2010 -0800 bitmap: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a86e2bad0b9fbf3290ae496da6dab9536dd6bf7 Author: Ben Hutchings Date: Fri Mar 5 13:43:17 2010 -0800 lib: fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a069c266ae5fdfbf5b4aecf2c672413aa33b2504 Author: Don Mullis Date: Fri Mar 5 13:43:16 2010 -0800 lib: build list_sort() only if needed Build list_sort() only for configs that need it -- those that don't save ~581 bytes (i386). Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b12b7a28faa2e9ed5a361cd08ea576ab1f1509 Author: Don Mullis Date: Fri Mar 5 13:43:15 2010 -0800 lib: revise list_sort() header comment Clarify and correct header comment of list_sort(). Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 835cc0c8477fdbc59e0217891d6f11061b1ac4e2 Author: Don Mullis Date: Fri Mar 5 13:43:15 2010 -0800 lib: more scalable list_sort() XFS and UBIFS can pass long lists to list_sort(); this alternative implementation scales better, reaching ~3x performance gain when list length exceeds the L2 cache size. Stand-alone program timings were run on a Core 2 duo L1=32KB L2=4MB, gcc-4.4, with flags extracted from an Ubuntu kernel build. Object size is 581 bytes compared to 455 for Mark J. Roberts' code. Worst case for either implementation is a list length just over a power of two, and to roughly the same degree, so here are timing results for a range of 2^N+1 lengths. List elements were 16 bytes each including malloc overhead; initial order was random. time (msec) Tatham-Roberts | generic-Mullis-v2 loop_count length | | ratio 4000000 2 206 294 1.427 2000000 3 176 227 1.289 1000000 5 199 172 0.864 500000 9 235 178 0.757 250000 17 243 182 0.748 125000 33 261 196 0.750 62500 65 277 209 0.754 31250 129 292 219 0.75 15625 257 317 235 0.741 7812 513 340 252 0.741 3906 1025 362 267 0.737 1953 2049 388 283 0.729 ~ L1 size 976 4097 556 323 0.580 488 8193 678 361 0.532 244 16385 773 395 0.510 122 32769 844 418 0.495 61 65537 917 454 0.495 30 131073 1128 543 0.481 15 262145 2355 869 0.369 ~ L2 size 7 524289 5597 1714 0.306 3 1048577 6218 2022 0.325 Mark's code does not actually implement the usual or generic mergesort, but rather a variant from Simon Tatham described here: http://www.chiark.greenend.org.uk/~sgtatham/algorithms/listsort.html Simon's algorithm performs O(log N) passes over the entire input list, doing merges of sublists that double in size on each pass. The generic algorithm instead merges pairs of equal length lists as early as possible, in recursive order. For either algorithm, the elements that extend the list beyond power-of-two length are a special case, handled as nearly as possible as a "rounding-up" to a full POT. Some intuition for the locality of reference implications of merge order may be gotten by watching this animation: http://www.sorting-algorithms.com/merge-sort Simon's algorithm requires only O(1) extra space rather than the generic algorithm's O(log N), but in my non-recursive implementation the actual O(log N) data is merely a vector of ~20 pointers, which I've put on the stack. Long-running list_sort() calls: If the list passed in may be long, or the client's cmp() callback function is slow, the client's cmp() may periodically invoke cond_resched() to voluntarily yield the CPU. All inner loops of list_sort() call back to cmp(). Stability of the sort: distinct elements that compare equal emerge from the sort in the same order as with Mark's code, for simple test cases. A boot-time test is provided to verify this and other correctness requirements. A kernel that uses drm.ko appears to run normally with this change; I have no suitable hardware to similarly test the use by UBIFS. [akpm@linux-foundation.org: style tweaks, fix comment, make list_sort_test __init] Signed-off-by: Don Mullis Cc: Dave Airlie Cc: Andi Kleen Cc: Dave Chinner Cc: Artem Bityutskiy Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6a2eedfddcded92c8f9b0ac022a99c4134696b0 Author: André Goddard Rosa Date: Fri Mar 5 13:43:12 2010 -0800 lib/string.c: simplify strnstr() Signed-off-by: André Goddard Rosa Cc: Li Zefan Cc: Joe Perches Cc: Frederic Weisbecker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a11d2b64e1f2556953120d516241243ea365f0ae Author: André Goddard Rosa Date: Fri Mar 5 13:43:11 2010 -0800 lib/string.c: simplify stricmp() Removes 32 bytes on core2 with gcc 4.4.1: text data bss dec hex filename 3196 0 0 3196 c7c lib/string-BEFORE.o 3164 0 0 3164 c5c lib/string-AFTER.o Signed-off-by: André Goddard Rosa Cc: Joe Perches Cc: Frederic Weisbecker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8a6e25357d51d6ecf4ee21e9048f0416a085a79c Author: Joe Perches Date: Fri Mar 5 13:43:11 2010 -0800 MAINTAINERS: document and add "Q" patchwork queue entries Patchwork queues show the acceptance/rejection state of submitted patches for various MAINTAINER trees. Document their existence. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e200e0ec9148ad2941e30d59b9552973d49a82b6 Author: Joe Perches Date: Fri Mar 5 13:43:10 2010 -0800 MAINTAINERS: WAVELAN moved to staging by commit 0234f84ebb00d36c48062befa5436eef36b71ccd Update patterns Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 931812cb1b40650e44f6bbb2acb84a129498202f Author: Joe Perches Date: Fri Mar 5 13:43:10 2010 -0800 MAINTAINERS: STARMODE RADIO IP (STRIP) moved to staging by commit 955015bb0b42167d14f776ff5947ae2463a974dc Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc95ec6fbd9e2426df76b8cf62063d2ee8e32dc2 Author: Joe Perches Date: Fri Mar 5 13:43:09 2010 -0800 MAINTAINERS: update PERFORMANCE EVENTS F: patterns To match arch/*/kernel perf_event location changes Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a9582206c526be81054a8be2227e92a4403d2452 Author: Joe Perches Date: Fri Mar 5 13:43:08 2010 -0800 MAINTAINERS: remove HAYES ESP SERIAL DRIVER Commit f53a2ade0bb9f2a81f473e6469155172a96b7c38 ("tty: esp: remove broken driver") removed it Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 82cc83473559e0e6da6278053c2d14448b189e0e Author: Joe Perches Date: Fri Mar 5 13:43:08 2010 -0800 MAINTAINERS: remove AMD GEODE F: arch/x86/kernel/geode_32.c Commit c95d1e53ed89b75a4d7b68d1cbae4607b1479243 ("cs5535: drop the Geode-specific MFGPT/GPIO code") removed it. Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c840c18bcd8efb37f1a565e83a9509e1ea5d105 Author: Joe Perches Date: Fri Mar 5 13:43:07 2010 -0800 scripts/get_maintainer.pl: fix possible infinite loop If MAINTAINERS section entries are misformatted, it was possible to have an infinite loop. Correct the defect by always moving the index to the end of section + 1 Also, exit check for exclude as soon as possible. Signed-off-by: Joe Perches Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a63ceb4c36a7674f7efa90e8ba96b44a3989d717 Author: Stephen Hemminger Date: Fri Mar 5 13:43:06 2010 -0800 get_maintainer: quote email address with period Picky mail systems won't accept email addresses where recipient has period in name; ie. David S. Miller will not work. Signed-off-by: Stephen Hemminger Acked-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22dd5b0cba50a197aaa3bd2790a29ee2e8e4e372 Author: Stephen Hemminger Date: Fri Mar 5 13:43:06 2010 -0800 get_maintainer: fix perlcritic warnings perlcritic is a standard checker for Perl Best Practices. This patch fixes most of the warnings in the get_maintainer script. If kernel programmers are going to have checkpatch they should write clean scripts as well... Bareword file handle opened at line 176, column 1. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 176, column 1. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 207, column 5. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 207, column 5. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 246, column 6. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 246, column 6. See page 207 of PBP. (Severity: 5) Bareword file handle opened at line 258, column 2. See pages 202,204 of PBP. (Severity: 5) Two-argument "open" used at line 258, column 2. See page 207 of PBP. (Severity: 5) Expression form of "eval" at line 983, column 17. See page 161 of PBP. (Severity: 5) Expression form of "eval" at line 985, column 17. See page 161 of PBP. (Severity: 5) Subroutine prototypes used at line 1186, column 1. See page 194 of PBP. (Severity: 5) Subroutine prototypes used at line 1206, column 1. See page 194 of PBP. (Severity: 5) Signed-off-by: Stephen Hemminger Acked-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64f77f312b15f101bf6c4c65d5359ccc16e3f82b Author: Joe Perches Date: Fri Mar 5 13:43:04 2010 -0800 scripts/get_maintainer.pl: add ability to read from STDIN Doesn't need or accept '-' as a trailing option to read stdin. Doesn't print usage() after bad options. Adds --usage as command line equivalent of --help Suggested-by: Borislav Petkov Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f11e9a1534c5e9dd4be97b30e6b24902e0ec325b Author: Joe Perches Date: Fri Mar 5 13:43:03 2010 -0800 scripts/get_maintainer.pl: change --sections to print in the same style as MAINTAINERS Signed-off-by: Joe Perches Cc: Stefan Richter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4b76c9da611593eed6a13527c5ebd00c173624ad Author: Joe Perches Date: Fri Mar 5 13:43:03 2010 -0800 scripts/get_maintainer.pl: add --sections, print entire matched subsystem Print the complete contents of the matched subsystems in pattern match depth order. Sample output: $ ./scripts/get_maintainer.pl --sections -f drivers/net/usb/smsc95xx.c USB SMSC95XX ETHERNET DRIVER M:Steve Glendinning L:netdev@vger.kernel.org S:Supported F:drivers/net/usb/smsc95xx.* USB SUBSYSTEM M:Greg Kroah-Hartman L:linux-usb@vger.kernel.org W:http://www.linux-usb.org T:quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S:Supported F:Documentation/usb/ F:drivers/net/usb/ F:drivers/usb/ F:include/linux/usb.h F:include/linux/usb/ NETWORKING DRIVERS L:netdev@vger.kernel.org W:http://www.linuxfoundation.org/en/Net T:git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git S:Odd Fixes F:drivers/net/ F:include/linux/if_* F:include/linux/*device.h THE REST M:Linus Torvalds L:linux-kernel@vger.kernel.org Q:http://patchwork.kernel.org/project/LKML/list/ T:git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git S:Buried alive in reporters F:* F:*/ Signed-off-by: Joe Perches Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03372dbbe618bfcd02f9c8cdbfe78e97e3aad43b Author: Joe Perches Date: Fri Mar 5 13:43:00 2010 -0800 scripts/get_maintainer.pl: add --file-emails, find embedded email addresses Add an imperfect option to search a source file for email addresses. New option: --file-emails or --fe email addresses in files are freeform text and are nearly impossible to parse. Still, might as well try to do a somewhat acceptable job of finding them. This code should find all addresses that are in the form addr@domain.tld The code assumes that up to 3 alphabetic words along with dashes, commas, and periods that preceed the email address are a name. If 3 words are found for the name, and one of the first two words are a single letter and period, or just a single letter then the 3 words are use as name otherwise the last 2 words are used. Some variants that are shown correctly: John Smith Random J. Developer Random J. Developer (rjd@tld.com) J. Random Developer rjd@tld.com Variants that are shown nominally correctly: Written by First Last (funny-addr@somecompany.com) is shown as: First Last Variants that are shown incorrectly: Some Really Long Name MontaVista Software, Inc. are returned as: Long Name "Software, Inc" --roles and --rolestats show "(in file)" for matches. For instance: Without -file-emails: $ ./scripts/get_maintainer.pl -f -nogit -roles net/core/netpoll.c David S. Miller (maintainer:NETWORKING [GENERAL]) linux-kernel@vger.kernel.org (open list) With -fe: $ ./scripts/get_maintainer.pl -f -fe -nogit -roles net/core/netpoll.c David S. Miller (maintainer:NETWORKING [GENERAL]) Matt Mackall (in file) Ingo Molnar (in file) linux-kernel@vger.kernel.org (open list) netdev@vger.kernel.org (open list:NETWORKING [GENERAL]) The number of email addresses in the file in not limited. Neither is the number of returned email addresses. Signed-off-by: Joe Perches Cc: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cea83886dde49fd7524e9f4a246dd5dff4ad236a Author: Gustavo F. Padovan Date: Fri Mar 5 13:42:58 2010 -0800 printk: avoid warning when CONFIG_PRINTK is disabled kernel/printk.c:72: warning: `saved_console_loglevel' defined but not used Signed-off-by: Gustavo F. Padovan Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef097dd7ba4eab8b4f0026d85fcef9fe23b821f Author: Michael Neuling Date: Fri Mar 5 13:42:57 2010 -0800 exec: create initial stack independent of PAGE_SIZE Currently we create the initial stack based on the PAGE_SIZE. This is unnecessary. This creates this initial stack independent of the PAGE_SIZE. It also bumps up the number of 4k pages allocated from 20 to 32, to align with 64K page systems. Signed-off-by: Michael Neuling Cc: Helge Deller Reviewed-by: KOSAKI Motohiro Cc: Americo Wang Cc: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9728e5d6e6c432ee8487c63ce6e479e2474d9945 Author: Tetsuo Handa Date: Fri Mar 5 13:42:56 2010 -0800 kernel/pid.c: update comment on find_task_by_pid_ns tasklist_lock does protect the task and its pid, it can't go away. The problem is that find_pid_ns() itself is unsafe without rcu lock, it can race with copy_process()->free_pid(any_pid). Protecting copy_process()->free_pid(any_pid) with tasklist_lock would make it possible to call find_task_by_pid_ns() under tasklist safely, but we don't do so because we are trying to get rid of the read_lock sites of tasklist_lock. Signed-off-by: Tetsuo Handa Cc: Oleg Nesterov Cc: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8aeee85a29e27e043db582bf2ae8e5f42767934f Author: Anton Blanchard Date: Fri Mar 5 13:42:55 2010 -0800 panic: fix panic_timeout accuracy when running on a hypervisor I've had some complaints about panic_timeout being wildly innacurate on shared processor PowerPC partitions (a 3 minute panic_timeout taking 30 minutes). The problem is we loop on mdelay(1) and with a 1ms in 10ms hypervisor timeslice each of these will take 10ms (ie 10x) longer. I expect other platforms with shared processor hypervisors will see the same issue. This patch keeps the old behaviour if we have a panic_blink (only keyboard LEDs right now) and does 1 second mdelays if we don't. Signed-off-by: Anton Blanchard Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 78d7d407b62a021e6d2e8dc24c0b90e390ab58a1 Author: Jiri Slaby Date: Fri Mar 5 13:42:54 2010 -0800 kernel core: use helpers for rlimits Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d4bb527438b4181cd3c564ae04dd344c381283a1 Author: Jiri Slaby Date: Fri Mar 5 13:42:53 2010 -0800 posix-cpu-timers: cleanup rlimits usage Fetch rlimit (both hard and soft) values only once and work on them. It removes many accesses through sig structure and makes the code cleaner. Mostly a preparation for writable resource limits support. Signed-off-by: Jiri Slaby Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: john stultz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3abd4f9531becb71626bd206955d47d5ea54f06 Author: Thiago Farina Date: Fri Mar 5 13:42:52 2010 -0800 kernel/exit.c: fix shadows sparse warning kernel/exit.c:1183:26: warning: symbol 'status' shadows an earlier one kernel/exit.c:1173:21: originally declared here Signed-off-by: Thiago Farina Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c03c383563f147907f1a90cf16f1e190e2f4aae Author: Jaswinder Singh Rajput Date: Fri Mar 5 13:42:52 2010 -0800 includecheck fix for kernel/params.c Fix the following 'make includecheck' warning: kernel/params.c: linux/string.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Cc: André Goddard Rosa Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f1664f92b2247111b7d37e454a050b76ac61b7f Author: Dan Carpenter Date: Fri Mar 5 13:42:51 2010 -0800 splice: comparing unsigned int < 0 "ret" needs to be signed or the error handling for splice_to_pipe() won't work correctly. Signed-off-by: Dan Carpenter Cc: Tom Zanussi Cc: Jens Axboe Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0347af4ee3922220f6bfe74b87b526aa709a0365 Author: Simon Kagstrom Date: Fri Mar 5 13:42:49 2010 -0800 lkdtm: add debugfs access and loosen KPROBE ties Add adds a debugfs interface and additional failure modes to LKDTM to provide similar functionality to the provoke-crash driver submitted here: http://lwn.net/Articles/371208/ Crashes can now be induced either through module parameters (as before) or through the debugfs interface as in provoke-crash. The patch also provides a new "direct" interface, where KPROBES are not used, i.e., the crash is invoked directly upon write to the debugfs file. When built without KPROBES configured, only this mode is available. Signed-off-by: Simon Kagstrom Cc: M. Mohan Kumar Cc: Americo Wang Cc: David Woodhouse Cc: Ingo Molnar Cc: "Eric W. Biederman" , Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 33fd797b3e2c6a7663b9331150da0acdb31990a2 Author: Thadeu Lima de Souza Cascardo Date: Fri Mar 5 13:42:48 2010 -0800 eisa: fix coding style for eisa bus code Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Kay Sievers Cc: Greg Kroah-Hartman Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d9e7363b87a4c5fb3fc17070607a75a9eb4cc8 Author: Julia Lawall Date: Fri Mar 5 13:42:47 2010 -0800 drivers/misc/iwmc3200top/main.c: eliminate useless code The variable priv is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Cc: Tomas Winkler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7463e633c5f94792dcff1afefb0d2961318a9d09 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:46 2010 -0800 init/main.c: make setup_max_cpus static for !SMP The only in tree external users of the symbol setup_max_cpus are in arch/x86/. The files ./kernel/alternative.c, ./kernel/visws_quirks.c, and ./mm/kmemcheck/kmemcheck.c are all guarded by CONFIG_SMP being defined. For this case the symbol is an unsigned int and declared as an extern in include/linux/smp.h. When CONFIG_SMP is not defined the symbol setup_max_cpus is a constant value that is only used in init/main.c. Make the symbol static for this case. Signed-off-by: H Hartley Sweeten Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cfd8d6c0ed89ba387609419e3d8d4c6b92a5d446 Author: Rakib Mullick Date: Fri Mar 5 13:42:45 2010 -0800 smp: fix documentation in include/linux/smp.h smp: Fix documentation. Fix documentation in include/linux/smp.h: smp_processor_id() Signed-off-by: Rakib Mullick Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72c3368856c543ace033f6a5b9a3edf1f4043236 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:43 2010 -0800 nodemask.h: remove macro any_online_node The macro any_online_node() is prone to producing sparse warnings due to the local symbol 'node'. Since all the in-tree users are really requesting the first online node (the mask argument is either NODE_MASK_ALL or node_online_map) just use the first_online_node macro and remove the any_online_node macro since there are no users. Signed-off-by: H Hartley Sweeten Acked-by: David Rientjes Reviewed-by: KAMEZAWA Hiroyuki Cc: Mel Gorman Cc: Lee Schermerhorn Acked-by: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Dave Hansen Cc: Milton Miller Cc: Nathan Fontenot Cc: Geoff Levand Cc: Grant Likely Cc: J. Bruce Fields Cc: Neil Brown Cc: Trond Myklebust Cc: David S. Miller Cc: Benny Halevy Cc: Chuck Lever Cc: Ricardo Labiaga Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d554ed895dc8f293cc712c71f14b101ace82579a Author: Jiri Slaby Date: Fri Mar 5 13:42:42 2010 -0800 fs: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in commit 3e10e716abf3 ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Cc: Alexander Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 221e3ebf6d5f2625373573155924e39f196c5d3d Author: Heiko Carstens Date: Fri Mar 5 13:42:41 2010 -0800 cpumask: let num_*_cpus() function always return unsigned values Dependent on CONFIG_SMP the num_*_cpus() functions return unsigned or signed values. Let them always return unsigned values to avoid strange casts. Fixes at least one warning: kernel/kprobes.c: In function 'register_kretprobe': kernel/kprobes.c:1038: warning: comparison of distinct pointer types lacks a cast Signed-off-by: Heiko Carstens Cc: Heiko Carstens Cc: Ananth N Mavinakayanahalli Cc: Masami Hiramatsu Cc: Ingo Molnar Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8aaed5bec2b9177eab1796c8c4f7a4c90804eef6 Author: H Hartley Sweeten Date: Fri Mar 5 13:42:39 2010 -0800 init/initramfs.c: fix "symbol shadows an earlier one" noise The symbol 'count' is a local global variable in this file. The function clean_rootfs() should use a different symbol name to prevent "symbol shadows an earlier one" noise. Signed-off-by: H Hartley Sweeten Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a85b8d6049cbb0e7961df2069322fbc4192026a Author: Andreas Mohr Date: Fri Mar 5 13:42:39 2010 -0800 init/main.c: improve usability in case of init binary failure - new Documentation/init.txt file describing various forms of failure trying to load the init binary after kernel bootup - extend the init/main.c init failure message to direct to Documentation/init.txt Signed-off-by: Andreas Mohr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87d5e0236d9d688fb575e9e12232764ac617617c Author: Chen Gong Date: Fri Mar 5 13:42:38 2010 -0800 kernel/cpu.c: delete deprecated definition in cpu_up() Additional_cpus is only supported for IA64 now. X86_64 should not be included. Signed-off-by: Chen Gong Cc: Ingo Molnar Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c8f05c2837b06bb2739e85204c0d34009fb6494 Author: Randy Dunlap Date: Fri Mar 5 13:42:35 2010 -0800 MFGPT: move clocksource menu Move the CS5535 MFGPT hrtimer kconfig option to be with the other MFGPT options. This makes it easier to find and also removes it from the main "Device Drivers" menu, where it should not have been. Signed-off-by: Randy Dunlap Acked-by: Andres Salomon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b2a8c8f3c65c08bd737b30d3ceee732ed84813a Author: WANG Cong Date: Fri Mar 5 13:42:34 2010 -0800 um: tell git to ignore generated files Tell git to ignore the generated files under um, except: include/shared/kern_constants.h include/shared/user_constants.h which will be moved to include/generated. Signed-off-by: WANG Cong Cc: Al Viro Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03315b59165ee2049a4b903a1b0b8bf673d701fa Author: Alexander Beregalov Date: Fri Mar 5 13:42:33 2010 -0800 uml: line.c: avoid NULL pointer dereference Assign tty only if line is not NULL. [akpm@linux-foundation.org: simplification] Signed-off-by: Alexander Beregalov Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit be1494527c4dea4db87749d08b09be23327157dc Author: Roel Kluin Date: Fri Mar 5 13:42:33 2010 -0800 cris v32: typo in crisv32_arbiter_unwatch()? With id 1 the wrong bp was unwatched. Signed-off-by: Roel Kluin Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cda1c5af26a00ee31cdc5ab8321a1be7851cbfff Author: Roel Kluin Date: Fri Mar 5 13:42:32 2010 -0800 cryptocop: fix assertion in create_output_descriptors() size_t desc_len cannot be less than 0, test before the subtraction. Signed-off-by: Roel Kluin Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba875ba6b7cd28c5f15680ed694276510aa69970 Author: john stultz Date: Fri Mar 5 13:42:31 2010 -0800 cris: convert to use arch_gettimeoffset() Convert cris to use GENERIC_TIME via the arch_getoffset() infrastructure, reducing the amount of arch specific code we need to maintain. Signed-off-by: John Stultz Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 56e6943b41468826c26155139629c9a5379550ab Author: Richard Kennedy Date: Fri Mar 5 13:42:30 2010 -0800 cpuidle menu: remove 8 bytes of padding on 64 bit builds Reorder struct menu_device to remove 8 bytes of padding on 64 bit builds. Size drops from 136 to 128 bytes, so possibly needing one fewer cache lines. Signed-off-by: Richard Kennedy Cc: Arjan van de Ven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77079dbec721a282bf0931385ae10d77cdbac5af Author: Roel Kluin Date: Fri Mar 5 13:42:28 2010 -0800 alpha: PTR_ERR overwrites -EINVAL in syscall osf_mount The initial -EINVAL value is overwritten by `retval = PTR_ERR(name)'. If this isn't an error pointer and typenr is not 1, 6 or 9, then this retval, a pointer cast to a long, is returned. Signed-off-by: Roel Kluin Acked-by: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6822190882ce02ae8ae135026c2b3f17c006960b Author: FUJITA Tomonori Date: Fri Mar 5 13:42:26 2010 -0800 frv: remove pci_dma_sync_single() and pci_dma_sync_sg() No architecture except for frv has pci_dma_sync_single() and pci_dma_sync_sg(). The APIs are deprecated. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08259d58e4fa12ceaece82193c5816152f638cca Author: Hugh Dickins Date: Fri Mar 5 13:42:25 2010 -0800 mm: add comment on swap_duplicate's error code swap_duplicate()'s loop appears to miss out on returning the error code from __swap_duplicate(), except when that's -ENOMEM. In fact this is intentional: prior to -ENOMEM for swap_count_continuation, swap_duplicate() was void (and the case only occurs when copy_one_pte() hits a corrupt pte). But that's surprising behaviour, which certainly deserves a comment. Signed-off-by: Hugh Dickins Reported-by: Huang Shijie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c08c6e1f54c85fc299cf9f88cf330d6dd28a9a1d Author: Steven J. Magnani Date: Fri Mar 5 13:42:24 2010 -0800 nommu: get_user_pages(): pin last page on non-page-aligned start The noMMU version of get_user_pages() fails to pin the last page when the start address isn't page-aligned. The patch fixes this in a way that makes find_extend_vma() congruent to its MMU cousin. Signed-off-by: Steven J. Magnani Acked-by: Paul Mundt Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f047f4f3792344901e1ea18a180515d7d5349e02 Author: Amerigo Wang Date: Fri Mar 5 13:42:24 2010 -0800 mm: use the same log level for show_mem() Use the same log level for printk's in show_mem(), so that those messages can be shown completely when using log level 6. Signed-off-by: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 478352e789f507105193d3d0177c3b4f26da0399 Author: David Rientjes Date: Fri Mar 5 13:42:23 2010 -0800 mm: add comment about deprecation of __GFP_NOFAIL __GFP_NOFAIL was deprecated in dab48dab, so add a comment that no new users should be added. Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 645747462435d84c6c6a64269ed49cc3015f753d Author: Johannes Weiner Date: Fri Mar 5 13:42:22 2010 -0800 vmscan: detect mapped file pages used only once The VM currently assumes that an inactive, mapped and referenced file page is in use and promotes it to the active list. However, every mapped file page starts out like this and thus a problem arises when workloads create a stream of such pages that are used only for a short time. By flooding the active list with those pages, the VM quickly gets into trouble finding eligible reclaim canditates. The result is long allocation latencies and eviction of the wrong pages. This patch reuses the PG_referenced page flag (used for unmapped file pages) to implement a usage detection that scales with the speed of LRU list cycling (i.e. memory pressure). If the scanner encounters those pages, the flag is set and the page cycled again on the inactive list. Only if it returns with another page table reference it is activated. Otherwise it is reclaimed as 'not recently used cache'. This effectively changes the minimum lifetime of a used-once mapped file page from a full memory cycle to an inactive list cycle, which allows it to occur in linear streams without affecting the stable working set of the system. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31c0569c3b0b6cc8a867ac6665ca081553f7984c Author: Johannes Weiner Date: Fri Mar 5 13:42:21 2010 -0800 vmscan: drop page_mapping_inuse() page_mapping_inuse() is a historic predicate function for pages that are about to be reclaimed or deactivated. According to it, a page is in use when it is mapped into page tables OR part of swap cache OR backing an mmapped file. This function is used in combination with page_referenced(), which checks for young bits in ptes and the page descriptor itself for the PG_referenced bit. Thus, checking for unmapped swap cache pages is meaningless as PG_referenced is not set for anonymous pages and unmapped pages do not have young ptes. The test makes no difference. Protecting file pages that are not by themselves mapped but are part of a mapped file is also a historic leftover for short-lived things like the exec() code in libc. However, the VM now does reference accounting and activation of pages at unmap time and thus the special treatment on reclaim is obsolete. This patch drops page_mapping_inuse() and switches the two callsites to use page_mapped() directly. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfc8d636cdb95f7b792d5ba8c9f3b295809c125d Author: Johannes Weiner Date: Fri Mar 5 13:42:19 2010 -0800 vmscan: factor out page reference checks The used-once mapped file page detection patchset. It is meant to help workloads with large amounts of shortly used file mappings, like rtorrent hashing a file or git when dealing with loose objects (git gc on a bigger site?). Right now, the VM activates referenced mapped file pages on first encounter on the inactive list and it takes a full memory cycle to reclaim them again. When those pages dominate memory, the system no longer has a meaningful notion of 'working set' and is required to give up the active list to make reclaim progress. Obviously, this results in rather bad scanning latencies and the wrong pages being reclaimed. This patch makes the VM be more careful about activating mapped file pages in the first place. The minimum granted lifetime without another memory access becomes an inactive list cycle instead of the full memory cycle, which is more natural given the mentioned loads. This test resembles a hashing rtorrent process. Sequentially, 32MB chunks of a file are mapped into memory, hashed (sha1) and unmapped again. While this happens, every 5 seconds a process is launched and its execution time taken: python2.4 -c 'import pydoc' old: max=2.31s mean=1.26s (0.34) new: max=1.25s mean=0.32s (0.32) find /etc -type f old: max=2.52s mean=1.44s (0.43) new: max=1.92s mean=0.12s (0.17) vim -c ':quit' old: max=6.14s mean=4.03s (0.49) new: max=3.48s mean=2.41s (0.25) mplayer --help old: max=8.08s mean=5.74s (1.02) new: max=3.79s mean=1.32s (0.81) overall hash time (stdev): old: time=1192.30 (12.85) thruput=25.78mb/s (0.27) new: time=1060.27 (32.58) thruput=29.02mb/s (0.88) (-11%) I also tested kernbench with regular IO streaming in the background to see whether the delayed activation of frequently used mapped file pages had a negative impact on performance in the presence of pressure on the inactive list. The patch made no significant difference in timing, neither for kernbench nor for the streaming IO throughput. The first patch submission raised concerns about the cost of the extra faults for actually activated pages on machines that have no hardware support for young page table entries. I created an artificial worst case scenario on an ARM machine with around 300MHz and 64MB of memory to figure out the dimensions involved. The test would mmap a file of 20MB, then 1. touch all its pages to fault them in 2. force one full scan cycle on the inactive file LRU -- old: mapping pages activated -- new: mapping pages inactive 3. touch the mapping pages again -- old and new: fault exceptions to set the young bits 4. force another full scan cycle on the inactive file LRU 5. touch the mapping pages one last time -- new: fault exceptions to set the young bits The test showed an overall increase of 6% in time over 100 iterations of the above (old: ~212sec, new: ~225sec). 13 secs total overhead / (100 * 5k pages), ignoring the execution time of the test itself, makes for about 25us overhead for every page that gets actually activated. Note: 1. File mapping the size of one third of main memory, _completely_ in active use across memory pressure - i.e., most pages referenced within one LRU cycle. This should be rare to non-existant, especially on such embedded setups. 2. Many huge activation batches. Those batches only occur when the working set fluctuates. If it changes completely between every full LRU cycle, you have problematic reclaim overhead anyway. 3. Access of activated pages at maximum speed: sequential loads from every single page without doing anything in between. In reality, the extra faults will get distributed between actual operations on the data. So even if a workload manages to get the VM into the situation of activating a third of memory in one go on such a setup, it will take 2.2 seconds instead 2.1 without the patch. Comparing the numbers (and my user-experience over several months), I think this change is an overall improvement to the VM. Patch 1 is only refactoring to break up that ugly compound conditional in shrink_page_list() and make it easy to document and add new checks in a readable fashion. Patch 2 gets rid of the obsolete page_mapping_inuse(). It's not strictly related to #3, but it was in the original submission and is a net simplification, so I kept it. Patch 3 implements used-once detection of mapped file pages. This patch: Moving the big conditional into its own predicate function makes the code a bit easier to read and allows for better commenting on the checks one-by-one. This is just cleaning up, no semantics should have been changed. Signed-off-by: Johannes Weiner Reviewed-by: Rik van Riel Cc: Minchan Kim Cc: OSAKI Motohiro Cc: Lee Schermerhorn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e7c84ee22b8321fa0130a53d4c9806474d62eff0 Author: Mel Gorman Date: Fri Mar 5 13:42:16 2010 -0800 mm: document /sys/devices/system/node/nodeX Add a bare description of what /sys/devices/system/node/nodeX is. Others will follow in time but right now, none of that tree is documented. The existence of this file might at least encourage people to document new entries. Signed-off-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1b57ac061b0e348c9a878f8fa3a93a67fe6af42 Author: Mel Gorman Date: Fri Mar 5 13:42:15 2010 -0800 mm: document /proc/pagetypeinfo Add documentation for /proc/pagetypeinfo. Signed-off-by: Mel Gorman Reviewed-by: Christoph Lameter Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72f0ba0252e7177965255ed2c663be126b6b5f91 Author: David Rientjes Date: Fri Mar 5 13:42:14 2010 -0800 mm: suppress pfn range output for zones without pages free_area_init_nodes() emits pfn ranges for all zones on the system. There may be no pages on a higher zone, however, due to memory limitations or the use of the mem= kernel parameter. For example: Zone PFN ranges: DMA 0x00000001 -> 0x00001000 DMA32 0x00001000 -> 0x00100000 Normal 0x00100000 -> 0x00100000 The implementation copies the previous zone's highest pfn, if any, as the next zone's lowest pfn. If its highest pfn is then greater than the amount of addressable memory, the upper memory limit is used instead. Thus, both the lowest and highest possible pfn for higher zones without memory may be the same. The pfn range for zones without memory is now shown as "empty" instead. Signed-off-by: David Rientjes Cc: Mel Gorman Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 452aa6999e6703ffbddd7f6ea124d3968915f3e3 Author: Rafael J. Wysocki Date: Fri Mar 5 13:42:13 2010 -0800 mm/pm: force GFP_NOIO during suspend/hibernation and resume There are quite a few GFP_KERNEL memory allocations made during suspend/hibernation and resume that may cause the system to hang, because the I/O operations they depend on cannot be completed due to the underlying devices being suspended. Avoid this problem by clearing the __GFP_IO and __GFP_FS bits in gfp_allowed_mask before suspend/hibernation and restoring the original values of these bits in gfp_allowed_mask durig the subsequent resume. [akpm@linux-foundation.org: fix CONFIG_PM=n linkage] Signed-off-by: Rafael J. Wysocki Reported-by: Maxim Levitsky Cc: Sebastian Ott Cc: Benjamin Herrenschmidt Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad2bd7e0e9647cd48593a6b3a2be07dc2c2d28ed Author: Hugh Dickins Date: Fri Mar 5 13:42:12 2010 -0800 mm/swapfile.c: fix swapon size off-by-one There's an off-by-one disagreement between mkswap and swapon about the meaning of swap_header last_page: mkswap (in all versions I've looked at: util-linux-ng and BusyBox and old util-linux; probably as far back as 1999) consistently means the offset (in page units) of the last page of the swap area, whereas kernel sys_swapon (as far back as 2.2 and 2.3) strangely takes it to mean the size (in page units) of the swap area. This disagreement is the safe way round; but it's worrying people, and loses us one page of swap. The fix is not just to add one to nr_good_pages: we need to get maxpages (the size of the swap_map array) right before that; and though that is an unsigned long, be careful not to overflow the unsigned int p->max which later holds it (probably why header uses __u32 last_page instead of size). Why did we subtract one from the maximum swp_offset to calculate maxpages? Though it was probably me who made that change in 2.4.10, I don't get it: and now we should be adding one (without risk of overflow in this case). Fix the handling of swap_header badpages: it could have overrun the swap_map when very large swap area used on a more limited architecture. Remove pre-initializations of swap_header, nr_good_pages and maxpages: those date from when sys_swapon was supporting other versions of header. Reported-by: Nitin Gupta Reported-by: Jarkko Lavinen Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc148a5f7e0532750c312385c7ee9fa3e9311f34 Author: Rik van Riel Date: Fri Mar 5 13:42:10 2010 -0800 mm: remove VM_LOCK_RMAP code When a VMA is in an inconsistent state during setup or teardown, the worst that can happen is that the rmap code will not be able to find the page. The mapping is in the process of being torn down (PTEs just got invalidated by munmap), or set up (no PTEs have been instantiated yet). It is also impossible for the rmap code to follow a pointer to an already freed VMA, because the rmap code holds the anon_vma->lock, which the VMA teardown code needs to take before the VMA is removed from the anon_vma chain. Hence, we should not need the VM_LOCK_RMAP locking at all. Signed-off-by: Rik van Riel Cc: Nick Piggin Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c44b674323f4a2480dbeb65d4b487fa5f06f49e0 Author: Rik van Riel Date: Fri Mar 5 13:42:09 2010 -0800 rmap: move exclusively owned pages to own anon_vma in do_wp_page() When the parent process breaks the COW on a page, both the original which is mapped at child and the new page which is mapped parent end up in that same anon_vma. Generally this won't be a problem, but for some workloads it could preserve the O(N) rmap scanning complexity. A simple fix is to ensure that, when a page which is mapped child gets reused in do_wp_page, because we already are the exclusive owner, the page gets moved to our own exclusive child's anon_vma. Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Reviewed-by: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 033a64b56aed798991de18d226085dfb1ccd858d Author: Rik van Riel Date: Fri Mar 5 13:42:08 2010 -0800 rmap: remove obsolete check from __page_check_anon_rmap() When an anonymous page is inherited from a parent process, the vma->anon_vma can differ from the page anon_vma. This can trip up __page_check_anon_rmap, which is indirectly called from do_swap_page(). Remove that obsolete check to prevent an oops. Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Reviewed-by: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5beb49305251e5669852ed541e8e2f2f7696c53e Author: Rik van Riel Date: Fri Mar 5 13:42:07 2010 -0800 mm: change anon_vma linking to fix multi-process server scalability issue The old anon_vma code can lead to scalability issues with heavily forking workloads. Specifically, each anon_vma will be shared between the parent process and all its child processes. In a workload with 1000 child processes and a VMA with 1000 anonymous pages per process that get COWed, this leads to a system with a million anonymous pages in the same anon_vma, each of which is mapped in just one of the 1000 processes. However, the current rmap code needs to walk them all, leading to O(N) scanning complexity for each page. This can result in systems where one CPU is walking the page tables of 1000 processes in page_referenced_one, while all other CPUs are stuck on the anon_vma lock. This leads to catastrophic failure for a benchmark like AIM7, where the total number of processes can reach in the tens of thousands. Real workloads are still a factor 10 less process intensive than AIM7, but they are catching up. This patch changes the way anon_vmas and VMAs are linked, which allows us to associate multiple anon_vmas with a VMA. At fork time, each child process gets its own anon_vmas, in which its COWed pages will be instantiated. The parents' anon_vma is also linked to the VMA, because non-COWed pages could be present in any of the children. This reduces rmap scanning complexity to O(1) for the pages of the 1000 child processes, with O(N) complexity for at most 1/N pages in the system. This reduces the average scanning cost in heavily forking workloads from O(N) to 2. The only real complexity in this patch stems from the fact that linking a VMA to anon_vmas now involves memory allocations. This means vma_adjust can fail, if it needs to attach a VMA to anon_vma structures. This in turn means error handling needs to be added to the calling functions. A second source of complexity is that, because there can be multiple anon_vmas, the anon_vma linking in vma_adjust can no longer be done under "the" anon_vma lock. To prevent the rmap code from walking up an incomplete VMA, this patch introduces the VM_LOCK_RMAP VMA flag. This bit flag uses the same slot as the NOMMU VM_MAPPED_COPY, with an ifdef in mm.h to make sure it is impossible to compile a kernel that needs both symbolic values for the same bitflag. Some test results: Without the anon_vma changes, when AIM7 hits around 9.7k users (on a test box with 16GB RAM and not quite enough IO), the system ends up running >99% in system time, with every CPU on the same anon_vma lock in the pageout code. With these changes, AIM7 hits the cross-over point around 29.7k users. This happens with ~99% IO wait time, there never seems to be any spike in system time. The anon_vma lock contention appears to be resolved. [akpm@linux-foundation.org: cleanups] Signed-off-by: Rik van Riel Cc: KOSAKI Motohiro Cc: Larry Woodman Cc: Lee Schermerhorn Cc: Minchan Kim Cc: Andrea Arcangeli Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 648bcc771145172a14bc35eeb849ed08f6aa4f1e Author: Thiago Farina Date: Fri Mar 5 13:42:04 2010 -0800 mm/memcontrol.c: fix "integer as NULL pointer" sparse warning mm/memcontrol.c:2548:32: warning: Using plain integer as NULL pointer Signed-off-by: Thiago Farina Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19adf9c5d5793657118f2002237c0ee49c3b6185 Author: Andrew Morton Date: Fri Mar 5 13:42:03 2010 -0800 include/linux/fs.h: convert FMODE_* constants to hex It was tolerable until Eric went and added 8388608. Cc: Eric Paris Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0141450f66c3c12a3aaa869748caa64241885cdf Author: Wu Fengguang Date: Fri Mar 5 13:42:03 2010 -0800 readahead: introduce FMODE_RANDOM for POSIX_FADV_RANDOM This fixes inefficient page-by-page reads on POSIX_FADV_RANDOM. POSIX_FADV_RANDOM used to set ra_pages=0, which leads to poor performance: a 16K read will be carried out in 4 _sync_ 1-page reads. In other places, ra_pages==0 means - it's ramfs/tmpfs/hugetlbfs/sysfs/configfs - some IO error happened where multi-page read IO won't help or should be avoided. POSIX_FADV_RANDOM actually want a different semantics: to disable the *heuristic* readahead algorithm, and to use a dumb one which faithfully submit read IO for whatever application requests. So introduce a flag FMODE_RANDOM for POSIX_FADV_RANDOM. Note that the random hint is not likely to help random reads performance noticeably. And it may be too permissive on huge request size (its IO size is not limited by read_ahead_kb). In Quentin's report (http://lkml.org/lkml/2009/12/24/145), the overall (NFS read) performance of the application increased by 313%! Tested-by: Quentin Barnes Signed-off-by: Wu Fengguang Cc: Nick Piggin Cc: Andi Kleen Cc: Steven Whitehouse Cc: David Howells Cc: Jonathan Corbet Cc: Al Viro Cc: Christoph Hellwig Cc: Trond Myklebust Cc: Chuck Lever Cc: [2.6.33.x] Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42e49608683ab25fbbbf9c40edb944601e543882 Author: Wu Fengguang Date: Fri Mar 5 13:42:01 2010 -0800 vfs: take f_lock on modifying f_mode after open time We'll introduce FMODE_RANDOM which will be runtime modified. So protect all runtime modification to f_mode with f_lock to avoid races. Signed-off-by: Wu Fengguang Cc: Al Viro Cc: Christoph Hellwig Cc: Trond Myklebust Cc: Chuck Lever Cc: [2.6.33.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 85f1fb72fa76eabc4481dc79f42d2b011df54762 Author: KOSAKI Motohiro Date: Fri Mar 5 13:42:00 2010 -0800 mm/migrate.c: kill anon local variable from migrate_page_copy commit 01b1ae63c2 ("memcg: simple migration handling") removed mem_cgroup_uncharge_cache_page() call from migrate_page_copy. Local variable `anon' is now unused. Signed-off-by: KOSAKI Motohiro Cc: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da0aa138944311e6745a00ac3d88f03e8d9a46c4 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:59 2010 -0800 mm/mempolicy.c: fix indentation of the comments of do_migrate_pages Currently, do_migrate_pages() have very long comment and this is not indent properly. I often misunderstand it is function starting commnents and confused it. this patch fixes it. note: this patch doesn't break 80 column rule. I guess original author intended this indentaion, but an accident corrupted it. Signed-off-by: KOSAKI Motohiro Reviewed-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d96ae5309165d9ed7c008a178238977b73595cd9 Author: akpm@linux-foundation.org Date: Fri Mar 5 13:41:58 2010 -0800 memory-hotplug: create /sys/firmware/memmap entry for new memory A memmap is a directory in sysfs which includes 3 text files: start, end and type. For example: start: 0x100000 end: 0x7e7b1cff type: System RAM Interface firmware_map_add was not called explicitly. Remove it and add function firmware_map_add_hotplug as hotplug interface of memmap. Each memory entry has a memmap in sysfs, When we hot-add new memory, sysfs does not export memmap entry for it. We add a call in function add_memory to function firmware_map_add_hotplug. Add a new function add_sysfs_fw_map_entry() to create memmap entry, it will be called when initialize memmap and hot-add memory. [akpm@linux-foundation.org: un-kernedoc a no longer kerneldoc comment] Signed-off-by: Shaohui Zheng Acked-by: Andi Kleen Acked-by: Yasunori Goto Reviewed-by: Wu Fengguang Cc: Dave Hansen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9d8cebd4bcd7c3878462fdfda34bbcdeb4df7ef4 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:57 2010 -0800 mm: fix mbind vma merge problem Strangely, current mbind() doesn't merge vma with neighbor vma although it's possible. Unfortunately, many vma can reduce performance... This patch fixes it. reproduced program ---------------------------------------------------------------- #include #include #include #include #include #include #include static unsigned long pagesize; int main(int argc, char** argv) { void* addr; int ch; int node; struct bitmask *nmask = numa_allocate_nodemask(); int err; int node_set = 0; char buf[128]; while ((ch = getopt(argc, argv, "n:")) != -1){ switch (ch){ case 'n': node = strtol(optarg, NULL, 0); numa_bitmask_setbit(nmask, node); node_set = 1; break; default: ; } } argc -= optind; argv += optind; if (!node_set) numa_bitmask_setbit(nmask, 0); pagesize = getpagesize(); addr = mmap(NULL, pagesize*3, PROT_READ|PROT_WRITE, MAP_ANON|MAP_PRIVATE, 0, 0); if (addr == MAP_FAILED) perror("mmap "), exit(1); fprintf(stderr, "pid = %d \n" "addr = %p\n", getpid(), addr); /* make page populate */ memset(addr, 0, pagesize*3); /* first mbind */ err = mbind(addr+pagesize, pagesize, MPOL_BIND, nmask->maskp, nmask->size, MPOL_MF_MOVE_ALL); if (err) error("mbind1 "); /* second mbind */ err = mbind(addr, pagesize*3, MPOL_DEFAULT, NULL, 0, 0); if (err) error("mbind2 "); sprintf(buf, "cat /proc/%d/maps", getpid()); system(buf); return 0; } ---------------------------------------------------------------- result without this patch addr = 0x7fe26ef09000 [snip] 7fe26ef09000-7fe26ef0a000 rw-p 00000000 00:00 0 7fe26ef0a000-7fe26ef0b000 rw-p 00000000 00:00 0 7fe26ef0b000-7fe26ef0c000 rw-p 00000000 00:00 0 7fe26ef0c000-7fe26ef0d000 rw-p 00000000 00:00 0 => 0x7fe26ef09000-0x7fe26ef0c000 have three vmas. result with this patch addr = 0x7fc9ebc76000 [snip] 7fc9ebc76000-7fc9ebc7a000 rw-p 00000000 00:00 0 7fffbe690000-7fffbe6a5000 rw-p 00000000 00:00 0 [stack] => 0x7fc9ebc76000-0x7fc9ebc7a000 have only one vma. [minchan.kim@gmail.com: fix file offset passed to vma_merge()] Signed-off-by: KOSAKI Motohiro Reviewed-by: Christoph Lameter Cc: Nick Piggin Cc: Hugh Dickins Cc: Andrea Arcangeli Cc: Mel Gorman Cc: Lee Schermerhorn Signed-off-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93e4a89a8c987189b168a530a331ef6d0fcf07a7 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:55 2010 -0800 mm: restore zone->all_unreclaimable to independence word commit e815af95 ("change all_unreclaimable zone member to flags") changed all_unreclaimable member to bit flag. But it had an undesireble side effect. free_one_page() is one of most hot path in linux kernel and increasing atomic ops in it can reduce kernel performance a bit. Thus, this patch revert such commit partially. at least all_unreclaimable shouldn't share memory word with other zone flags. [akpm@linux-foundation.org: fix patch interaction] Signed-off-by: KOSAKI Motohiro Cc: David Rientjes Cc: Wu Fengguang Cc: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Huang Shijie Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc91668eaf9e7ba61e867fc2218b7e9fb67faa4f Author: Li Hong Date: Fri Mar 5 13:41:54 2010 -0800 mm: remove free_hot_page() free_hot_page() is just a wrapper around free_hot_cold_page() with parameter 'cold = 0'. After adding a clear comment for free_hot_cold_page(), it is reasonable to remove a level of call. [akpm@linux-foundation.org: fix build] Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Cc: Americo Wang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c475dab63ae798d81fb597a6a1859986b296d9d0 Author: Li Hong Date: Fri Mar 5 13:41:53 2010 -0800 mm/page_alloc.c: adjust a call site to trace_mm_page_free_direct Move a call of trace_mm_page_free_direct() from free_hot_page() to free_hot_cold_page(). It is clearer and close to kmemcheck_free_shadow(), as it is done in function __free_pages_ok(). Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f650316c8b80fe61a31b8b575405b37cbf170459 Author: Li Hong Date: Fri Mar 5 13:41:52 2010 -0800 mm/page_alloc.c: remove duplicate call to trace_mm_page_free_direct trace_mm_page_free_direct() is called in function __free_pages(). But it is called again in free_hot_page() if order == 0 and produce duplicate records in trace file for mm_page_free_direct event. As below: K-PID CPU# TIMESTAMP FUNCTION gnome-terminal-1567 [000] 4415.246466: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.246468: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.246506: mm_page_alloc: page=ffffea0003db9f40 pfn=1155800 order=0 migratetype=0 gfp_flags=GFP_KERNEL gnome-terminal-1567 [000] 4415.255557: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 gnome-terminal-1567 [000] 4415.255557: mm_page_free_direct: page=ffffea0003db9f40 pfn=1155800 order=0 This patch removes the first call and adds a call to trace_mm_page_free_direct() in __free_pages_ok(). Signed-off-by: Li Hong Cc: Mel Gorman Cc: Rik van Riel Cc: Ingo Molnar Cc: Larry Woodman Cc: Peter Zijlstra Cc: Li Ming Chun Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76ca542d880ebe59a7a03c1597e73e1ded271857 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:47 2010 -0800 mm, lockdep: annotate reclaim context to zone reclaim too Commit cf40bd16fd ("lockdep: annotate reclaim context") introduced reclaim context annotation. But it didn't annotate zone reclaim. This patch do it. The point is, commit cf40bd16fd annotate __alloc_pages_direct_reclaim but zone-reclaim doesn't use __alloc_pages_direct_reclaim. current call graph is __alloc_pages_nodemask get_page_from_freelist zone_reclaim() __alloc_pages_slowpath __alloc_pages_direct_reclaim try_to_free_pages Actually, if zone_reclaim_mode=1, VM never call __alloc_pages_direct_reclaim in usual VM pressure. Signed-off-by: KOSAKI Motohiro Reviewed-by: Minchan Kim Acked-by: Nick Piggin Cc: Peter Zijlstra Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84b18490d1f1bc7ed5095c929f78bc002eb70f26 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:47 2010 -0800 vmscan: get_scan_ratio() cleanup The get_scan_ratio() should have all scan-ratio related calculations. Thus, this patch move some calculation into get_scan_ratio. Signed-off-by: KOSAKI Motohiro Reviewed-by: Rik van Riel Reviewed-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45973d74fd3b1e3e16c025b688a725c7653b1443 Author: Minchan Kim Date: Fri Mar 5 13:41:45 2010 -0800 vmscan: check high watermark after shrink zone Kswapd checks that zone has sufficient pages free via zone_watermark_ok(). If any zone doesn't have enough pages, we set all_zones_ok to zero. !all_zone_ok makes kswapd retry rather than sleeping. I think the watermark check before shrink_zone() is pointless. Only after kswapd has tried to shrink the zone is the check meaningful. Move the check to after the call to shrink_zone(). [akpm@linux-foundation.org: fix comment, layout] Signed-off-by: Minchan Kim Reviewed-by: KOSAKI Motohiro Cc: Mel Gorman Cc: Rik van Riel Reviewed-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59e99e5b9706867f18d4a36c1e4645fbaacbec2e Author: Jiri Slaby Date: Fri Mar 5 13:41:44 2010 -0800 mm: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06f9d8c2b50060543fb6e0af87ddb86e654dee6b Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:43 2010 -0800 mm: mlock_vma_pages_range() only return success or failure Currently, mlock_vma_pages_range() only return len or 0. then current error handling of mmap_region() is meaningless complex. This patch makes simplify and makes consist with brk() code. Signed-off-by: KOSAKI Motohiro Cc: Nick Piggin Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c58267c32429ea6535428ca6b8a036892c1697f2 Author: KOSAKI Motohiro Date: Fri Mar 5 13:41:43 2010 -0800 mm: mlock_vma_pages_range() never return negative value Currently, mlock_vma_pages_range() never return negative value. Then, we can remove some worthless error check. Signed-off-by: KOSAKI Motohiro Cc: Nick Piggin Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KAMEZAWA Hiroyuki Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b084d4353ff99d824d3bc5a5c2c22c70b1fba722 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:42 2010 -0800 mm: count swap usage A frequent questions from users about memory management is what numbers of swap ents are user for processes. And this information will give some hints to oom-killer. Besides we can count the number of swapents per a process by scanning /proc//smaps, this is very slow and not good for usual process information handler which works like 'ps' or 'top'. (ps or top is now enough slow..) This patch adds a counter of swapents to mm_counter and update is at each swap events. Information is exported via /proc//status file as [kamezawa@bluextal memory]$ cat /proc/self/status Name: cat State: R (running) Tgid: 2910 Pid: 2910 PPid: 2823 TracerPid: 0 Uid: 500 500 500 500 Gid: 500 500 500 500 FDSize: 256 Groups: 500 VmPeak: 82696 kB VmSize: 82696 kB VmLck: 0 kB VmHWM: 432 kB VmRSS: 432 kB VmData: 172 kB VmStk: 84 kB VmExe: 48 kB VmLib: 1568 kB VmPTE: 40 kB VmSwap: 0 kB <=============== this. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Reviewed-by: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 34e55232e59f7b19050267a05ff1226e5cd122a5 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:40 2010 -0800 mm: avoid false sharing of mm_counter Considering the nature of per mm stats, it's the shared object among threads and can be a cache-miss point in the page fault path. This patch adds per-thread cache for mm_counter. RSS value will be counted into a struct in task_struct and synchronized with mm's one at events. Now, in this patch, the event is the number of calls to handle_mm_fault. Per-thread value is added to mm at each 64 calls. rough estimation with small benchmark on parallel thread (2threads) shows [before] 4.5 cache-miss/faults [after] 4.0 cache-miss/faults Anyway, the most contended object is mmap_sem if the number of threads grows. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: KAMEZAWA Hiroyuki Cc: Minchan Kim Cc: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d559db086ff5be9bcc259e5aa50bf3d881eaf1d1 Author: KAMEZAWA Hiroyuki Date: Fri Mar 5 13:41:39 2010 -0800 mm: clean up mm_counter Presently, per-mm statistics counter is defined by macro in sched.h This patch modifies it to - defined in mm.h as inlinf functions - use array instead of macro's name creation. This patch is for reducing patch size in future patch to modify implementation of per-mm counter. Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Minchan Kim Cc: Christoph Lameter Cc: Lee Schermerhorn Cc: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 19b629f581320999ddb9f6597051b79cdb53459c Author: Akinobu Mita Date: Fri Mar 5 13:41:38 2010 -0800 infiniband: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Acked-by: Roland Dreier Cc: Sean Hefty Cc: Hal Rosenstock Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 984b3f5746ed2cde3d184651dabf26980f2b66e5 Author: Akinobu Mita Date: Fri Mar 5 13:41:37 2010 -0800 bitops: rename for_each_bit() to for_each_set_bit() Rename for_each_bit to for_each_set_bit in the kernel source tree. To permit for_each_clear_bit(), should that ever be added. The patch includes a macro to map the old for_each_bit() onto the new for_each_set_bit(). This is a (very) temporary thing to ease the migration. [akpm@linux-foundation.org: add temporary for_each_bit()] Suggested-by: Alexey Dobriyan Suggested-by: Andrew Morton Signed-off-by: Akinobu Mita Cc: "David S. Miller" Cc: Russell King Cc: David Woodhouse Cc: Artem Bityutskiy Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3cb91ce1ac1d93a7cc6f81bb5247f7602b572bb Author: David Miller Date: Fri Mar 5 13:41:36 2010 -0800 timbgpio: fix build Use of get_irq_chip_data() et al. requires including linux/irq.h Signed-off-by: David S. Miller Cc: Richard Röjfors Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 781b16775ba0bb55fac0e1757bf0bd87c8879632 Author: Al Viro Date: Sat Mar 6 18:41:07 2010 +0000 Fix a dumb typo - use of & instead of && We managed to lose O_DIRECTORY testing due to a stupid typo in commit 1f36f774b2 ("Switch !O_CREAT case to use of do_last()") Reported-by: Walter Sheets Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c2f843f03d658e9ab2a1a455f2c1851fd6a869af Author: Joern Engel Date: Sat Mar 6 10:03:11 2010 +0100 [LogFS] Change magic number Many changes were made during development that could result in old versions of mklogfs and the kernel code being subtly incompatible. Not being a friend of subtleties, I hereby change the magic number. Any old version of mklogfs is now guaranteed to fail. commit 9cf05b416d3324457f1dd8be35f4eaa7a9640bed Author: Joern Engel Date: Sat Mar 6 10:01:46 2010 +0100 [LogFS] Remove h_version field Incompatible change: h_compr is moved up so the padding is all in one chunk. commit f070304094edb8d516423e79edd27c97ec2020b0 Author: Takahiro Yasui Date: Sat Mar 6 02:32:35 2010 +0000 dm raid1: fix deadlock when suspending failed device To prevent deadlock, bios in the hold list should be flushed before dm_rh_stop_recovery() is called in mirror_suspend(). The recovery can't start because there are pending bios and therefore dm_rh_stop_recovery deadlocks. When there are pending bios in the hold list, the recovery waits for the completion of the bios after recovery_count is acquired. The recovery_count is released when the recovery finished, however, the bios in the hold list are processed after dm_rh_stop_recovery() in mirror_presuspend(). dm_rh_stop_recovery() also acquires recovery_count, then deadlock occurs. Signed-off-by: Takahiro Yasui Signed-off-by: Alasdair G Kergon Reviewed-by: Mikulas Patocka commit 924e600d417ead9ef67043988055ba236f114718 Author: Mike Snitzer Date: Sat Mar 6 02:32:33 2010 +0000 dm: eliminate some holes data structures Eliminate a 4-byte hole in 'struct dm_io_memory' by moving 'offset' above the 'ptr' to which it applies (size reduced from 24 to 16 bytes). And by association, 1-4 byte hole is eliminated in 'struct dm_io_request' (size reduced from 56 to 48 bytes). Eliminate all 6 4-byte holes and 1 cache-line in 'struct dm_snapshot' (size reduced from 392 to 368 bytes). Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit 3abf85b5b5851b5f28d3d8a920ebb844edd08352 Author: Peter Rajnoha Date: Sat Mar 6 02:32:31 2010 +0000 dm ioctl: introduce flag indicating uevent was generated Set a new DM_UEVENT_GENERATED_FLAG when returning from ioctls to indicate that a uevent was actually generated. This tells the userspace caller that it may need to wait for the event to be processed. Signed-off-by: Peter Rajnoha Signed-off-by: Alasdair G Kergon commit a97f925a32aad2a37971d7bfb657006acf04e42d Author: Mikulas Patocka Date: Sat Mar 6 02:32:29 2010 +0000 dm: free dm_io before bio_endio not after Free the dm_io structure before calling bio_endio() instead of after it, to ensure that the io_pool containing it is not referenced after it is freed. This partially fixes a problem described here https://www.redhat.com/archives/dm-devel/2010-February/msg00109.html thread 1: bio_endio(bio, io_error); /* scheduling happens */ thread 2: close the device remove the device thread 1: free_io(md, io); Thread 2, when removing the device, sees non-empty md->io_pool (because the io hasn't been freed by thread 1 yet) and may crash with BUG in mempool_free. Thread 1 may also crash, when freeing into a nonexisting mempool. To fix this we must make sure that bio_endio() is the last call and the md structure is not accessed afterwards. There is another bio_endio in process_barrier, but it is called from the thread and the thread is destroyed prior to freeing the mempools, so this call is not affected by the bug. A similar bug exists with module unloads - the module may be unloaded immediately after bio_endio - but that is more difficult to fix. Signed-off-by: Mikulas Patocka Cc: stable@kernel.org Signed-off-by: Alasdair G Kergon commit 8215d6ec5fee1e76545decea2cd73717efb5cb42 Author: Nikanth Karthikesan Date: Sat Mar 6 02:32:27 2010 +0000 dm table: remove unused dm_get_device range parameters Remove unused parameters(start and len) of dm_get_device() and fix the callers. Signed-off-by: Nikanth Karthikesan Signed-off-by: Alasdair G Kergon commit 0f3649a9e305ea22eb196a84a2d7520afcaa6060 Author: Mike Snitzer Date: Sat Mar 6 02:32:24 2010 +0000 dm ioctl: only issue uevent on resume if state changed Only issue a uevent on a resume if the state of the device changed, i.e. if it was suspended and/or its table was replaced. Signed-off-by: Dave Wysochanski Signed-off-by: Mike Snitzer Cc: stable@kernel.org Signed-off-by: Alasdair G Kergon commit ede5ea0b8b815560dc54c712536fdf0b456b6ad0 Author: Mikulas Patocka Date: Sat Mar 6 02:32:22 2010 +0000 dm raid1: always return error if all legs fail If all mirror legs fail, always return an error instead of holding the bio, even if the handle_errors option was set. At present it is the responsibility of the driver underneath us to deal with retries, multipath etc. The patch adds the bio to the failures list instead of holding it directly. do_failures tests first if all legs failed and, if so, returns the bio with -EIO. If any leg is still alive and handle_errors is set, do_failures calls hold_bio. Reviewed-by: Takahiro Yasui Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit fb61264297ca42a2a132f0433f75ccf7fd304ac6 Author: Kiyoshi Ueda Date: Sat Mar 6 02:32:18 2010 +0000 dm mpath: refactor pg_init This patch pulls the pg_init path activation code out of process_queued_ios() into a new function. No functional change. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit 2bded7bd7e8b12a913b0b58167a48220560e1514 Author: Kiyoshi Ueda Date: Sat Mar 6 02:32:13 2010 +0000 dm mpath: wait for pg_init completion when suspending When suspending the device we must wait for all I/O to complete, but pg-init may be still in progress even after flushing the workqueue for kmpath_handlerd in multipath_postsuspend. This patch waits for pg-init completion correctly in multipath_postsuspend(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit d0259bf0eefc503d3c9c9ccda35033c3dd3aac30 Author: Kiyoshi Ueda Date: Sat Mar 6 02:30:02 2010 +0000 dm mpath: hold io until all pg_inits completed m->queue_io is set to block processing I/Os, and it needs to be kept while pg-init, which issues multiple path activations, is in progress. But m->queue is cleared when a path activation completes without error in pg_init_done(), even while other path activations are in progress. That may cause undesired -EIO on paths which are not complete activation. This patch fixes that by not clearing m->queue_io until all path activations complete. (Before the hardware handlers were moved into the SCSI layer, pg_init only used one path.) Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit fce323dd68e13354071538c765b062859e6f8286 Author: Kiyoshi Ueda Date: Sat Mar 6 02:29:59 2010 +0000 dm mpath: avoid storing private suspended state 'suspended' flag in struct multipath was introduced to check whether the multipath target is in suspended state, but the same check is done through dm_suspended() now, so remove the flag and related code. Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Cc: Mike Anderson Signed-off-by: Alasdair G Kergon commit c53a381efbe3d0e0629121b3f0d2b62a0e167791 Author: Mike Snitzer Date: Sat Mar 6 02:29:56 2010 +0000 dm: document when snapshot has finished merging Update Documentation/device-mapper/snapshot.txt to cover "How to determine when a snapshot has finished merging". Signed-off-by: Mike Snitzer Signed-off-by: Alasdair G Kergon commit ecdb2e257abc33ae6798d3ccba87bdafa40ef6b6 Author: Kiyoshi Ueda Date: Sat Mar 6 02:29:52 2010 +0000 dm table: remove dm_get from dm_table_get_md Remove the dm_get() in dm_table_get_md() because dm_table_get_md() could be called from presuspend/postsuspend, which are called while mapped_device is in DMF_FREEING state, where dm_get() is not allowed. Justification for that is the lifetime of both objects: As far as the current dm design/implementation, mapped_device is never freed while targets are doing something, because dm core waits for targets to become quiet in dm_put() using presuspend/postsuspend. So targets should be able to touch mapped_device without holding reference count of the mapped_device, and we should allow targets to touch mapped_device even if it is in DMF_FREEING state. Backgrounds: I'm trying to remove the multipath internal queue, since dm core now has a generic queue for request-based dm. In the patch-set, the multipath target wants to request dm core to start/stop queue. One of such start/stop requests can happen during postsuspend() while the target waits for pg-init to complete, because the target stops queue when starting pg-init and tries to restart it when completing pg-init. Since queue belongs to mapped_device, it involves calling dm_table_get_md() and dm_put(). On the other hand, postsuspend() is called in dm_put() for mapped_device which is in DMF_FREEING state, and that triggers BUG_ON(DMF_FREEING) in the 2nd dm_put(). I had tried to solve this problem by changing only multipath not to touch mapped_device which is in DMF_FREEING state, but I couldn't and I came up with a question why we need dm_get() in dm_table_get_md(). Signed-off-by: Kiyoshi Ueda Signed-off-by: Jun'ichi Nomura Signed-off-by: Alasdair G Kergon commit f7b934c8127deebf4eb56fbe4a4ae0da16b6dbcd Author: Moger, Babu Date: Sat Mar 6 02:29:49 2010 +0000 dm mpath: skip activate_path for failed paths This patch adds two minor fixes while processing device mapper path activation. Skip failed paths while calling activate_path. If the path is already failed then activate_path will fail for sure. We don't have to call in that case. In some case this might cause prolonged retries unnecessarily. Change the misleading message if the path being activated fails with SCSI_DH_NOSYS. Signed-off-by: Babu Moger Signed-off-by: Alasdair G Kergon commit 83c0d5d5388a8d45f7a45e0ec34adc52a78c81ad Author: Moger, Babu Date: Sat Mar 6 02:29:45 2010 +0000 dm mpath: pass struct pgpath to pg init done This patch removes some unnecessary argument casting. There is no functional change with this patch. Passes 'struct pgpath' through to pg_init_done() instead of the enclosed 'struct dm_path'. Tested the changes with LSI storage.. CC: Chandra Seetharaman Signed-off-by: Babu Moger Acked-by: Kiyoshi Ueda Signed-off-by: Alasdair G Kergon commit 64096c17417380d8a472d096645f4cbc9406c987 Merge: cc7889f 1154fab Author: Linus Torvalds Date: Fri Mar 5 14:35:40 2010 -0800 Merge branch 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 * 'slab-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: SLUB: Fix per-cpu merge conflict failslab: add ability to filter slab caches slab: fix regression in touched logic dma kmalloc handling fixes slub: remove impossible condition slab: initialize unused alien cache entry as NULL at alloc_alien_cache(). SLUB: Make slub statistics use this_cpu_inc SLUB: this_cpu: Remove slub kmem_cache fields SLUB: Get rid of dynamic DMA kmalloc cache allocation SLUB: Use this_cpu operations in slub commit cc7889ff5ee7a1c1a2b5073c53db5ad9b76f14e2 Merge: b13d3c6 3fa04ec Author: Linus Torvalds Date: Fri Mar 5 13:25:45 2010 -0800 Merge branch 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'nfs-for-2.6.34' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: (44 commits) NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping NFS: Clean up nfs_sync_mapping NFS: Simplify nfs_wb_page() NFS: Replace __nfs_write_mapping with sync_inode() NFS: Simplify nfs_wb_page_cancel() NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set NFS: Reduce the number of unnecessary COMMIT calls NFS: Add a count of the number of unstable writes carried by an inode NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c nfs41 fix NFS4ERR_CLID_INUSE for exchange id NFS: Fix an allocation-under-spinlock bug SUNRPC: Handle EINVAL error returns from the TCP connect operation NFSv4.1: Various fixes to the sequence flag error handling nfs4: renewd renew operations should take/put a client reference nfs41: renewd sequence operations should take/put client reference nfs: prevent backlogging of renewd requests nfs: kill renewd before clearing client minor version NFS: Make close(2) asynchronous when closing NFS O_DIRECT files NFS: Improve NFS iostat byte count accuracy for writes ... commit b13d3c6e8ab6ac53e8c1858a9c837cb6ba3bbef0 Merge: e213e26 5717144 Author: Linus Torvalds Date: Fri Mar 5 13:25:24 2010 -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: Add hardlink support to .u extension 9P2010.L handshake: .L protocol negotiation 9P2010.L handshake: Remove "dotu" variable 9P2010.L handshake: Add mount option 9P2010.L handshake: Add VFS flags net/9p: Handle mount errors correctly. net/9p: Remove MAX_9P_CHAN limit net/9p: Add multi channel support. commit e213e26ab3988c516c06eba4dcd030ac052f6dc9 Merge: c812a51 efd8f0e Author: Linus Torvalds Date: Fri Mar 5 13:20:53 2010 -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: (33 commits) quota: stop using QUOTA_OK / NO_QUOTA dquot: cleanup dquot initialize routine dquot: move dquot initialization responsibility into the filesystem dquot: cleanup dquot drop routine dquot: move dquot drop responsibility into the filesystem dquot: cleanup dquot transfer routine dquot: move dquot transfer responsibility into the filesystem dquot: cleanup inode allocation / freeing routines dquot: cleanup space allocation / freeing routines ext3: add writepage sanity checks ext3: Truncate allocated blocks if direct IO write fails to update i_size quota: Properly invalidate caches even for filesystems with blocksize < pagesize quota: generalize quota transfer interface quota: sb_quota state flags cleanup jbd: Delay discarding buffers in journal_unmap_buffer ext3: quota_write cross block boundary behaviour quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota quota: split out compat_sys_quotactl support from quota.c quota: split out netlink notification support from quota.c quota: remove invalid optimization from quota_sync_all ... Fixed trivial conflicts in fs/namei.c and fs/ufs/inode.c commit a0a5e3488a51c46f383c5faa86b53828e30ce153 Author: Amerigo Wang Date: Fri Mar 5 22:17:26 2010 +0100 hwmon: Remove the deprecated adt7473 driver adt7473 driver is obsoleted by adt7475 driver. And it is scheduled to be removed in Feb 2010. Signed-off-by: WANG Cong Signed-off-by: Jean Delvare commit dc71afe5ac7e8d049bb991330518e4c898a7d92e Author: Jean Delvare Date: Fri Mar 5 22:17:26 2010 +0100 hwmon: Fix off-by-one kind values Recent changes on the I2C front have left off-by-one array indexes in 3 hwmon drivers. Fix them. Faulty commit: e5e9f44c2 i2c: Drop I2C_CLIENT_INSMOD_2 to 8 Reported-by: Dan Carpenter Signed-off-by: Jean Delvare Cc: Hans de Goede Cc: Andre Prendel Cc: stable@kernel.org commit a44908d742a577fb5ccb9a8c082326d4cea234c2 Author: Jean Delvare Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: (tmp421) Fix temperature conversions The low bits of temperature registers are status bits, they must be masked out before converting the register values to temperatures. Signed-off-by: Jean Delvare Tested-by: Andre Prendel Cc: stable@kernel.org commit 8d59582a867470a3e0c3eced4a01625ae8dc546b Author: Jean Delvare Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: (tmp421) Restore missing inputs An off-by-one error caused some inputs to not be created by the driver when they should. TMP421 gets only one input instead of two, TMP422 gets two instead of three, etc. Fix the bug by listing explicitly the number of inputs each device has. Signed-off-by: Jean Delvare Tested-by: Andre Prendel Cc: stable@kernel.org commit d58de038728221f780e11d50b32aa40d420c1150 Author: George Joseph Date: Fri Mar 5 22:17:25 2010 +0100 hwmon: Driver for Andigilog aSC7621 family monitoring chips Hwmon driver for Andigilog aSC7621 family monitoring chips. Signed-off-by: George Joseph Acked-by: Hans de Goede Signed-off-by: Jean Delvare commit 232449850229deeda84194e8a3c93a49ab6a043e Author: Wolfram Sang Date: Fri Mar 5 22:17:23 2010 +0100 hwmon: (adt7411) Improve locking Add proper locking for the cached variables. Also get rid of ref_is_vdd, which became obsolete. Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit d84ca5b345c2b77ebf053d534ada6af2332a43b6 Author: Wolfram Sang Date: Fri Mar 5 22:17:23 2010 +0100 hwmon: Add driver for ADT7411 voltage and temperature sensor Add basic support for the ADT7411. Reads out all conversion results (via I2C, SPI yet missing) and allows some on-the-fly configuration. Tested with a custom board. Signed-off-by: Sascha Hauer Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 5852f9609d21794c45964129b03365883150a6d0 Author: Sven Anders Date: Fri Mar 5 22:17:22 2010 +0100 hwmon: (w83793) Add watchdog functionality Add watchdog functionality to the Winbond W83793 driver. Signed-off-by: Sven Anders Acked-by: Hans de Goede Signed-off-by: Jean Delvare commit ebec05bdc4f7d3da852aa86fb54b163d9aeb9848 Author: Jean Delvare Date: Fri Mar 5 22:17:22 2010 +0100 hwmon: (g760a) Make rpm_from_cnt static Function rpm_from_cnt is only used internally so it can be made static. Make it inline while we're here, for performance reasons (although hopefully gcc would figure out by itself...) Signed-off-by: Jean Delvare Cc: Herbert Valerio Riedel Acked-by: Martin Michlmayr commit cccfc9c4bb3c7888f8249b36e08d6e115238c613 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Validate auto pwm settings Before switching to automatic fan control mode, make sure that all the trip points make sense. Otherwise, the control loop could lead to weird fan behavior. Signed-off-by: Jean Delvare commit 4f3f51bc21d434f8d91a79438a1957ec0baa9e30 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Add support for old automatic fan speed control Add support for the automatic fan speed control interface as implemented by IT8705F chips up to revision F and IT8712F chips up to revision G. This implementation fits very well in our standard sysfs interface. I implemented the old and not the new interface because the only chip I have at hand is an old one, and the new interface is more difficult to map to the standard sysfs interface. Adding support later should be possible though, if someone with a supported chip is interested. Signed-off-by: Jean Delvare commit 404a552d8ae6847ae17f3c749bd5d312da08efe4 Author: Jean Delvare Date: Fri Mar 5 22:17:21 2010 +0100 hwmon: (it87) Drop dead web links in documentation Unfortunately ITE is no longer publicly providing datasheets for their IT87xxF series of chips. They may send them on request if you ask politely. Signed-off-by: Jean Delvare commit d624870ffe6e13df94671be9a0e0e2fb001f1bef Author: Jean Delvare Date: Fri Mar 5 22:17:20 2010 +0100 hwmon: (it87) Add an entry in MAINTAINERS As I've just done a lot of changes to the it87 driver, I volunteer to maintain it for the year to come. Signed-off-by: Jean Delvare commit f5f64501e430784251b23625850ce6d690800acf Author: Jean Delvare Date: Fri Mar 5 22:17:19 2010 +0100 hwmon: (it87) Use strict_strtol instead of simple_strtol For consistency and robustness, use strict_strtol instead of simple_strtol. Signed-off-by: Jean Delvare commit 5f2dc798cadd144659cc9f5b6fc2a0a12c6dbdb0 Author: Jean Delvare Date: Fri Mar 5 22:17:18 2010 +0100 hwmon: (it87) Fix many checkpatch errors and warnings Fix 20 errors and 11 warnings reported by the checkpatch script. The remainining errors would require more work. The remaining warnings will be addressed later. Signed-off-by: Jean Delvare commit d9b327c310030fa80abbbc9eaaca9f1a6228dbf3 Author: Jean Delvare Date: Fri Mar 5 22:17:17 2010 +0100 hwmon: (it87) Add support for beep on alarm The IT87xxF chips support beeping on alarm, if properly wired and configured. There is one control bit for each input type (temperature, fan, voltage.) Let the user see and change them. Signed-off-by: Jean Delvare commit 6a8d7acfbef8ac6bf34421eae980f903cbe36874 Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Create vid attributes by group Only VID-related attributes are left in it87_attributes_opt, so we might as well rename it to it87_attributes_vid and use this group to create all attributes at once. Signed-off-by: Jean Delvare commit 723a0aa0a10f111d7e9e0977d51ac996bf8edbbf Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Refactor attributes creation and removal There is a lot of code redundancy in the creation of the fan and pwm attributes. Move these attributes to arrays so that the code can be simplified. This in turns makes the attributes removal code larger, so move it to a separate function that can be called in both the standard removal case and the error path during probing. Signed-off-by: Jean Delvare commit 94ac7ee616809d1c919f222037330eca211da9e4 Author: Jean Delvare Date: Fri Mar 5 22:17:16 2010 +0100 hwmon: (it87) Expose the PWM/temperature mappings Let the user read the PWM-to-temperature mappings. Until the trip points are also exposed, this is essentially a way to know how the BIOS has set things up. The ability to change the settings will be added later, together with the trip points. Signed-off-by: Jean Delvare commit b99883dcd565e30299a6c5c3250725a4d48a8253 Author: Jean Delvare Date: Fri Mar 5 22:17:15 2010 +0100 hwmon: (it87) Display fan outputs in automatic mode as such The it87 driver doesn't yet support automatic fan control. Let it at least tell the user when a fan output is in automatic mode. Also let the user switch from automatic mode (possibly set by the BIOS) to manual mode and back without losing the settings. Signed-off-by: Jean Delvare commit 53de33427fa3d7dd62cc5ec75ce0d4e6c6d602dd Author: Jean Delvare Date: Fri Mar 5 22:17:15 2010 +0100 hwmon: (lm90) Add SMBus alert support Tested successfully with an ADM1032 chip on its evaluation board. It should work fine with all other chips as well. At this point this is more of a proof-of-concept, we don't do anything terribly useful on SMBus alert: we simply log the event. But this could later evolve into libsensors signaling so that user-space applications can take an appropriate action. Signed-off-by: Jean Delvare Cc: David Brownell Cc: Trent Piepho commit 95238364167edaf93ce2890e5f55326b63194851 Author: Jean Delvare Date: Fri Mar 5 22:17:14 2010 +0100 hwmon: (lm90) Restore configuration on exit Restore the chip configuration when unloading the driver. This ensures we don't leave the chip running if it was initially stopped. Signed-off-by: Jean Delvare commit 6771ea1fff988651593f78c122bc02e80f5100a0 Author: Jean Delvare Date: Fri Mar 5 22:17:13 2010 +0100 hwmon: (lm90) Add support for the Winbond/Nuvoton W83L771AWG/ASG This chips is found on several Zotac Ion ITX boards, amongst others. Signed-off-by: Jean Delvare Cc: MC Matti Cc: Manuel Lamotte-Schubert commit c812a51d11bbe983f4c24e32b59b265705ddd3c2 Merge: 9467c4f d2be165 Author: Linus Torvalds Date: Fri Mar 5 13:12:34 2010 -0800 Merge branch 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (145 commits) KVM: x86: Add KVM_CAP_X86_ROBUST_SINGLESTEP KVM: VMX: Update instruction length on intercepted BP KVM: Fix emulate_sys[call, enter, exit]()'s fault handling KVM: Fix segment descriptor loading KVM: Fix load_guest_segment_descriptor() to inject page fault KVM: x86 emulator: Forbid modifying CS segment register by mov instruction KVM: Convert kvm->requests_lock to raw_spinlock_t KVM: Convert i8254/i8259 locks to raw_spinlocks KVM: x86 emulator: disallow opcode 82 in 64-bit mode KVM: x86 emulator: code style cleanup KVM: Plan obsolescence of kernel allocated slots, paravirt mmu KVM: x86 emulator: Add LOCK prefix validity checking KVM: x86 emulator: Check CPL level during privilege instruction emulation KVM: x86 emulator: Fix popf emulation KVM: x86 emulator: Check IOPL level during io instruction emulation KVM: x86 emulator: fix memory access during x86 emulation KVM: x86 emulator: Add Virtual-8086 mode of emulation KVM: x86 emulator: Add group9 instruction decoding KVM: x86 emulator: Add group8 instruction decoding KVM: do not store wqh in irqfd ... Trivial conflicts in Documentation/feature-removal-schedule.txt commit 5717144a01d701614cfdb15f09ed562d720cf3db Author: Aneesh Kumar K.V Date: Fri Mar 5 14:43:43 2010 -0600 fs/9p: Add hardlink support to .u extension For regular file and directories we put the link count in th extension field in a tagged string format. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit c5a7697da9775f7a0e122fa23180becc311772d1 Author: Sripathi Kodi Date: Fri Mar 5 18:51:04 2010 +0000 9P2010.L handshake: .L protocol negotiation This patch adds 9P2010.L protocol negotiation with the server Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 342fee1d5c7dfa05f4e14ec1e583df4553b09776 Author: Sripathi Kodi Date: Fri Mar 5 18:50:14 2010 +0000 9P2010.L handshake: Remove "dotu" variable Removes 'dotu' variable and make everything dependent on 'proto_version' field. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 0fb80abd911a7cb1e6548b5279568dc1e8949702 Author: Sripathi Kodi Date: Fri Mar 5 18:49:11 2010 +0000 9P2010.L handshake: Add mount option Add new mount V9FS mount option to specify protocol version This patch adds a new mount option to specify protocol version. With this option it is possible to use "-o version=" switch to specify 9P protocol version to use. Valid options for version are: 9p2000 9p2000.u 9p2010.L Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit dd6102fbd917889384d89bc427e98e85e8fda000 Author: Sripathi Kodi Date: Fri Mar 5 18:48:00 2010 +0000 9P2010.L handshake: Add VFS flags Add 9P2000.u and 9P2010.L protocol flags to V9FS VFS This patch adds 9P2000.u and 9P2010.L protocol flags into V9FS VFS side code and removes the single flag used for 'extended'. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit c1a7c2262035e83a8f70ebe1328b3451702cf51b Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:02 2010 +0000 net/9p: Handle mount errors correctly. With this patch we have # mount -t 9p -o trans=virtio virtio2 /mnt/ # mount -t 9p -o trans=virtio virtio2 /mnt/ mount: virtio2 already mounted or /mnt/ busy mount: according to mtab, virtio2 is already mounted on /mnt # mount -t 9p -o trans=virtio virtio3 /mnt/ -o debug=0xfff mount: special device virtio3 does not exist Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 37c1209d413242d9560e343c040777049a8dd869 Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:01 2010 +0000 net/9p: Remove MAX_9P_CHAN limit Use a list to track the channel instead of statically allocated array Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit f75580c4afb72c156746b3fc1ec977b1a85d3dee Author: Aneesh Kumar K.V Date: Mon Feb 15 17:27:00 2010 +0000 net/9p: Add multi channel support. This is needed for supporting multiple mount points. We can find out the device names to be used with mount by checking /sys/devices/virtio-pci/virtio*/device file if the device file have value 9 then the specific virtio device can be used for mounting. ex: #cat /sys/devices/virtio-pci/virtio1/device 9 now we can mount using # mount -t 9p -o trans=virtio virtio1 /mnt/ Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 3fa04ecd72780da31ba8b329e148179bc24a9c7d Merge: 180b62a 1cda707 Author: Trond Myklebust Date: Fri Mar 5 15:46:18 2010 -0500 Merge branch 'writeback-for-2.6.34' into nfs-for-2.6.34 commit 1cda707d52e51a6cafac0aef12d2bd7052d572e6 Author: Trond Myklebust Date: Fri Feb 19 17:03:30 2010 -0800 NFS: Remove requirement for inode->i_mutex from nfs_invalidate_mapping Signed-off-by: Trond Myklebust commit 5cf95214ccb915591e2214f81de4659302d3e452 Author: Trond Myklebust Date: Fri Feb 19 17:03:29 2010 -0800 NFS: Clean up nfs_sync_mapping Remove the redundant call to filemap_write_and_wait(). Signed-off-by: Trond Myklebust commit 7f2f12d963e7c33a93bfb0b22f0178eb1e6a4196 Author: Trond Myklebust Date: Fri Feb 19 17:03:28 2010 -0800 NFS: Simplify nfs_wb_page() Signed-off-by: Trond Myklebust commit acdc53b2146c7ee67feb1f02f7bc3020126514b8 Author: Trond Myklebust Date: Fri Feb 19 17:03:26 2010 -0800 NFS: Replace __nfs_write_mapping with sync_inode() Now that we have correct COMMIT semantics in writeback_single_inode, we can reduce and simplify nfs_wb_all(). Also replace nfs_wb_nocommit() with a call to filemap_write_and_wait(), which doesn't need to hold the inode->i_mutex. With that done, we can eliminate nfs_write_mapping() altogether. Signed-off-by: Trond Myklebust commit c988950eb6dd6f8e6d98503ca094622729e9aa13 Author: Trond Myklebust Date: Fri Feb 19 17:03:21 2010 -0800 NFS: Simplify nfs_wb_page_cancel() In all cases we should be able to just remove the request and call cancel_dirty_page(). Signed-off-by: Trond Myklebust commit 2928db1ffeacc9717c2d5c230d450bcc377b3ae9 Author: Trond Myklebust Date: Fri Feb 19 17:03:18 2010 -0800 NFS: Ensure inode is always marked I_DIRTY_DATASYNC, if it has unstable pages Since nfs_scan_list() doesn't wait for locked pages, we have a race in which it is possible to end up with an inode that needs to send a COMMIT, but which does not have the I_DIRTY_DATASYNC flag set. Signed-off-by: Trond Myklebust commit 5bad5abec4058c5214bfc72cec418348d6747977 Author: Trond Myklebust Date: Fri Feb 19 17:02:24 2010 -0800 NFS: Run COMMIT as an asynchronous RPC call when wbc->for_background is set Signed-off-by: Trond Myklebust Acked-by: Peter Zijlstra Acked-by: Wu Fengguang commit 420e3646bb7d93a571734034249fbb1ae1a7a5c7 Author: Trond Myklebust Date: Fri Feb 19 17:00:02 2010 -0800 NFS: Reduce the number of unnecessary COMMIT calls If the caller is doing a non-blocking flush, and there are still writebacks pending on the wire, we can usually defer the COMMIT call until those writes are done. Also ensure that we honour the wbc->nonblocking flag. Signed-off-by: Trond Myklebust commit ff778d02bf867e1733a09b34ad6dbb723b024814 Author: Trond Myklebust Date: Fri Feb 19 16:53:39 2010 -0800 NFS: Add a count of the number of unstable writes carried by an inode In order to know when we should do opportunistic commits of the unstable writes, when the VM is doing a background flush, we add a field to count the number of unstable writes. Signed-off-by: Trond Myklebust commit 8fc795f703c5138e1a8bfb88c69f52632031aa6a Author: Trond Myklebust Date: Fri Feb 19 16:46:56 2010 -0800 NFS: Cleanup - move nfs_write_inode() into fs/nfs/write.c The sole purpose of nfs_write_inode is to commit unstable writes, so move it into fs/nfs/write.c, and make nfs_commit_inode static. Signed-off-by: Trond Myklebust commit 9467c4fdd66f6810cecef0f1173330f3c6e67d45 Merge: 35c2e96 a9185b4 Author: Linus Torvalds Date: Fri Mar 5 11:53:53 2010 -0800 Merge branch 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'write_inode2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: pass writeback_control to ->write_inode make sure data is on disk before calling ->write_inode commit 35c2e967d067ff02dc944f2434f024419c2fe83a Merge: 6c550ee 1f36f77 Author: Linus Torvalds Date: Fri Mar 5 11:46:31 2010 -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: Switch !O_CREAT case to use of do_last() Get rid of symlink body copying Finish pulling of -ESTALE handling to upper level in do_filp_open() Turn do_link spaghetty into a normal loop Unify exits in O_CREAT handling Kill is_link argument of do_last() Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open() Leave mangled flag only for setting nd.intent.open.flag Get rid of passing mangled flag to do_last() Don't pass mangled open_flag to finish_open() pull more into do_last() bail out with ELOOP earlier in do_link loop pull the common predecessors into do_last() postpone __putname() until after do_last() unroll do_last: loop in do_filp_open() Shift releasing nd->root from do_last() to its caller gut do_filp_open() a bit more (do_last separation) beginning to untangle do_filp_open() commit 6c550ee41596798cbd873d3df9f8ea0a4ce7ad2f Author: Randy Dunlap Date: Fri Mar 5 09:52:52 2010 -0800 x86: fix mtrr missing kernel-doc Fix missing kernel-doc notation in mtrr/main.c: Warning(arch/x86/kernel/cpu/mtrr/main.c:152): No description found for parameter 'info' Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 660f6a360be399f4ebdd6572a3d24afe54e9bb1c Merge: 586fac1 e5a1101 Author: Linus Torvalds Date: Fri Mar 5 10:50:22 2010 -0800 Merge branch 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-probes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Issue at least one memory barrier in stop_machine_text_poke() perf probe: Correct probe syntax on command line help perf probe: Add lazy line matching support perf probe: Show more lines after last line perf probe: Check function address range strictly in line finder perf probe: Use libdw callback routines perf probe: Use elfutils-libdw for analyzing debuginfo perf probe: Rename probe finder functions perf probe: Fix bugs in line range finder perf probe: Update perf probe document perf probe: Do not show --line option without dwarf support kprobes: Add documents of jump optimization kprobes/x86: Support kprobes jump optimization on x86 x86: Add text_poke_smp for SMP cross modifying code kprobes/x86: Cleanup save/restore registers kprobes/x86: Boost probes when reentering kprobes: Jump optimization sysctl interface kprobes: Introduce kprobes jump optimization kprobes: Introduce generic insn_slot framework kprobes/x86: Cleanup RELATIVEJUMP_INSTRUCTION to RELATIVEJUMP_OPCODE commit 586fac13f8685bf9dfb32e1ee98bfb14f0dd0061 Merge: 1f63b9c 7478138 Author: Linus Torvalds Date: Fri Mar 5 10:47:57 2010 -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: padata: Allocate the cpumask for the padata instance crypto: authenc - Move saved IV in front of the ablkcipher request crypto: hash - Fix handling of unaligned buffers crypto: authenc - Use correct ahash complete functions crypto: md5 - Set statesize commit 1f63b9c15b17d5af360c180f5c71537e954d5d3b Merge: b24bc1e 64e290e Author: Linus Torvalds Date: Fri Mar 5 10:47:00 2010 -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: (36 commits) ext4: fix up rb_root initializations to use RB_ROOT ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl ext4: Fix the NULL reference in double_down_write_data_sem() ext4: Fix insertion point of extent in mext_insert_across_blocks() ext4: consolidate in_range() definitions ext4: cleanup to use ext4_grp_offs_to_block() ext4: cleanup to use ext4_group_first_block_no() ext4: Release page references acquired in ext4_da_block_invalidatepages ext4: Fix ext4_quota_write cross block boundary behaviour ext4: Convert BUG_ON checks to use ext4_error() instead ext4: Use direct_IO_no_locking in ext4 dio read ext4: use ext4_get_block_write in buffer write ext4: mechanical rename some of the direct I/O get_block's identifiers ext4: make "offset" consistent in ext4_check_dir_entry() ext4: Handle non empty on-disk orphan link ext4: explicitly remove inode from orphan list after failed direct io ext4: fix error handling in migrate ext4: deprecate obsoleted mount options ext4: Fix fencepost error in chosing choosing group vs file preallocation. jbd2: clean up an assertion in jbd2_journal_commit_transaction() ... commit b24bc1e61cec2174faf5dfa632da16b6ca17144f Merge: 64ba992 06862f8 Author: Linus Torvalds Date: Fri Mar 5 10:46:04 2010 -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: get rid of obsolete definition in header file Squashfs: get rid of obsolete variable in struct squashfs_sb_info Squashfs: add decompressor entries for lzma and lzo Squashfs: add a decompressor framework Squashfs: factor out remaining zlib dependencies into separate wrapper file Squashfs: move zlib decompression wrapper code into a separate file commit a9185b41a4f84971b930c519f0c63bd450c4810d Author: Christoph Hellwig Date: Fri Mar 5 09:21:37 2010 +0100 pass writeback_control to ->write_inode This gives the filesystem more information about the writeback that is happening. Trond requested this for the NFS unstable write handling, and other filesystems might benefit from this too by beeing able to distinguish between the different callers in more detail. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 26821ed40b4230259e770c9911180f38fcaa6f59 Author: Christoph Hellwig Date: Fri Mar 5 09:21:21 2010 +0100 make sure data is on disk before calling ->write_inode Similar to the fsync issue fixed a while ago in commit 2daea67e966dc0c42067ebea015ddac6834cef88 we need to write for data to actually hit the disk before writing out the metadata to guarantee data integrity for filesystems that modify the inode in the data I/O completion path. Currently XFS and NFS handle this manually, and AFS has a write_inode method that does nothing but waiting for data, while others are possibly missing out on this. Fortunately this change has a lot less impact than the fsync change as none of the write_inode methods starts data writeout of any form by itself. Signed-off-by: Christoph Hellwig Signed-off-by: Al Viro commit 9b1f56d60acfd634728f91f34922066c6f80ede6 Merge: 64ba992 07000ee Author: Alex Elder Date: Fri Mar 5 11:45:03 2010 -0600 Merge branch 'for-2.6.34-rc1-batch2' into for-linus commit 07000ee686cf19e853fa06f7904eff2cfe230ea3 Author: Dave Chinner Date: Fri Mar 5 04:41:14 2010 +0000 xfs: return inode fork offset in bulkstat for fsr So that fsr can attempt to get the fork offset of the temporary inode it uses the same as the inode it is defragmenting, pass the fork offset out in the bulkstat information. The bulkstat structure has padding that has always been zeroed, so userspace can tell if this field is set or not by use of the xattr present flag and a non-zero value for the fork offset. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8babd8a2e75cccff3167a61176c2a3e977e13799 Author: Dave Chinner Date: Thu Mar 4 01:46:25 2010 +0000 xfs: Increase the default size of the reserved blocks pool The current default size of the reserved blocks pool is easy to deplete with certain workloads, in particular workloads that do lots of concurrent delayed allocation extent conversions. If enough transactions are running in parallel and the entire pool is consumed then subsequent calls to xfs_trans_reserve() will fail with ENOSPC. Also add a rate limited warning so we know if this starts happening again. This is an updated version of an old patch from Lachlan McIlroy. Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 3ed3a4343b79a79d10e31f85f2d1afabcead76c6 Author: Dave Chinner Date: Fri Mar 5 02:00:42 2010 +0000 xfs: truncate delalloc extents when IO fails in writeback We currently use block_invalidatepage() to clean up pages where I/O fails in ->writepage(). Unfortunately, if the page has delalloc regions on it, we fail to remove the delalloc regions when we invalidate the page. This can result in tripping a BUG() in xfs_get_blocks() later on if a direct IO read is done on that same region - the delalloc extent is returned when none is supposed to be there. Fix this by truncating away the delalloc regions on the page before invalidating it. Because they are delalloc, we can do this without needing a transaction. Indeed - if we get ENOSPC errors, we have to be able to do this truncation without a transaction as there is no space left for block reservation (typically why we see a ENOSPC in writeback). Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 20f6b2c785cf187445f126321638ab8ba7aa7494 Author: Dave Chinner Date: Thu Mar 4 01:46:23 2010 +0000 xfs: check for more work before sleeping in xfssyncd xfssyncd processes a queue of work by detaching the queue and then iterating over all the work items. It then sleeps for a time period or until new work comes in. If new work is queued while xfssyncd is actively processing the detached work queue, it will not process that new work until after a sleep timeout or the next work event queued wakes it. Fix this by checking the work queue again before going to sleep. Signed-off-by: Dave Chinner Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 694189328a7e566cb84bd3205503a42b60e87882 Author: Dave Chinner Date: Thu Mar 4 00:57:09 2010 +0000 xfs: Fix a build warning in xfs_aops.c Fix a build warning that slipped through. Dave Chinner had posted an updated version of his patch but the previous version--without this fix--was what got committed. Reported-by: Stephen Rothwell Signed-off-by: Stephen Rothwell Signed-off-by: Dave Chinner Signed-off-by: Alex Elder commit 06862f884d9c2453daaf0c1d070c69cf444f10b1 Author: Phillip Lougher Date: Thu Feb 25 01:31:13 2010 +0000 Squashfs: get rid of obsolete definition in header file Signed-off-by: Phillip Lougher commit ae4a3179b11a97a5b36a768ae6ac1662d0315ff0 Author: Phillip Lougher Date: Thu Feb 25 00:54:48 2010 +0000 Squashfs: get rid of obsolete variable in struct squashfs_sb_info Signed-off-by: Phillip Lougher commit 6a08ab846cefc82a328cbf9abd96c2e58a6c3664 Author: Joern Engel Date: Fri Mar 5 16:07:04 2010 +0100 [LogFS] Check feature flags commit 1f36f774b22a0ceb7dd33eca626746c81a97b6a5 Author: Al Viro Date: Sat Dec 26 10:56:19 2009 -0500 Switch !O_CREAT case to use of do_last() ... and now we have all intents crap well localized Signed-off-by: Al Viro commit def4af30cf945a3735ffca865788ea84b30b25d9 Author: Al Viro Date: Sat Dec 26 08:37:05 2009 -0500 Get rid of symlink body copying Now that nd->last stays around until ->put_link() is called, we can just postpone that ->put_link() in do_filp_open() a bit and don't bother with copying. Signed-off-by: Al Viro commit 3866248e5f86d74960a3d1592882490ec3021675 Author: Al Viro Date: Sat Dec 26 07:21:48 2009 -0500 Finish pulling of -ESTALE handling to upper level in do_filp_open() Don't bother with path_walk() (and its retry loop); link_path_walk() will do it. Signed-off-by: Al Viro commit 806b681cbe588bebe8fe47dd24da62f2d1c55851 Author: Al Viro Date: Sat Dec 26 07:16:40 2009 -0500 Turn do_link spaghetty into a normal loop Signed-off-by: Al Viro commit 10fa8e62f2bc33c452516585911f151d88389e4c Author: Al Viro Date: Sat Dec 26 07:09:49 2009 -0500 Unify exits in O_CREAT handling Signed-off-by: Al Viro commit 9e67f36169117e07daf16dc7ca314f1db9e2050a Author: Al Viro Date: Sat Dec 26 07:04:50 2009 -0500 Kill is_link argument of do_last() We set it to 1 iff we return NULL Signed-off-by: Al Viro commit 67ee3ad21d0d0b2cc0b70708de8aed860fadda44 Author: Al Viro Date: Sat Dec 26 07:01:01 2009 -0500 Pull handling of LAST_BIND into do_last(), clean up ok: part in do_filp_open() Note that in case of !O_CREAT we know that nd.root has already been given up Signed-off-by: Al Viro commit 4296e2cbf2138b5831b83f03e81de916ce1a967d Author: Al Viro Date: Thu Dec 24 07:15:41 2009 -0500 Leave mangled flag only for setting nd.intent.open.flag Nothing else uses it anymore Signed-off-by: Al Viro commit 5b369df8263fe7ab4dac2bb08b8f423dc5e33752 Author: Al Viro Date: Thu Dec 24 06:51:13 2009 -0500 Get rid of passing mangled flag to do_last() Signed-off-by: Al Viro commit 9a66179e13504c676f891908a1e94912ec5cdefb Author: Al Viro Date: Thu Dec 24 06:49:47 2009 -0500 Don't pass mangled open_flag to finish_open() Signed-off-by: Al Viro commit a2c36b450ee68470836cb858c58a6ba3a52c5ec5 Author: Al Viro Date: Thu Dec 24 03:39:50 2009 -0500 pull more into do_last() Handling of LAST_DOT/LAST_ROOT/LAST_DOTDOT/terminating slash can be pulled in as well Signed-off-by: Al Viro commit c99658fe970f442199733bcace1a00b087336a0d Author: Al Viro Date: Thu Dec 24 02:27:30 2009 -0500 bail out with ELOOP earlier in do_link loop If we'd passed through 32 trailing symlinks already, there's no sense following the 33rd - we'll bail out anyway. Better bugger off earlier. It *does* change behaviour, after a fashion - if the 33rd happens to be a procfs-style symlink, original code *would* allow it. This one will not. Cry me a river if that hurts you. Please, do. And post a video of that, while you are at it. Signed-off-by: Al Viro commit a1e28038df98e186807ff55a49c1c26d33d530a5 Author: Al Viro Date: Thu Dec 24 02:12:06 2009 -0500 pull the common predecessors into do_last() Signed-off-by: Al Viro commit c41c14056210e4a328659c82b1edaccb0910d18c Author: Al Viro Date: Thu Dec 24 02:08:19 2009 -0500 postpone __putname() until after do_last() Since do_last() doesn't mangle nd->last_name, we can safely postpone __putname() done in handling of trailing symlinks until after the call of do_last() Signed-off-by: Al Viro commit 27bff34300482632caf52ff589a4e7d755b32539 Author: Al Viro Date: Thu Dec 24 02:05:43 2009 -0500 unroll do_last: loop in do_filp_open() Signed-off-by: Al Viro commit 3343eb8209cc69f0d2059f8c484ad7a3e1834c0b Author: Al Viro Date: Thu Dec 24 02:02:38 2009 -0500 Shift releasing nd->root from do_last() to its caller Signed-off-by: Al Viro commit fb1cc555d533869910e20de4b8d5147570afdfad Author: Al Viro Date: Thu Dec 24 01:58:28 2009 -0500 gut do_filp_open() a bit more (do_last separation) Brute-force separation of stuff reachable from do_last: with the exception of do_link:; just take all that crap to a helper function as-is and have it tell the caller if it has to go to do_link. Signed-off-by: Al Viro commit 648fa8611de3d4d43bbd64af3226679d2d0eb609 Author: Al Viro Date: Thu Dec 24 01:26:48 2009 -0500 beginning to untangle do_filp_open() That's going to be a long and painful series. The first step: take the stuff reachable from 'ok' label in do_filp_open() into a new helper (finish_open()). Signed-off-by: Al Viro commit 64e290ec69be39f1887fa0b403c1e417b6b038e7 Author: Venkatesh Pallipadi Date: Thu Mar 4 22:25:21 2010 -0500 ext4: fix up rb_root initializations to use RB_ROOT ext4 uses rb_node = NULL; to zero rb_root at few places. Using RB_ROOT as the initializer is more portable in case the underlying implementation of rbtrees changes in the future. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Andrew Morton Signed-off-by: "Theodore Ts'o" Cc: Eric Paris commit efd8f0e6f6c1faa041f228d7113bd3a9db802d49 Author: Christoph Hellwig Date: Wed Mar 3 09:05:08 2010 -0500 quota: stop using QUOTA_OK / NO_QUOTA Just use 0 / -EDQUOT directly - that's what it translates to anyway. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 871a293155a24554e153538d36e3a80fa169aefb Author: Christoph Hellwig Date: Wed Mar 3 09:05:07 2010 -0500 dquot: cleanup dquot initialize routine Get rid of the initialize dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_initialize helper to __dquot_initialize and vfs_dq_init to dquot_initialize to have a consistent namespace. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 907f4554e2521cb28b0009d17167760650a9561c Author: Christoph Hellwig Date: Wed Mar 3 09:05:06 2010 -0500 dquot: move dquot initialization responsibility into the filesystem Currently various places in the VFS call vfs_dq_init directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the initialization. For most metadata operations this is a straight forward move into the methods, but for truncate and open it's a bit more complicated. For truncate we currently only call vfs_dq_init for the sys_truncate case because open already takes care of it for ftruncate and open(O_TRUNC) - the new code causes an additional vfs_dq_init for those which is harmless. For open the initialization is moved from do_filp_open into the open method, which means it happens slightly earlier now, and only for regular files. The latter is fine because we don't need to initialize it for operations on special files, and we already do it as part of the namespace operations for directories. Add a dquot_file_open helper that filesystems that support generic quotas can use to fill in ->open. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 9f7547580263d4a55efe06ce5cfd567f568be6e8 Author: Christoph Hellwig Date: Wed Mar 3 09:05:05 2010 -0500 dquot: cleanup dquot drop routine Get rid of the drop dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_drop helper to __dquot_drop and vfs_dq_drop to dquot_drop to have a consistent namespace. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 257ba15cedf1288f0c96118d7e63947231d27278 Author: Christoph Hellwig Date: Wed Mar 3 09:05:04 2010 -0500 dquot: move dquot drop responsibility into the filesystem Currently clear_inode calls vfs_dq_drop directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the drop inside the ->clear_inode superblock operation. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit b43fa8284d7790d9cca32c9c55e24f29be2fa33b Author: Christoph Hellwig Date: Wed Mar 3 09:05:03 2010 -0500 dquot: cleanup dquot transfer routine Get rid of the transfer dquot operation - it is now always called from the filesystem and if a filesystem really needs it's own (which none currently does) it can just call into it's own routine directly. Rename the now static low-level dquot_transfer helper to __dquot_transfer and vfs_dq_transfer to dquot_transfer to have a consistent namespace, and make the new dquot_transfer return a normal negative errno value which all callers expect. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 759bfee658beab14af7b357156461d0eb852be2c Author: Christoph Hellwig Date: Wed Mar 3 09:05:02 2010 -0500 dquot: move dquot transfer responsibility into the filesystem Currently notify_change calls vfs_dq_transfer directly. This means we tie the quota code into the VFS. Get rid of that and make the filesystem responsible for the transfer. Most filesystems already do this, only ufs and udf need the code added, and for jfs it needs to be enabled unconditionally instead of only when ACLs are enabled. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 63936ddaa16b9486e2d426ed7b09f559a5c60f87 Author: Christoph Hellwig Date: Wed Mar 3 09:05:01 2010 -0500 dquot: cleanup inode allocation / freeing routines Get rid of the alloc_inode and free_inode dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Also get rid of the vfs_dq_alloc/vfs_dq_free wrappers and always call the lowlevel dquot_alloc_inode / dqout_free_inode routines directly, which now lose the number argument which is always 1. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5dd4056db84387975140ff2568eaa0406f07985e Author: Christoph Hellwig Date: Wed Mar 3 09:05:00 2010 -0500 dquot: cleanup space allocation / freeing routines Get rid of the alloc_space, free_space, reserve_space, claim_space and release_rsv dquot operations - they are always called from the filesystem and if a filesystem really needs their own (which none currently does) it can just call into it's own routine directly. Move shared logic into the common __dquot_alloc_space, dquot_claim_space_nodirty and __dquot_free_space low-level methods, and rationalize the wrappers around it to move as much as possible code into the common block for CONFIG_QUOTA vs not. Also rename all these helpers to be named dquot_* instead of vfs_dq_*. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 49792c806d0bfd53afc789dcdf50dc9bed2c5b83 Author: Dmitry Monakhov Date: Tue Mar 2 15:51:02 2010 +0300 ext3: add writepage sanity checks - There is theoretical possibility to perform writepage on RO superblock. Add explicit check for what case. - Page must being locked before writepage. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 7eb4969e04060dcf3fbd46af9c21b1059b853068 Author: Jan Kara Date: Mon Mar 1 14:02:37 2010 +0100 ext3: Truncate allocated blocks if direct IO write fails to update i_size We have to truncate blocks allocated to file during direct IO when we fail to update i_size properly. Signed-off-by: Jan Kara commit ab94c39b6fa076d4f6d2903dcc54cda35d938776 Author: Jan Kara Date: Mon Feb 22 21:07:17 2010 +0100 quota: Properly invalidate caches even for filesystems with blocksize < pagesize Sometimes invalidate_bdev() can fail to invalidate a part of block device cache because of dirty data. If the filesystem has blocksize smaller than page size, this can happen even for pages containing quota files and thus kernel would operate on stale data. Fix the issue by syncing the filesystem before invalidating the cache. Reviewed-by: Christoph Hellwig Signed-off-by: Jan Kara commit 8ddd69d6df4758bf0cab981481af24cc84419567 Author: Dmitry Monakhov Date: Tue Feb 16 08:31:50 2010 +0300 quota: generalize quota transfer interface Current quota transfer interface support only uid/gid. This patch extend interface in order to support various quotas types The goal is accomplished without changes in most frequently used vfs_dq_transfer() func. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit ad1e6e8da9fe8cb7ecfde8eabacedc3b50fceae4 Author: Dmitry Monakhov Date: Tue Feb 16 08:31:49 2010 +0300 quota: sb_quota state flags cleanup - remove hardcoded USRQUOTA/GRPQUOTA flags - convert int to bool for appropriate functions Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 86963918965eb8fe0c8ae009e7c1b4c630f533d5 Author: Jan Kara Date: Tue Feb 16 20:37:12 2010 +0100 jbd: Delay discarding buffers in journal_unmap_buffer Delay discarding buffers in journal_unmap_buffer until we know that "add to orphan" operation has definitely been committed, otherwise the log space of committing transation may be freed and reused before truncate get committed, updates may get lost if crash happens. This patch is a backport of JBD2 fix by dingdinghua . Signed-off-by: Jan Kara commit e5472147e1c0712d95d973acfdbd862957c77add Author: Dmitry Monakhov Date: Tue Feb 16 19:33:42 2010 +0300 ext3: quota_write cross block boundary behaviour We always assume what dquot update result in changes in one data block But ext3_quota_write() function may handle cross block boundary writes In fact if this ever happen it will result in incorrect journal credits reservation. And later bug_on triggering. As soon this never happen the boundary cross loop is NOOP. In order to make things straight let's remove this loop and assert cross boundary condition. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit ac0e773718dc20551e72900d2e7eada96ac91100 Author: Christoph Hellwig Date: Tue Feb 16 03:44:56 2010 -0500 quota: drop permission checks from xfs_fs_set_xstate/xfs_fs_set_xquota We already do these checks in the generic code. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5582c76f901d240f57329212b59b4d957ea8d6cf Author: Christoph Hellwig Date: Tue Feb 16 03:44:55 2010 -0500 quota: split out compat_sys_quotactl support from quota.c Instead of adding ifdefs just split it into a new file. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 799a9d44023c069f46bc5933a930eab0bd37d0df Author: Christoph Hellwig Date: Tue Feb 16 03:44:54 2010 -0500 quota: split out netlink notification support from quota.c Instead of adding ifdefs just split it into a new file. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit a56fca23f67282467c08e75c40081da2345dfdbf Author: Christoph Hellwig Date: Tue Feb 16 03:44:53 2010 -0500 quota: remove invalid optimization from quota_sync_all Checking the "VFS" quota enabled and dirty bits from generic code means this code will never get called for other implementations, e.g. XFS and GFS2. Grabbing the reference on the superblock really isn't much overhead for a global Q_SYNC call, so just drop this optimization. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 5fb324ad24febe57a8a2e62903dcb7bad546ea71 Author: Christoph Hellwig Date: Tue Feb 16 03:44:52 2010 -0500 quota: move code from sync_quota_sb into vfs_quota_sync Currenly sync_quota_sb does a lot of sync and truncate action that only applies to "VFS" style quotas and is actively harmful for the sync performance in XFS. Move it into vfs_quota_sync and add a wait parameter to ->quota_sync to tell if we need it or not. My audit of the GFS2 code says it's also not needed given the way GFS2 implements quotas, but I'd be happy if this can get a detailed review. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 8c4e4acd660a09e571a71583b5bbe1eee700c9ad Author: Christoph Hellwig Date: Tue Feb 16 03:44:51 2010 -0500 quota: clean up Q_XQUOTASYNC Currently Q_XQUOTASYNC calls into the quota_sync method, but XFS does something entirely different in it than the rest of the filesystems. xfs_quota which calls Q_XQUOTASYNC expects an asynchronous data writeout to flush delayed allocations, while the "VFS" quota support wants to flush changes to the quota file. So make Q_XQUOTASYNC call into the writeback code directly and make the quota_sync method optional as XFS doesn't need in the sense expected by the rest of the quota code. GFS2 was using limited XFS-style quota and has a quota_sync method fitting neither the style used by vfs_quota_sync nor xfs_fs_quota_sync. I left it in for now as per discussion with Steve it expects to be called from the sync path this way. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit c988afb5fa3fc450207c3dfc0ce535f4bfdae4d1 Author: Christoph Hellwig Date: Tue Feb 16 03:44:50 2010 -0500 quota: simplify permission checking Stop having complicated different routines for checking permissions for XQM vs "VFS" quotas. Instead do the checks for having sb->s_qcop and a valid type directly in do_quotactl, and munge the *quotactl_valid functions into a check_quotactl_permission helper that only checks for permissions. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 6ae09575b3c951ad77c07d068b8dbbc09031b2d1 Author: Christoph Hellwig Date: Tue Feb 16 03:44:49 2010 -0500 quota: special case Q_SYNC without device name The Q_SYNC command can be called without the path to a device, in which case it iterates over all superblocks. Special case this variant directly in sys_quotactl so that the other code always gets a superblock and doesn't need to deal with this case. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit f450d4fee42c52e8045131a355b2de03094aa066 Author: Christoph Hellwig Date: Tue Feb 16 03:44:48 2010 -0500 quota: clean up checks for supported quota methods Move the checks for sb->s_qcop->foo next to the actual calls for them, same for sb_has_quota_active checks where applicable. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit c411e5f66a5dd36827a5f9d1392a1afdf69ff075 Author: Christoph Hellwig Date: Tue Feb 16 03:44:47 2010 -0500 quota: split do_quotactl Split out a helper for each non-trivial command from do_quotactl. Signed-off-by: Christoph Hellwig Signed-off-by: Jan Kara commit 0a5a9c725512461d19397490f3adf29931dca1f2 Author: Jan Kara Date: Tue Feb 9 18:20:39 2010 +0100 quota: Fix warning when a delayed write happens before quota is enabled If a delayed-allocation write happens before quota is enabled, the kernel spits out a warning: WARNING: at fs/quota/dquot.c:988 dquot_claim_space+0x77/0x112() because the fact that user has some delayed allocation is not recorded in quota structure. Make dquot_initialize() update amount of reserved space for user if it sees inode has some space reserved. Also make sure that reserved quota space does not go negative and we warn about the filesystem bug just once. Signed-off-by: Jan Kara commit c469070aea5a0ada45a836937c776fd3083dae2b Author: Dmitry Monakhov Date: Tue Feb 9 17:53:36 2010 +0100 quota: manage reserved space when quota is not active [v2] Since we implemented generic reserved space management interface, then it is possible to account reserved space even when quota is not active (similar to i_blocks/i_bytes). Without this patch following testcase result in massive comlain from WARN_ON in dquot_claim_space() TEST_CASE: mount /dev/sdb /mnt -oquota dd if=/dev/zero of=/mnt/test bs=1M count=1 quotaon /mnt # fs_reserved_spave == 1Mb # quota_reserved_space == 0, because quota was disabled dd if=/dev/zero of=/mnt/test seek=1 bs=1M count=1 # fs_reserved_spave == 2Mb # quota_reserved_space == 1Mb sync # ->dquot_claim_space() -> WARN_ON Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit c7e8d4d6dceeb6fd236991f590d3fa6f97c59874 Author: Christoph Egger Date: Fri Feb 5 14:13:33 2010 +0100 jbd[2]: remove references to BUFFER_DEBUG CONFIG_BUFFER_DEBUG seems to have been removed from the documentation somewhere around 2.4.15 and seemingly hasn't been available even longer. It is, however, still referenced at one place from the jbd code (one is a copy of the other header). Time to clean it up Signed-off-by: Christoph Egger Signed-off-by: Jan Kara commit e1f5c67a1994312300ebc41195e6f5bea2f6c065 Author: Dmitry Monakhov Date: Tue Feb 2 16:05:53 2010 +0300 ext3: trivial quota cleanup The patch is aimed to reorganize and simplify quota code a bit. Quota code is itself complex enouth, but we can make it more readable in some places: - Move quota option parsing to separate functions. - Simplify old-quota and journaled-quota mix check. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit e3c9643597ac4bd6b5db62b5e7d915f8c8fa34b6 Author: Dmitry Monakhov Date: Tue Feb 2 16:05:51 2010 +0300 ext3: mount flags manipulation cleanup Replace intermediate EXT3_MOUNT_XXX flags manipulation to corresponding macro. Signed-off-by: Dmitry Monakhov Signed-off-by: Jan Kara commit 9df93939b735dd273e49cbee290b9f4738500ef4 Author: Jan Kara Date: Wed Jan 6 21:58:48 2010 +0100 ext3: Use bitops to read/modify EXT3_I(inode)->i_state At several places we modify EXT3_I(inode)->i_state without holding i_mutex (ext3_release_file, ext3_bmap, ext3_journalled_writepage, ext3_do_update_inode, ...). These modifications are racy and we can lose updates to i_state. So convert handling of i_state to use bitops which are atomic. Signed-off-by: Jan Kara commit 26245c949c8473ea7352907b5a54bc34487eb87f Author: Jan Kara Date: Wed Jan 6 17:20:35 2010 +0100 quota: Cleanup S_NOQUOTA handling Cleanup handling of S_NOQUOTA inode flag and document it a bit. The flag does not have to be set under dqptr_sem. Only functions modifying inode's dquot pointers have to check the flag under dqptr_sem before going forward with the modification. This way we are sure that we cannot add new dquot pointers to the inode which is just becoming a quota file. The good thing about this cleanup is that there are no more places in quota code which enforce i_mutex vs. dqptr_sem lock ordering (in particular that dqptr_sem -> i_mutex of quota file). This should silence some (false) lockdep warnings with ext4 + quota and generally make life of some filesystems easier. Signed-off-by: Jan Kara commit c6d3830140f1d56b07d8ab56a6e14ca3c492a39a Author: Joern Engel Date: Thu Mar 4 21:36:19 2010 +0100 [LogFS] Only write journal if dirty This prevents unnecessary journal writes. More importantly it prevents an oops due to a journal write on failed mount. commit 9421502b4fc894cc477be8fc49776830e37ca157 Author: Joern Engel Date: Thu Mar 4 21:30:58 2010 +0100 [LogFS] Fix bdev erases Erases for block devices were always just emulated by writing 0xff. Some time back the write was removed and only the page cache was changed to 0xff. Superficialy a good idea with two problems: 1. Touching the page cache isn't necessary either. 2. However, writing out 0xff _is_ necessary for the journal. As the journal is scanned linearly, an old non-overwritten commit entry can be used on next mount and cause havoc. This should fix both aspects. commit 4ea41e2de5bba756858bb40f964e3490b6d1a25c Merge: 8d75da8 398007f Author: J. Bruce Fields Date: Thu Mar 4 12:03:16 2010 -0500 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs into for-2.6.34-incoming Resolve merge conflict in fs/xfs/linux-2.6/xfs_export.c. commit 0272282f7cffb469cd2676dcb6e58bc942fcf8a8 Author: John Stultz Date: Fri Mar 5 02:04:38 2010 +0900 sh: Convert sh to use read/update_persistent_clock This patch converts the sh architecture to use the generic read_persistent_clock and update_persistent_clock interfaces, reducing the amount of arch specific code we have to maintain, and allowing for further cleanups in the future. Cc: Thomas Gleixner Cc: Andrew Morton Signed-off-by: John Stultz Signed-off-by: Paul Mundt commit a71b676fa9b92119c0fb4e3fab34e45a17f15107 Author: Greg Kroah-Hartman Date: Thu Mar 4 08:44:13 2010 -0800 Staging: winbond: fix up wireless api errors The wireless core made a number of api changes that caused the winbond driver to break. This patch fixes those errors by making the needed changes to the driver. Signed-off-by: Greg Kroah-Hartman commit f341dddf1dadf64be309791f83d7904245f1261d Merge: eaa5eec b02957d Author: Greg Kroah-Hartman Date: Thu Mar 4 08:39:02 2010 -0800 Staging: merge staging patches into Linus's main branch There were a number of patches that went into Linus's tree already that conflicted with other changes in the staging branch. This merge resolves those merge conflicts. Signed-off-by: Greg Kroah-Hartman commit 64ba9926759792cf7b95f823402e2781edd1b5d4 Merge: 6895210 50a76fd Author: Linus Torvalds Date: Thu Mar 4 08:26:08 2010 -0800 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: groups support exofs: Prepare for groups exofs: Error recovery if object is missing from storage exofs: convert io_state to use pages array instead of bio at input exofs: RAID0 support exofs: Define on-disk per-inode optional layout attribute exofs: unindent exofs_sbi_read exofs: Move layout related members to a layout structure exofs: Recover in the case of read-passed-end-of-file exofs: Micro-optimize exofs_i_info exofs: debug print even less commit 6895210e89df20520916c94a4dc148a43229053e Merge: 4c10c93 8a4fd1e Author: Linus Torvalds Date: Thu Mar 4 08:24:47 2010 -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: Make prom entry spinlock NMI safe. sparc64: Kill off old sys_perfctr system call and state. sparc: Update defconfigs. sparc: Provide io{read,write}{16,32}be(). commit 4c10c937cc2eb197db565392db91d429eec71176 Merge: 9bb6769 950f564 Author: Linus Torvalds Date: Thu Mar 4 08:24:06 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6: (49 commits) drivers/ide: Fix continuation line formats ide: fixed section mismatch warning in cmd640.c ide: ide_timing_compute() fixup ide: make ide_get_best_pio_mode() static via82cxxx: use ->pio_mode value to determine pair device speed tx493xide: use ->pio_mode value to determine pair device speed siimage: use ->pio_mode value to determine pair device speed palm_bk3710: use ->pio_mode value to determine pair device speed it821x: use ->pio_mode value to determine pair device speed cs5536: use ->pio_mode value to determine pair device speed cs5535: use ->pio_mode value to determine pair device speed cmd64x: fix handling of address setup timings amd74xx: use ->pio_mode value to determine pair device speed alim15x3: fix handling of UDMA enable bit alim15x3: fix handling of DMA timings alim15x3: fix handling of command timings alim15x3: fix handling of address setup timings ide-timings: use ->pio_mode value to determine fastest PIO speed ide: change ->set_dma_mode method parameters ide: change ->set_pio_mode method parameters ... commit 9bb676966aa85e56af00b353387d3c274a26e480 Merge: 0f2cc4e dd58ffc Author: Linus Torvalds Date: Thu Mar 4 08:20:14 2010 -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: (28 commits) ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes ioat3: interrupt coalescing ioat: close potential BUG_ON race in the descriptor cleanup path ioat2: kill pending flag ioat3: use ioat2_quiesce() ioat3: cleanup, don't enable DCA completion writes DMAENGINE: COH 901 318 lli sg offset fix DMAENGINE: COH 901 318 configure channel direction DMAENGINE: COH 901 318 remove irq counting DMAENGINE: COH 901 318 descriptor pool refactoring DMAENGINE: COH 901 318 cleanups dma: Add MPC512x DMA driver Debugging options for the DMA engine subsystem iop-adma: redundant/wrong tests in iop_*_count()? dmatest: fix handling of an even number of xor_sources dmatest: correct raid6 PQ test fsldma: Fix cookie issues fsldma: Fix cookie issues dma: cases IPU_PIX_FMT_BGRA32, BGR32 and ABGR32 are the same in ipu_ch_param_set_size() dma: make Open Firmware device id constant ... commit 0f2cc4ecd81dc1917a041dc93db0ada28f8356fa Merge: 1fae4cf 9643f5d Author: Linus Torvalds Date: Thu Mar 4 08:15:33 2010 -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: (52 commits) init: Open /dev/console from rootfs mqueue: fix typo "failues" -> "failures" mqueue: only set error codes if they are really necessary mqueue: simplify do_open() error handling mqueue: apply mathematics distributivity on mq_bytes calculation mqueue: remove unneeded info->messages initialization mqueue: fix mq_open() file descriptor leak on user-space processes fix race in d_splice_alias() set S_DEAD on unlink() and non-directory rename() victims vfs: add NOFOLLOW flag to umount(2) get rid of ->mnt_parent in tomoyo/realpath hppfs can use existing proc_mnt, no need for do_kern_mount() in there Mirror MS_KERNMOUNT in ->mnt_flags get rid of useless vfsmount_lock use in put_mnt_ns() Take vfsmount_lock to fs/internal.h get rid of insanity with namespace roots in tomoyo take check for new events in namespace (guts of mounts_poll()) to namespace.c Don't mess with generic_permission() under ->d_lock in hpfs sanitize const/signedness for udf nilfs: sanitize const/signedness in dealing with ->d_name.name ... Fix up fairly trivial (famous last words...) conflicts in drivers/infiniband/core/uverbs_main.c and security/tomoyo/realpath.c commit b02957d58a27525499ab10d272d3b44682a7ae50 Merge: 3a8954e b94c765 Author: Greg Kroah-Hartman Date: Thu Mar 4 08:14:54 2010 -0800 Staging: Merge two branches of coding style fixes together Turns out that multiple people sent pretty much the same patch for the same staging drivers. Commit these in two different branches and merge them together to get a more complete coverage of the cleanup and properly credit everyone for the work that they did. Signed-off-by: Greg Kroah-Hartman commit 62c8cbbfc2367e706317f56ac21959120ae72773 Author: Pawel Moll Date: Fri Feb 19 10:26:31 2010 +0000 sh: Move PMB debugfs entry initialization to later stage ... so the "sh_debugfs_root" is already available. Previously it wasn't and in result its path was "/sys/kernel/debug/pmb" instead of "/sys/kernel/debug/sh/pmb". Signed-off-by: Pawel Moll Signed-off-by: Paul Mundt commit 1fae4cfb97302289bb5df6a8195eb28385d0b002 Merge: c8bf9fe afbc74f Author: Linus Torvalds Date: Thu Mar 4 08:04:22 2010 -0800 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: power_supply: bq27x00: fix voltage and current units power_supply: bq27x00: add status and time properties power_supply: bq27x00: add BQ27500 support power_supply: bq27x00: fix temperature conversion power_supply: bq27x00: remove unused struct fields power_supply: bq27x00: remove double endian swap da9030_battery: fix spelling in comment wm97xx_battery: Clean up some warnings commit b94c765ac31f8eb9c6fe895ba611bb446b799635 Author: Chihau Chau Date: Thu Feb 25 20:20:09 2010 -0300 Staging: dream: camera: sk5k3e2fx: fix code style issues This fixes some code style issues about assignments in if conditions. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit df84f941e9370be6798fa11aa5a77396d8869fdc Author: Chihau Chau Date: Thu Feb 25 19:57:39 2010 -0300 Staging: dream: camera: msm_camera: fix code style issues This fixes some code style issues like to add one space after a while or switch statement and before a open parenthesis '(', and to include KERN_ facility level in the printk() functions. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 3f4b4e779714ae2dd55757617a8033ab338fa7f0 Author: Andrew Elwell Date: Thu Feb 18 23:56:13 2010 +0100 Staging: wlan-ng: More checkpatch.pl error cleanups Signed-off-by: Andrew Elwell Signed-off-by: Greg Kroah-Hartman commit ef1a0ed7f1793531e5fb3ee489cb1e2b627f76fd Author: Andrew Elwell Date: Thu Feb 18 23:56:12 2010 +0100 Staging: wlan-ng - checkpatch.pl fixups Basic fixups in the staging/wlan-ng directory. (First kernel patch - thanks to FOSDEM talk) Signed-off-by: Andrew Elwell Signed-off-by: Greg Kroah-Hartman commit 6705b68d0be284e2f9949f3657ea65d426d0f988 Author: Andrea Gelmini Date: Fri Feb 26 10:14:55 2010 +0100 Staging: comedi: comedi_fops.c: Checkpatch cleanup ERROR: do not initialise externals to 0 or NULL +int comedi_num_legacy_minors = 0; WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_READ) { + kill_fasync(&dev->async_queue, SIGIO, POLL_IN); + } WARNING: braces {} are not necessary for single statement blocks + if (s->subdev_flags & SDF_CMD_WRITE) { + kill_fasync(&dev->async_queue, SIGIO, POLL_OUT); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 639b9f1ee5987270be2bca4bf8b7e6110d3b47ec Author: Stewart Robertson Date: Sun Feb 21 11:21:37 2010 +0000 Staging: comedi: fix suspect code indent in ni_labpc.c This is a patch to the ni_labpc.c file that fixes suspect code indent for conditional statements found by the checkpatch.pl tool Signed-off-by: Stewart Robertson Signed-off-by: Greg Kroah-Hartman commit 65d6d26c6bcd802ebe2b22a29d9b6bbebfd8d7f8 Author: Maurice Dawson Date: Fri Feb 19 10:53:15 2010 +0000 Staging: comedi: fix yet another brace coding style issue in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up all the brace warnings found by the checkpatch.pl tool Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit 2bb9c335902a5d59fc084170aaae0ccc9d9d4012 Author: Maurice Dawson Date: Fri Feb 19 10:53:14 2010 +0000 Staging: comedi: fix another brace coding style issues in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit 8377e813c75cf5aca46032fb780ca74c923dbe86 Author: Maurice Dawson Date: Fri Feb 19 10:53:13 2010 +0000 Staging: comedi: fix brace coding style issue in ni_labpc.c This is a patch to the ni_labpc.c file that fixes up a brace warning found by the checkpatch.pl tool. Signed-off-by: Maurice Dawson Signed-off-by: Greg Kroah-Hartman commit a917d4c4251314afc196fd7a7d9d10faff2effda Author: Chihau Chau Date: Thu Feb 25 17:40:28 2010 -0300 Staging: comedi: poc: Adding some KERN_ facility level This fixes some coding style issues like include KERN_ facility levels in some printk() and one trailing whitespace error. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit d4023a5ee2f683f57636346c0baf94cda710055a Author: Chihau Chau Date: Thu Feb 25 18:13:00 2010 -0300 Staging: dream: camera: msm_camera: fix some code style issues This fixes some code style issues like else staments after the close braces '}' and to use __func__ instead of __FUNCTION__. Signed-off-by: Chihau Chau Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 71508ee489e09dc206ea3f62542dd3bd11c0e201 Author: Alessandro Ghedini Date: Mon Feb 15 12:25:22 2010 +0100 Staging: wlan-ng: fix most of the style issues in hfa384x.h This patch fixes all the errors and the majority of the warnings found with checkpatch.pl script in hfa384x.h, following Gábor Stefanik hints Signed-off-by: Alessandro Ghedini Signed-off-by: Greg Kroah-Hartman commit 49c9b5c7bd6cf87ccc1d820dec8d23ba3ae53f64 Author: Chihau Chau Date: Thu Feb 11 15:47:47 2010 -0300 Staging: dream: camera: msm_camera: fix coding style issues This fixes some coding style issues like to use __func__ instead __FUNCTION__, "foo *bar" instead "foo* bar" and a initial comment with "/* */" instead "//" Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit 0054a361e44bf71b8bb79b863bcf00e04dc4a464 Author: Graham M Howe Date: Wed Feb 10 18:11:47 2010 +0000 Staging: comedi: fix bracing coding style and 80 character issues in ni_660x.c This is a patch to the ni_660x.c file that fixes up the brace and 80 character issues found by the checkpatch tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit c2ca6a476a2fde7239a576c1bde8d7cd2ded87a8 Author: Graham M Howe Date: Tue Feb 9 23:42:25 2010 +0000 Staging: comedi: fix bracing coding style issue in ni_65xx.c This is a patch to the ni_65xx.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit dedf3ad1534ff5e30a2eba88afe64bbe7beecfb6 Author: Benjamin Adolphi Date: Sat Feb 6 20:06:50 2010 +0100 Staging: comedi: pcmad: Checkpatch cleanups This fixes all checkpatch issues in the pcmad comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 52d83bde6f10480268c454b3373bfcec8c2e3c3e Author: Chihau Chau Date: Thu Feb 4 22:27:05 2010 -0300 Staging: comedi: poc: fix coding style issues This fixes a line over 80 characters and a brace warnings. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit c8bf9fec478bb8d3c66067be2aaa4082b83da46c Merge: a2e28fc 1ad02bb Author: Linus Torvalds Date: Thu Mar 4 07:52:06 2010 -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: (27 commits) Regulators: wm8400 - cleanup platform driver data handling Regulators: wm8994 - clean up driver data after removal Regulators: wm831x-xxx - clean up driver data after removal Regulators: pcap-regulator - clean up driver data after removal Regulators: max8660 - annotate probe and remove methods Regulators: max1586 - annotate probe and remove methods Regulators: lp3971 - fail if platform data was not supplied Regulators: tps6507x-regulator - mark probe method as __devinit Regulators: tps65023-regulator - mark probe method as __devinit Regulators: twl-regulator - mark probe function as __devinit Regulators: fixed - annotate probe and remove methods Regulators: ab3100 - fix probe and remove annotations Regulators: virtual - use sysfs attribute groups twl6030: regulator: Configure STATE register instead of REMAP regulator: Provide optional dummy regulator for consumers regulator: Assume regulators are enabled if they don't report anything regulator: Convert fixed voltage regulator to use enable_time() regulator: Add WM8994 regulator support regulator: enable max8649 regulator driver regulator: trivial: fix typos in user-visible Kconfig text ... commit a2e28fc1164e56d37a56e3c53bd3e5a64462fd02 Merge: 03a2c4d a3f916f Author: Linus Torvalds Date: Thu Mar 4 07:51:36 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: pcmcia: disable pcmcia ioctl for !ARM, prepare for removal pcmcia: CodingStyle fixes pcmcia: alchemy: fixup wrong comments pcmcia: remove irq_list parameter from pd6729 yenta_socket: ENE CB712 CardBus bridge needs special treatment with Echo Audio Indigo soundcards commit 03a2c4d76c9e99b80d74ab8a4f344e135a5ae44b Merge: a27341c d424b92 Author: Linus Torvalds Date: Thu Mar 4 07:49:37 2010 -0800 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig commit e5a11016643d1ab7172193591506d33a844734cc Author: Masami Hiramatsu Date: Wed Mar 3 22:38:50 2010 -0500 x86: Issue at least one memory barrier in stop_machine_text_poke() Fix stop_machine_text_poke() to issue smp_mb() before exiting waiting loop, and use cpu_relax() for waiting. Changes in v2: - Don't use ACCESS_ONCE(). Signed-off-by: Masami Hiramatsu Acked-by: Mathieu Desnoyers Cc: systemtap Cc: DLE Cc: Jason Baron LKML-Reference: <20100304033850.3819.74590.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 32cb0dd50672056e510ccab442dc9c3a03be649e Author: Masami Hiramatsu Date: Wed Mar 3 22:38:43 2010 -0500 perf probe: Correct probe syntax on command line help Move @SRC right after FUNC in syntax according to syntax change on command line help. Signed-off-by: Masami Hiramatsu Cc: systemtap Cc: DLE Cc: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Mike Galbraith Cc: K.Prasad LKML-Reference: <20100304033843.3819.10087.stgit@localhost6.localdomain6> Signed-off-by: Ingo Molnar commit 1154fab73ccbab010cfaa272b6987c624cfd63c6 Author: Stephen Rothwell Date: Mon Mar 1 16:04:45 2010 +1100 SLUB: Fix per-cpu merge conflict The slab tree adds a percpu variable usage case (commit 9dfc6e68bfe6ee452efb1a4e9ca26a9007f2b864 "SLUB: Use this_cpu operations in slub"), but the percpu tree removes the prefixing of percpu variables (commit dd17c8f72993f9461e9c19250e3f155d6d99df22 "percpu: remove per_cpu__ prefix"), thus causing the following compilation error: CC mm/slub.o mm/slub.c: In function ‘alloc_kmem_cache_cpus’: mm/slub.c:2078: error: implicit declaration of function ‘per_cpu_var’ mm/slub.c:2078: warning: assignment makes pointer from integer without a cast make[1]: *** [mm/slub.o] Error 1 Signed-off-by: Pekka Enberg commit e2b093f3e9262353558c6f89510ab2d286b28287 Merge: eaa5eec f3186a9 4c13dd3 44b57f1 91efd77 Author: Pekka Enberg Date: Thu Mar 4 12:07:50 2010 +0200 Merge branches 'slab/cleanups', 'slab/failslab', 'slab/fixes' and 'slub/percpu' into slab-for-linus commit 335a64a5c21ed58de21c0130c90c7e647cdcf572 Author: Amit Shah Date: Wed Feb 24 10:37:44 2010 +0530 virtio: console: Use better variable names for fill_queue operation We want to keep track of the number of buffers added to a vq. Use nr_added_bufs instead of 'ret'. Also, the users of fill_queue() overloaded a local 'err' variable to check the numbers of buffers allocated. Use nr_added_bufs instead of err. Signed-off-by: Amit Shah Reported-by: Juan Quintela commit 604b2ad7ccb11569d3b843bb1ce0fbe034e70769 Author: Amit Shah Date: Wed Feb 24 10:36:51 2010 +0530 virtio: console: Fix type of 'len' as unsigned int We declare 'len' as int type but it should be 'unsigned int', as get_buf() wants it to be. Signed-off-by: Amit Shah Reported-by: Juan Quintela commit b07f6b327e798610bebaa581ffb7a226f3bcb96b Author: Paul Mundt Date: Thu Mar 4 16:47:30 2010 +0900 sh: Fix up flush_cache_vmap() on SMP. flush_cache_all() uses broadcast IPIs, so we can't wrap in to that when IRQs are disabled. The local cache flush manages to do what we need here anyways, so just switch to that. Signed-off-by: Paul Mundt commit 281983d6ff2674ca2e4868de628c65809d84fa4c Author: Paul Mundt Date: Thu Mar 4 16:44:20 2010 +0900 sh: fix up MMU reset with variable PMB mapping sizes. Presently we run in to issues with the MMU resetting the CPU when variable sized mappings are employed. This takes a slightly more aggressive approach to keeping the TLB and cache state sane before establishing the mappings in order to cut down on races observed on SMP configurations. At the same time, we bump the VMA range up to the 0xb000...0xc000 range, as there still seems to be some undocumented behaviour in setting up variable mappings in the 0xa000...0xb000 range, resulting in reset by the TLB. Signed-off-by: Paul Mundt commit c437b2733520599a2c6e0dbcdeae611319f84707 Author: Akira Fujita Date: Thu Mar 4 00:39:24 2010 -0500 ext4: Code cleanup for EXT4_IOC_MOVE_EXT ioctl a) Fix sparse warning in ext4_ioctl() b) Remove unneeded variable in mext_leaf_block() c) Fix spelling typo in mext_check_arguments() Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 7247c0caa23d94a1cb6b307edba9dc45fb0798d4 Author: Akira Fujita Date: Thu Mar 4 00:34:58 2010 -0500 ext4: Fix the NULL reference in double_down_write_data_sem() If EXT4_IOC_MOVE_EXT ioctl is called with NULL donor_fd, fget() in ext4_ioctl() gets inappropriate file structure for donor; so we need to do this check earlier, before calling double_down_write_data_sem(). Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 5fd5249aa36fad98c9fd5edced352939e54f9324 Author: Akira Fujita Date: Thu Mar 4 00:31:06 2010 -0500 ext4: Fix insertion point of extent in mext_insert_across_blocks() If the leaf node has 2 extent space or fewer and EXT4_IOC_MOVE_EXT ioctl is called with the file offset where after the 2nd extent covers, mext_insert_across_blocks() always tries to insert extent into the first extent. As a result, the file gets corrupted because of wrong extent order. The patch fixes this problem. Signed-off-by: Akira Fujita Signed-off-by: "Theodore Ts'o" commit 74781387822cd7a549123ae2b35862bf802689be Author: Steffen Klassert Date: Thu Mar 4 13:30:22 2010 +0800 padata: Allocate the cpumask for the padata instance The cpumask of the padata instance was used without allocated. This caused boot crashes if CONFIG_CPUMASK_OFFSTACK is enabled. This patch fixes this by doing proper allocation for this cpumask. Signed-off-by: Steffen Klassert Signed-off-by: Herbert Xu commit 731eb1a03a8445cde2cb23ecfb3580c6fa7bb690 Author: Akinobu Mita Date: Wed Mar 3 23:55:01 2010 -0500 ext4: consolidate in_range() definitions There are duplicate macro definitions of in_range() in mballoc.h and balloc.c. This consolidates these two definitions into ext4.h, and changes extents.c to use in_range() as well. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit bda00de7e8569b1fcde27b68fa59e74e14c5f93a Author: Akinobu Mita Date: Wed Mar 3 23:53:25 2010 -0500 ext4: cleanup to use ext4_grp_offs_to_block() More cleanup to convert open-coded calculations of the first block number of a free extent to use ext4_grp_offs_to_block() instead. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit 5661bd6861b7490394e29aaf74dca812188272e4 Author: Akinobu Mita Date: Wed Mar 3 23:53:39 2010 -0500 ext4: cleanup to use ext4_group_first_block_no() This is a cleanup and simplification patch which takes some open-coded calculations to calculate the first block number of a group and converts them to use the (already defined) ext4_group_first_block_no() function. Signed-off-by: Akinobu Mita Signed-off-by: "Theodore Ts'o" Cc: Andreas Dilger commit dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a Merge: aa4d72a 56a5d3c Author: Dan Williams Date: Wed Mar 3 21:22:21 2010 -0700 Merge branch 'coh' into dmaengine commit aa4d72ae946a4fa40486b871717778734184fa29 Author: Dan Williams Date: Wed Mar 3 21:21:13 2010 -0700 ioat: cleanup ->timer_fn() and ->cleanup_fn() prototypes If the calling convention of ->timer_fn() and ->cleanup_fn() are unified across hardware versions we can drop parameters to ioat_init_channel() and unify ioat_is_dma_complete() implementations. Both ->timer_fn() and ->cleanup_fn() are modified to expect a struct dma_chan pointer. Signed-off-by: Dan Williams commit b9cc98697d1ca35a86bbb708acc6d93993c28f0f Author: Dan Williams Date: Wed Mar 3 21:21:13 2010 -0700 ioat3: interrupt coalescing The hardware automatically disables further interrupts after each event until rearmed. This allows a delay to be injected between the occurence of the interrupt and the running of the cleanup routine. The delay is scaled by the descriptor backlog and then written to the INTRDELAY register which specifies the number of microseconds to hold off interrupt delivery after an interrupt event occurs. According to powertop this reduces the interrupt rate from ~5000 intr/s to ~150 intr/s per without affecting throughput (simple dd to a raid6 array). Signed-off-by: Dan Williams commit aa75db0080603bae27961c0502812dfd0f522bb3 Author: Dan Williams Date: Wed Mar 3 21:21:10 2010 -0700 ioat: close potential BUG_ON race in the descriptor cleanup path Since ioat_cleanup_preamble() and the update of the last completed descriptor are not synchronized there is a chance that two cleanup threads can see descriptors to clean. If the first cleans up all pending descriptors then the second will trigger the BUG_ON. Signed-off-by: Dan Williams commit a27341cd5fcb7cf2d2d4726e9f324009f7162c00 Author: Linus Torvalds Date: Tue Mar 2 08:36:46 2010 -0800 Prioritize synchronous signals over 'normal' signals This makes sure that we pick the synchronous signals caused by a processor fault over any pending regular asynchronous signals sent to use by [t]kill(). This is not strictly required semantics, but it makes it _much_ easier for programs like Wine that expect to find the fault information in the signal stack. Without this, if a non-synchronous signal gets picked first, the delayed asynchronous signal will have its signal context pointing to the new signal invocation, rather than the instruction that caused the SIGSEGV or SIGBUS in the first place. This is not all that pretty, and we're discussing making the synchronous signals more explicit rather than have these kinds of implicit preferences of SIGSEGV and friends. See for example http://bugzilla.kernel.org/show_bug.cgi?id=15395 for some of the discussion. But in the meantime this is a simple and fairly straightforward work-around, and the whole if (x & Y) x &= Y; thing can be compiled into (and gcc does do it) just three instructions: movq %rdx, %rax andl $Y, %eax cmovne %rax, %rdx so it is at least a simple solution to a subtle issue. Reported-and-tested-by: Pavel Vilim Acked-by: Oleg Nesterov Signed-off-by: Linus Torvalds commit 3a8954e8f22cf31791d8c524c2839433e39f9368 Author: H Hartley Sweeten Date: Fri Feb 26 17:58:07 2010 -0700 staging: dt3155: revert u_long to u64 usage Commit 9c1390a923ddb6fba1cf9d7440743369140c6d8a replaced all u_int's with u32 and u_long's with u64. Unfortunately, a u_long is still only 32-bits so they should have been replaced with u32 also. This can be verified by the register definitions in dt3155_io.h. It specifically states that the memory mapped registers are 32-bit. Fix this by changing all the u64 to u32. Signed-off-by: H Hartley Sweeten Cc: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman commit 5617f9da4619ec975514e6b385a052e024215da3 Author: Andrea Gelmini Date: Fri Feb 26 17:37:00 2010 +0100 Staging: comedi: drivers.c: Checkpatch cleanup WARNING: Use #include instead of +#include WARNING: braces {} are not necessary for any arm of this statement + if (dev->driver) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (insn->insn == INSN_READ) { + data[0] = (new_data[1] >> (chan - base_bitfield_channel)) & 1; + } WARNING: braces {} are not necessary for single statement blocks + if (async->prealloc_buf && async->prealloc_bufsz == new_size) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (async->buf_page_list[i].virt_addr == NULL) { + break; + } WARNING: braces {} are not necessary for single statement blocks + if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) { + nbytes = free_end - async->buf_write_alloc_count; + } WARNING: braces {} are not necessary for single statement blocks + if ((int)(async->buf_write_alloc_count + nbytes - free_end) > 0) { + nbytes = 0; + } WARNING: braces {} are not necessary for single statement blocks + if (async->buf_write_ptr >= async->prealloc_bufsz) { + async->buf_write_ptr %= async->prealloc_bufsz; + } Signed-off-by: Andrea Gelmini commit b91665e95d1968c3cd8dd0c3a9a8d617639db1a6 Author: Andrea Gelmini Date: Fri Feb 26 17:36:58 2010 +0100 Staging: arlan: arlan.h: more Checkpatch cleanup ERROR: do not use C99 // comments + volatile u_char radioModule;// shows EEPROM, can be overridden at 0x111 ERROR: do not use C99 // comments + volatile u_char defaultChannelSet; // shows EEProm, can be overriiden at 0x10A Signed-off-by: Andrea Gelmini commit e22245b6c26fbb7dfb948382ceb242edccb3a7e3 Author: Andrea Gelmini Date: Fri Feb 26 17:36:59 2010 +0100 Staging: arlan: Makefile: Checkpatch cleanup ERROR: trailing whitespace +obj-$(CONFIG_ARLAN) += arlan.o $ Signed-off-by: Andrea Gelmini commit aa1468b3faca778274ed0a79da52613fee48672e Author: Andrea Gelmini Date: Fri Feb 26 17:36:57 2010 +0100 Staging: rt3070: md4.h: Checkpatch cleanup WARNING: space prohibited between function name and open parenthesis '(' +void MD4Init (MD4_CTX *); WARNING: space prohibited between function name and open parenthesis '(' +void MD4Update (MD4_CTX *, u8 *, UINT); WARNING: space prohibited between function name and open parenthesis '(' +void MD4Final (u8 [16], MD4_CTX *); ERROR: do not use C99 // comments +#endif //__MD4_H__ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit a5a8695987b4c541f2003640d8583412b8c154ff Author: Andrea Gelmini Date: Fri Feb 26 10:15:11 2010 +0100 Staging: arlan: arlan.h: Checkpatch cleanup ERROR: trailing whitespace + * Copyright (C) 1998 Elmer.Joandi@ut.ee, +37-255-13500^I$ WARNING: Use #include instead of +#include ERROR: do not use C99 // comments +//#define ARLAN_DEBUGGING 1 ERROR: "foo * bar" should be "foo *bar" +extern int arlan_command(struct net_device * dev, int command); ERROR: trailing whitespace + $ ERROR: trailing whitespace +#define IFDEBUG( L ) if ( (L) & arlan_debug ) $ ERROR: space prohibited after that open parenthesis '(' +#define IFDEBUG( L ) if ( (L) & arlan_debug ) ERROR: space prohibited before that close parenthesis ')' +#define IFDEBUG( L ) if ( (L) & arlan_debug ) ERROR: trailing whitespace +#define ARLAN_FAKE_HDR_LEN 12 $ ERROR: space required after that ',' (ctx:VxV) + #define ARLAN_DEBUG(a,b) printk(KERN_DEBUG a, b) ^ ERROR: trailing whitespace +^I#define ARLAN_DEBUG(a,b) $ ERROR: space required after that ',' (ctx:VxV) + #define ARLAN_DEBUG(a,b) ^ ERROR: open brace '{' following struct go on the same line +struct arlan_shmem +{ ERROR: trailing whitespace + /* Header Signature */ $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ ERROR: trailing whitespace + int systemId; $ ERROR: open brace '{' following struct go on the same line +struct TxParam +{ ERROR: "foo * bar" should be "foo *bar" + struct arlan_shmem __iomem * card; ERROR: "foo * bar" should be "foo *bar" + struct arlan_shmem * conf; ERROR: trailing whitespace + struct arlan_conf_stru * Conf;^I $ ERROR: "foo * bar" should be "foo *bar" + struct arlan_conf_stru * Conf; ERROR: trailing whitespace + $ ERROR: space required after that ',' (ctx:VxV) +#define READSHM(to,from,atype) {\ ^ ERROR: space required after that ',' (ctx:VxV) +#define READSHM(to,from,atype) {\ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_fromio(&(tmp),&(from),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) +#define READSHMEM(from,atype)\ ^ ERROR: space required after that ',' (ctx:VxV) +#define WRITESHM(to,from,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define WRITESHM(to,from,atype) \ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_toio(&(to),&tmpSHM,sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxV) +#define DEBUGSHM(levelSHM,stringSHM,stuff,atype) \ ^ ERROR: space required after that ',' (ctx:VxO) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required before that '&' (ctx:OxV) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + memcpy_fromio(&tmpSHM,&(stuff),sizeof(atype));\ ^ ERROR: space required after that ',' (ctx:VxV) + IFDEBUG(levelSHM) printk(stringSHM,tmpSHM);\ ^ ERROR: space required after that ',' (ctx:VxO) + writeb(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writeb(val,&(to)) ^ ERROR: space required after that ',' (ctx:VxO) + writew(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writew(val,&(to)) ^ ERROR: space required after that ',' (ctx:VxO) + writel(val,&(to)) ^ ERROR: space required before that '&' (ctx:OxV) + writel(val,&(to)) ^ ERROR: space prohibited after that open parenthesis '(' + ( ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationMode) > 0) && \ ERROR: space prohibited after that open parenthesis '(' + ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) ) ERROR: space prohibited before that close parenthesis ')' + ( READSHMB(((struct arlan_private *)netdev_priv(dev))->card->registrationStatus) == 0) ) ERROR: code indent should use tabs where possible + ^IREADSHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage)$ ERROR: space required before the open brace '{' +#define writeControlRegister(dev, v){\ ERROR: space required after that ',' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ^ ERROR: need consistent spacing around '&' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ^ ERROR: space prohibited before that close parenthesis ')' + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->cntrlRegImage ,((v) &0xF) );\ ERROR: space required after that ',' (ctx:WxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} ^ ERROR: space required after that ';' (ctx:VxV) + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} ^ ERROR: space prohibited before that close parenthesis ')' + WRITESHMB(((struct arlan_private *)netdev_priv(dev))->card->controlRegister ,(v) );} WARNING: suspect code indent for conditional statements (3, 6) + if (cr & ARLAN_CHANNEL_ATTENTION){ \ + writeControlRegister(dev, (cr & ~ARLAN_CHANNEL_ATTENTION));\ ERROR: space required before the open brace '{' + if (cr & ARLAN_CHANNEL_ATTENTION){ \ ERROR: space required after that close brace '}' + }else \ ERROR: space required before the open brace '{' +#define clearChannelAttention(dev){ \ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CHANNEL_ATTENTION);} ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_RESET);} ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_RESET);} ^ ERROR: space required before the open brace '{' +#define setInterruptEnable(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required before the open brace '{' +#define clearInterruptEnable(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_INTERRUPT_ENABLE) ;} ^ ERROR: space required before the open brace '{' +#define setClearInterrupt(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;} ^ ERROR: space required after that ';' (ctx:WxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_CLEAR_INTERRUPT) ;} ^ ERROR: space required before the open brace '{' +#define clearClearInterrupt(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_CLEAR_INTERRUPT);} ^ ERROR: space required before the open brace '{' +#define setPowerOff(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | (ARLAN_POWER && ARLAN_ACCESS));\ ^ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required before the open brace '{' +#define setPowerOn(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~(ARLAN_POWER)); } ^ ERROR: space required before the open brace '{' +#define arlan_lock_card_access(dev){\ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required after that ';' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) & ~ARLAN_ACCESS);} ^ ERROR: space required before the open brace '{' +#define arlan_unlock_card_access(dev){\ ERROR: trailing whitespace + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } $ ERROR: space required after that ',' (ctx:VxV) + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } ^ ERROR: space prohibited before that close parenthesis ')' + writeControlRegister(dev,readControlRegister(dev) | ARLAN_ACCESS ); } ERROR: trailing whitespace + $ ERROR: trailing whitespace + $ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit fa93e19dcf8600c87a60160735b1065cd4bb4dbb Author: Andrea Gelmini Date: Fri Feb 26 10:15:10 2010 +0100 Staging: comedi: dt2801.c: Checkpatch cleanup ERROR: code indent should use tabs where possible + 0 = [-10,10]$ ERROR: code indent should use tabs where possible + 0 = [-10,10]$ WARNING: braces {} are not necessary for single statement blocks + if (stat & (DT_S_COMPOSITE_ERROR | DT_S_READY)) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_COMPOSITE_ERROR) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_READY) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_COMPOSITE_ERROR) { + return stat; + } WARNING: braces {} are not necessary for single statement blocks + if (stat & DT_S_READY) { + return 0; + } WARNING: braces {} are not necessary for single statement blocks + if (!(stat & DT_S_READY)) { + printk("dt2801: !ready in dt2801_writecmd(), ignoring\n"); + } WARNING: braces {} are not necessary for single statement blocks + if (!timeout) { + printk("dt2801: timeout 1 status=0x%02x\n", stat); + } WARNING: braces {} are not necessary for single statement blocks + if (!timeout) { + printk("dt2801: timeout 2 status=0x%02x\n", stat); + } WARNING: braces {} are not necessary for any arm of this statement + if (stat == -ETIME) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 20962c10c19862c58c03eec2434279a5d104c40e Author: Andrea Gelmini Date: Fri Feb 26 10:15:09 2010 +0100 Staging: comedi: dmm32at.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (data[0] == COMEDI_OUTPUT) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 882e5b32b5d68960f46331215fc3c301df508110 Author: Andrea Gelmini Date: Fri Feb 26 10:15:08 2010 +0100 Staging: comedi: cb_pcimdas.c: more Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (fifo_empty) { + break; + } WARNING: braces {} are not necessary for single statement blocks + if (irq) { + printk(", irq %u", irq); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit ecd89ddcabf8646651f152155bff5f8bed9c6e92 Author: Andrea Gelmini Date: Fri Feb 26 10:15:07 2010 +0100 Staging: comedi: das6402.c: Checkpatch cleanup ERROR: Macros with complex values should be enclosed in parenthesis +#define N_WORDS 3000*64 Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit dd105f08c0e9d4081629f96b09abadc0bb51e0d8 Author: Andrea Gelmini Date: Fri Feb 26 10:15:06 2010 +0100 Staging: comedi: hwdrv_apci3120.c: Checkpatch cleanup ERROR: do not initialise statics to 0 or NULL +static unsigned int ui_Temp = 0; WARNING: braces {} are not necessary for any arm of this statement + if (data[1]) { [...] + } else [...] WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < devpriv->ui_AiNbrofChannels; i++) { + devpriv->ui_AiChannelList[i] = data[4 + i]; + } ERROR: that open brace { should be on the previous line + } else /* EOC */ + { WARNING: braces {} are not necessary for any arm of this statement + if (data[1]) { [...] + } else { [...] ERROR: that open brace { should be on the previous line + if (insn->unused[0] == 222) /* second insn read */ + { WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < insn->n; i++) { + data[i] = devpriv->ui_AiReadData[i]; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT) { + err++; + } ERROR: that open brace { should be on the previous line + if (cmd->scan_begin_src == TRIG_TIMER) /* Test Delay timing */ + { ERROR: that open brace { should be on the previous line + if (cmd->convert_src == TRIG_TIMER) /* Test Acquisition timing */ + { WARNING: braces {} are not necessary for any arm of this statement + if (cmd->stop_src == TRIG_COUNT) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->b_ExttrigEnable == APCI3120_ENABLE) { + i_APCI3120_ExttrigEnable(dev); /* activate EXT trigger */ + } WARNING: braces {} are not necessary for single statement blocks + if (dmalen0 > (devpriv->ui_AiDataLength)) { + dmalen0 = devpriv->ui_AiDataLength; + } WARNING: braces {} are not necessary for single statement blocks + if (dmalen1 > (devpriv->ui_AiDataLength)) { + dmalen1 = devpriv->ui_AiDataLength; + } WARNING: braces {} are not necessary for any arm of this statement + if (CR_RANGE(chanlist[i]) < APCI3120_BIPOLAR_RANGES) { [...] + } else { [...] ERROR: that open brace { should be on the previous line + if (devpriv->b_EocEosInterrupt == APCI3120_ENABLE) /* enable this in without DMA ??? */ + { ERROR: that open brace { should be on the previous line + if (data[0] == APCI3120_TIMER) /* initialize timer */ + { ERROR: that open brace { should be on the previous line + } else /* Initialize Watch dog */ + { ERROR: that open brace { should be on the previous line + if (data[0] == 2) /* write new value */ + { ERROR: that open brace { should be on the previous line + if (devpriv->b_Timer2Mode == APCI3120_TIMER) /* start timer */ + { ERROR: that open brace { should be on the previous line + } else /* start watch dog */ + { ERROR: that open brace { should be on the previous line + if (devpriv->b_Timer2Mode == APCI3120_TIMER) /* start timer */ + { ERROR: that open brace { should be on the previous line + } else /* Read watch dog status */ + { WARNING: braces {} are not necessary for single statement blocks + if (!devpriv->b_OutputMemoryStatus) { + ui_Temp = 0; + + } /* if(!devpriv->b_OutputMemoryStatus ) */ ERROR: code indent should use tabs where possible + data[0] Value to be written$ ERROR: code indent should use tabs where possible + data[1] :1 Set digital o/p ON$ ERROR: code indent should use tabs where possible + data[1] 2 Set digital o/p OFF with memory ON$ ERROR: that open brace { should be on the previous line + if (ui_Range) /* if 1 then unipolar */ + { ERROR: that open brace { should be on the previous line + } else /* if 0 then bipolar */ + { ERROR: that open brace { should be on the previous line + do /* Waiting of DA_READY BIT */ + { Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit d539047c7bb3d462b4b505accbb3cc31dce87801 Author: Andrea Gelmini Date: Fri Feb 26 10:15:05 2010 +0100 Staging: comedi: das08_cs.c: Checkpatch cleanup ERROR: code indent should use tabs where possible + NONE$ ERROR: do not initialise statics to 0 or NULL +static struct pcmcia_device *cur_dev = NULL; Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 426054ce11ecb416048aa0f92628fa4ba93c3a0e Author: Andrea Gelmini Date: Fri Feb 26 10:15:04 2010 +0100 Staging: comedi: contec_pci_dio.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (dev->iobase) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit f1c54e82726fe51a55a18d15dc9377b8fd568ca2 Author: Andrea Gelmini Date: Fri Feb 26 10:15:03 2010 +0100 Staging: comedi: cb_pcimdda.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (it->options[2]) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->registers) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 7c2f1946a5d41da3cfc1696944aaa420db5b5145 Author: Andrea Gelmini Date: Fri Feb 26 10:15:02 2010 +0100 Staging: comedi: cb_pcimdas.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (thisboard->has_dio) { [...] + } else { [...] WARNING: braces {} are not necessary for single statement blocks + if (devpriv->BADR0) { + comedi_pci_disable(devpriv->pci_dev); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit e3a21d0ac2ee4f6c1be5314e76939867a2d0b470 Author: Andrea Gelmini Date: Fri Feb 26 10:15:01 2010 +0100 Staging: comedi: cb_pcidio.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (devpriv->dio_reg_base) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < thisboard->n_8255; i++) { + subdev_8255_cleanup(dev, dev->subdevices + i); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 20db7d7de7027ddee5df1b51b3d013568273b9df Author: Andrea Gelmini Date: Fri Feb 26 10:15:00 2010 +0100 Staging: comedi: cb_pcidda.c: Checkpatch cleanup WARNING: braces {} are not necessary for single statement blocks + if (devpriv->dac) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + if (inw_p(devpriv->dac + DACALIBRATION1) & SERIAL_OUT_BIT) { + value |= 1 << (value_width - i); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < max_num_caldacs; i++) { + cal2_bits |= DESELECT_CALDAC_BIT(i); + } WARNING: braces {} are not necessary for single statement blocks + for (i = 0; i < max_num_caldacs; i++) { + cal2_bits |= DESELECT_CALDAC_BIT(i); + } Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 2d238b2972bf365153ae8d699177c7a19a5f3056 Author: Andrea Gelmini Date: Fri Feb 26 10:14:59 2010 +0100 Staging: comedi: cb_pcidas.c: Checkpatch cleanup ERROR: "foo * bar" should be "foo *bar" + uint8_t * data); WARNING: braces {} are not necessary for single statement blocks + if (devpriv->s5933_config) { + comedi_pci_disable(devpriv->pci_dev); + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->count = cmd->chanlist_len * cmd->stop_arg; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->ao_count = cmd->chanlist_len * cmd->stop_arg; + } WARNING: braces {} are not necessary for single statement blocks + if (cmd->stop_src == TRIG_COUNT) { + devpriv->ao_count -= num_points; + } WARNING: braces {} are not necessary for single statement blocks + if (dev->attached == 0) { + return IRQ_NONE; + } WARNING: braces {} are not necessary for single statement blocks + if ((status & (INT | EOAI | LADFUL | DAHFI | DAEMI)) == 0) { + comedi_error(dev, "spurious interrupt"); + } WARNING: braces {} are not necessary for single statement blocks + if (status & (DAHFI | DAEMI)) { + handle_ao_interrupt(dev, status); + } WARNING: braces {} are not necessary for single statement blocks + if (async->cmd.stop_src == TRIG_COUNT) { + devpriv->ao_count -= num_points; + } ERROR: "foo * bar" should be "foo *bar" + uint8_t * data) Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 882e1233a1abb650149496b33eaeb1d09bbc0b7a Author: Andrea Gelmini Date: Fri Feb 26 10:14:58 2010 +0100 Staging: comedi: hwdrv_apci1032.c: Checkpatch cleanup ERROR: do not initialise externals to 0 or NULL +unsigned int ui_InterruptStatus = 0; WARNING: braces {} are not necessary for single statement blocks + else { + outl(0x6, devpriv->iobase + APCI1032_DIGITAL_IP_IRQ); + } /* else if(data[1] == ADDIDATA_OR) */ WARNING: braces {} are not necessary for single statement blocks + if (data[1] == 1) { + *data = ui_InterruptStatus; + } /* if(data[1]==1) */ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit a9ecb5bb5847b084d6d8bf5c60549fd5598c053a Author: Andrea Gelmini Date: Fri Feb 26 10:14:57 2010 +0100 Staging: comedi: addi_common.h: Checkpatch cleanup ERROR: code indent should use tabs where possible + const struct comedi_lrange *pr_AiRangelist;^I/* rangelist for A/D */$ ERROR: code indent should use tabs where possible + const struct comedi_lrange *pr_AoRangelist;^I/* rangelist for D/A */$ Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 015fadba7c30a082cc8efa0f353be096b75e3952 Author: Andrea Gelmini Date: Fri Feb 26 10:14:56 2010 +0100 Staging: comedi: addi_amcc_S5920.c: Checkpatch cleanup WARNING: braces {} are not necessary for any arm of this statement + if (i_Counter == 0) { [...] + } else { [...] Signed-off-by: Andrea Gelmini Signed-off-by: Greg Kroah-Hartman commit 48d07f2bf3fd6d0bbe7577f1844f7edfaf7399f6 Author: d binderman Date: Sun Feb 21 10:02:59 2010 +0000 Staging: comedi: amplc_pci224.c: coding style cleanups Signed-off-by: David Binderman Signed-off-by: Greg Kroah-Hartman commit 02c7b237f6a01f580319187d4bdbf712b27a5460 Author: Alessio Igor Bogani Date: Fri Feb 26 08:44:27 2010 +0100 Staging: Cleanup useless headers BKL isn't anymore present into these files thus it is no necessary still include smp_lock.h. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 7bd795bfcd7eb2f2962d458bf787d5ee0d1167cd Author: Florian Schilhabel Date: Fri Feb 19 20:12:12 2010 +0100 Staging: rtl8192su: use list_for_each_safe() in ieee80211_crypto_deinit Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit a99840b1aa66d3797bfe0be4fb6982bba62d815b Author: Florian Schilhabel Date: Fri Feb 19 20:11:54 2010 +0100 Staging: rtl8192su: re-enable tx-stats currently, interface statistics look like this: wlan0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx inet addr:xxx.xxx.xxx.xxx Bcast:xxx.xxx.xxx.xxx Mask:xxx.xxx.xxx.xxx UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:435 errors:0 dropped:1 overruns:0 frame:0 TX packets:0 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:456758 (446.0 Kb) TX bytes:0 (0.0 b) after re-enabling the tx-stats it looks like this: wlan0 Link encap:Ethernet HWaddr xx:xx:xx:xx:xx:xx inet addr:xxx.xxx.xxx.xxx Bcast:xxx.xxx.xxx.xxx Mask:xxx.xxx.xxx.xxx UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:1269 errors:0 dropped:1 overruns:0 frame:0 TX packets:1049 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:1000 RX bytes:1667442 (1.5 Mb) TX bytes:82606 (80.6 Kb) Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit 29a1fbc88b822497a0a4d8e9cb7d8a471e70f339 Author: Florian Schilhabel Date: Fri Feb 19 20:11:37 2010 +0100 Staging: rtl8192su: fix for rtl819xU:Error TX URB for zero byte xxx, error -2 according to 'linux device drivers', ENOENT, ECONNRESET, ESHUTDOWN are not real transmission errors. also, a little cosmetics. Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit 2f22560880786acceb6bc63cbda7125e8d9a2206 Author: Florian Schilhabel Date: Fri Feb 19 20:10:00 2010 +0100 Staging: rtl8192su: Remove Firmware from r8192SU_HWImg.c Because the Firmware is loaded from RTL8192SU/rtl8192sfw.bin, it it save, to remove it from r8192SU_HWImg.c Signed-off-by: Florian Schilhabel Signed-off-by: Greg Kroah-Hartman commit c852ab66727558e7fb9c994a12ff30cc3d0e2448 Author: Sven-Thorsten Dietrich Date: Tue Feb 23 13:59:18 2010 -0800 Staging: make drivers use spin_lock_init() This fixes some RT-triggered compile errors and typos. Signed-off-by: Sven-Thorsten Dietrich Acked-by: Marek Lindner Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 21b0838c1a03686277e0cfeda42015e4538b9ea3 Author: Ameya Palande <2ameya@gmail.com> Date: Wed Feb 24 20:18:28 2010 +0200 Staging: crystalhd: Misc improvements for crystalhd_lnx.c This patch does following improvements: 1. Follow kernel style for comments 2. Reorganize code for readability improvement 3. Use PCI helper macros 4. Use __devinit, __devexit, __devexit_p at necessary places 5. Mark functions and data as static when it is not exported Signed-off-by: Ameya Palande <2ameya@gmail.com> Cc: Naren Sankar Cc: Jarod Wilson Cc: Scott Davilla Cc: Manu Abraham Signed-off-by: Greg Kroah-Hartman commit 092579690107ffdf9b146de7e67379d8434e9bb0 Author: Jim Dog Date: Thu Feb 25 11:38:21 2010 +0000 Staging: wlan-ng: Fixed line length issues in prism2usb.c This is a patch to the prism2usb.c that fixes one line which was over the 80 character limit by wrapping it to a new line and removes a commented out configuration for a ZyDAS ZD1201 device since support for this device with this driver is now deprecated. Signed-off-by: Jim Dog Signed-off-by: Greg Kroah-Hartman commit 582de7caf578f3ed1f52bc93ad926a580af885b4 Author: Randy Dunlap Date: Thu Feb 25 14:41:22 2010 -0800 Staging/pohmelfs: fix write_inode parameter warning sparse warns that: drivers/staging/pohmelfs/inode.c:1797: warning: initialization from incompatible pointer type so fix pohmelfs_write_inode() to have the expected parameters. Signed-off-by: Randy Dunlap Cc: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 83a0f9bc658b20b06740691d9ee711c5d14b6e8a Author: Randy Dunlap Date: Thu Feb 25 09:55:03 2010 -0800 Staging: fix wlan-ng printk format warning Fix prism2fw.c printk format warning: drivers/staging/wlan-ng/prism2fw.c:209: warning: format '%d' expects type 'int', but argument 3 has type 'size_t' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 128a5d0223ebef1cb6c0d94b3f87b49e38a11443 Author: Randy Dunlap Date: Wed Feb 24 11:39:20 2010 -0800 Staging: rtl8192* needs semaphore.h The rtl8192* drivers in staging use semaphores, so they need to #include . (similar to staging-rtl8187se-needs-semaphore.h.patch) drivers/staging/rtl8192e/ieee80211/ieee80211.h:2038: error: field 'ips_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211.h:2249: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211.h:2250: error: field 'scan_sem' has incomplete type drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c:442: error: implicit declaration of function 'down' drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c:500: error: implicit declaration of function 'up' drivers/staging/rtl8192e/ieee80 211/ieee80211_softmac.c:3165: error: implicit declaration of function 'sema_init' drivers/staging/rtl8192su/ieee80211/ieee80211.h:1330: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192su/ieee80211/ieee80211.h:1331: error: field 'scan_sem' has incomplete type drivers/staging/rtl8192u/ieee80211/ieee80211.h:2010: error: field 'wx_sem' has incomplete type drivers/staging/rtl8192u/ieee80211/ieee80211.h:2011: error: field 'scan_sem' has incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 0f7cf0034c6b9aafea3605ec61145c9b54b1b208 Author: Sylvain Trias Date: Wed Feb 24 00:17:52 2010 +0100 Staging: line6: variax.c: fixed a space a "x ? a : b" coding style issue Fixed a coding style issue. Signed-off-by: Sylvain Trias Signed-off-by: Greg Kroah-Hartman commit ea12ac4fd241a141cc64683f4293f48bed84fd42 Author: Frank Mori Hess Date: Mon Feb 22 15:32:32 2010 -0500 Staging: comedi: Increased timeout for digital output dma loading Increased timeout for digital output dma loading, due to report of it being too short for some hardware. Signed-off-by: Frank Mori Hess Signed-off-by: Greg Kroah-Hartman commit 2021937c6d8ec1212b8f4fa01e86f852c9b96368 Author: OGAWA Hirofumi Date: Tue Feb 23 03:04:42 2010 +0900 Staging: comedi: serial2002: Fix filp_open usage Signed-off-by: OGAWA Hirofumi Signed-off-by: Greg Kroah-Hartman commit 9f7a344b69485dc1052534a4e1b2e5a8f7de086e Author: Benjamin Adolphi Date: Sun Feb 21 21:51:00 2010 +0100 Staging: comedi: amplc_pc236: Checkpatch cleanups This fixes all checkpatch issues in the amplc_pc236 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 669c930c8fe266917865f923db51c3b654ab78a3 Author: Benjamin Adolphi Date: Sun Feb 21 21:44:57 2010 +0100 Staging: comedi: amplc_dio200: Checkpatch cleanups This fixes all checkpatch issues in the amplc_dio200 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit e20ad20d849eb902628553be1fd2dc9ccc40a4bd Author: Benjamin Adolphi Date: Sun Feb 21 21:25:33 2010 +0100 Staging: comedi: aio_iiro_16: Checkpatch cleanups This fixes all checkpatch issues in the aio_iiro_16 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit e41a6f6d9cb7404420d596f27609a3f4f55dcaf5 Author: Stewart Robertson Date: Sun Feb 21 10:13:21 2010 +0000 Staging: comedi: fix coding style issues in ni_labpc.c This is a patch to the ni_labpc.c file that fixes the brace warnings and comments over 80 characters found by the checkpatch.pl tool. Some code still goes over 80 characters because I didn't know what to do with it. Signed-off-by: Stewart Robertson Signed-off-by: Greg Kroah-Hartman commit af71b816cdc623bc7c0b616ededbf3dadaf03156 Author: Marek Lindner Date: Fri Feb 19 16:18:11 2010 +0100 Staging: batman-adv: fix module initialization Make sure that batman-adv does not process packets before its initialization is complete. Some sanity checks added to the receiver function. Signed-off-by: Marek Lindner Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit da6d6c7ac366ad3189e494cd78376db7a4f40d59 Author: Marek Lindner Date: Fri Feb 19 16:18:10 2010 +0100 Staging: batman-adv: avoid crash on memory allocation error skb_share_check() returns NULL if it can't allocate more memory but it still frees the skbuff. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 8d03847c090b12694fb9fa81dbefa7b3e4f10f1d Author: Andrew Lunn Date: Fri Feb 19 16:18:09 2010 +0100 Staging: batman-adv: Fix skbuff leak in VIS code. The vis code takes a copy of the data inside the skbuf if it is interesting for us, so we always need to release the skbuf. Reported-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 837b8248f6206a6b08b3d6defe2946282e432679 Author: Linus Luessing Date: Fri Feb 19 16:18:08 2010 +0100 Staging: batman-adv: atomic variable for vis-srv activation This fixes the bug discovered by Marek Lindner which did not allow turning on the vis-server before an interface has been added. With this patch we are using a global atomic variable for activating and deactiating the vis-server-mode, which can be used before inserting an interface. Signed-off-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit bc0ad071a788625abb23aee4cb3c07d17d501641 Author: Marek Lindner Date: Fri Feb 19 16:18:07 2010 +0100 Staging: batman-adv: remove obsolete variables This patch removes a variable that became obsolete since the skb handling replaced the packet handling thread. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 149de2e58b53cb87c9637a46441c477f0caf74bd Author: Marek Lindner Date: Fri Feb 19 16:18:06 2010 +0100 Staging: batman-adv: avoid having the same error message more than once The routing code has 2 sections which warn about ttl exceeded. The corresponding warnings were identical which makes it hard to debug. In addition, batman-adv does not need to warn about ttl exceeded in case we encountered an echo request as this is commonly used to generate traceroute graphs. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit eb50081d8fb76d5de9d65628d7f41977ece7044b Author: Simon Wunderlich Date: Fri Feb 19 16:18:05 2010 +0100 Staging: batman-adv: don't lock while sending packets As in other parts of batman-adv, we should not lock while sending a packet but keep the lock held for as short as possible. Additionally, we should check whether the interface is active, otherwise batman_if->net_dev might not be available ... Signed-off-by: Simon Wunderlich Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 0fce64362d4f2144586e3ffcff6f259bf8abc2f8 Author: Sven Eckelmann Date: Fri Feb 19 16:18:04 2010 +0100 Staging: batman-adv: depend on NET instead of PACKET in Kconfig The code which uses the raw packet sockets was removed. The only related dependencies are the skb and netdev handling code. This is provided by NET in Kconfig. Signed-off-by: Sven Eckelmann Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 77712e5fbe2e47476823f4853d756cc5ad1dfabc Author: Mark Brown Date: Thu Feb 18 17:19:17 2010 +0000 Staging: iio: Staticise non-exported functions Staticise a number of functions which aren't exported outside their source files, and also add a __user annotation for the buffer in iio_event_chrdev_read(). Signed-off-by: Mark Brown Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 9a16a92c11e82a0a80b4847343cfb8b5c54ed6b6 Author: Graham M Howe Date: Mon Feb 15 10:04:26 2010 +0000 Staging: comedi: fix brace and 80 character coding style issue in ni_daq_700.c This is a patch to the ni_daq_700.c file that fixes up brace and 80 character warnings found by the checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit 3c2aabc41da7e9f957bc826363115a54764fb396 Author: Arthur Benilov Date: Tue Feb 16 15:41:51 2010 +0100 Staging: vme: VMIVME-7805 board support VMIVME-7805 board has a special control register that has to be used in order to activate the VME bus access via the Universe II bridge. This control register also handles endianess convertion. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 33e920d9ebaddbc9cf51cf6e1de7baa8d7b8d6dd Author: Arthur Benilov Date: Tue Feb 16 15:41:21 2010 +0100 Staging: vme: Allocate memory buffers for master windows For VME device I/O operations on master windows the user driver tends to use kern_buf buffer array which is not allocated. This causes an error when reading from master window device files. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 5188d74cc4597a63a0907b8996ca0a2d36f1b970 Author: Arthur Benilov Date: Tue Feb 16 15:40:58 2010 +0100 Staging: vme: Use A24 when requesting slave resource When requesting slave resources A16 addressing mode flag is used to find available windows. Since the ca91cx42 bridge only supports two A16 slave windows but four are requested, the driver fails to initialize. The flag has been changed to A24, which is supported by all slave windows. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 877de4b4866f1cc0a25a4d67d3927304556f5d1f Author: Arthur Benilov Date: Tue Feb 16 15:40:30 2010 +0100 Staging: vme: llseek support in user driver Provide vme_user_llseek() implementation. Signed-off-by: Arthur Benilov Signed-off-by: Vincent Bossier Acked-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit bb9ea89ec8a3d80a835d53afc388ad5f67fd3cb3 Author: Martyn Welch Date: Thu Feb 18 16:22:13 2010 +0000 Staging: vme: Remove legacy unsupported code Remove the code from the drivers that we are not going to implement before submitting for review. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 25331ba2f8e36abe77211765fa879106cdbc43e6 Author: Martyn Welch Date: Thu Feb 18 15:13:45 2010 +0000 Staging: vme: ca91cx42 slot detection Sort out slot detection on the ca91cx42. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 04e10e15f9509d08c5e2194ea2ae680c013d5b63 Author: Martyn Welch Date: Thu Feb 18 15:13:38 2010 +0000 Staging: vme: Add ca91cx42 rmw support Add support for Master Read-Modify-Write cycles on the ca91cx42. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 21e0cf6d2e59e19f77096e73d83157734e7f7782 Author: Martyn Welch Date: Thu Feb 18 15:13:32 2010 +0000 Staging: vme: Correct ca91cx42 resource handling The ca91cx42 driver currently incorrectly handles master windows, setting and retrieving the sizing parameters incorrectly. Also, in the slave window handling, it uses an incorrectly set variable. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 4860ab74d4d577d21fbfe0da3bd0925f3efc8907 Author: Martyn Welch Date: Thu Feb 18 15:13:25 2010 +0000 Staging: vme: add ca91cx42 dma support Add support for the DMA controller in the ca91cx42 bridge. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 2b82beb8c1bc81b3dde69d16cacbc22546681acf Author: Martyn Welch Date: Thu Feb 18 15:13:19 2010 +0000 Staging: vme: Add location monitor support for ca91cx42 Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 8fafb47638012d93134d0ff38adcc5fc661beeb1 Author: Martyn Welch Date: Thu Feb 18 15:13:12 2010 +0000 Staging: vme: Make vme_master_resource naming bus neutral The vme_master_resource structure contains an item called "pci_resource". Rename to make bus agnostic. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 29848ac9f3b33bf171439ae2d66d40e6a71446c4 Author: Martyn Welch Date: Thu Feb 18 15:13:05 2010 +0000 Staging: vme: Enable drivers to handle more than one bridge At the moment the vme bridge drivers are written in a way that only allows them to support one bridge at a time. Modify the drivers to enable more than one bridge to be present per board. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 4f723df45d3952c485ee0125fb6797ad615901c3 Author: Martyn Welch Date: Thu Feb 18 15:12:58 2010 +0000 Staging: vme: Attribute Testing For Dma Request Check the directions in which the DMA controller is expected to operate before giving control of a resource. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit 66bd8db52ab48e7189e02d4bf1f23109cc1ede70 Author: Martyn Welch Date: Thu Feb 18 15:12:52 2010 +0000 Staging: vme: Renaming following split of GE Fanuc joint venture This patch corrects author email addresses and Copyright notices as a result of the split up of the GE Fanuc joint venture. Signed-off-by: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit a94f530a5ee36f72e0377d081023b8d23dacf7ce Author: Randy Dunlap Date: Tue Feb 16 14:59:07 2010 -0800 Staging: rtl8187se: needs semaphore.h rtl8187se needs to include semaphore.h to prevent build errors: drivers/staging/rtl8187se/ieee80211/ieee80211.h:1004: error: field 'wx_sem' has incomplete type drivers/staging/rtl8187se/ieee80211/ieee80211.h:1005: error: field 'scan_sem' has incomplete type Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit bd80816b2877879d36011815858c8681408cc625 Author: Bernie Thompson Date: Mon Feb 15 06:46:48 2010 -0800 Staging: udlfb: remove printk and small cleanup Remove last remaining printk and clarify comments Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit dd8015f1c83bfde9966c86a5958abd466a304398 Author: Bernie Thompson Date: Mon Feb 15 06:46:35 2010 -0800 Staging: udlfb: explicit dependencies and warnings Specify Kconfig dependencies, and include warnings for building as a module udlfb is dependent on FB_DEFERRED_IO, FB_SYS_*, and FB_MODE_HELPERS Because many kernels do not include defio (which cannot be built as a module), yet users want to be able to build udlfb as a module later, udlfb has ifdefs and these dependency warnings to help udlfb build with or without certain dependencies, but also print warnings for any lost function. Even though this kind of flexibility isn't common, we've gotten feedback from a significant portion of users that they were frustrated without it. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 3e8f3d6fa672896096068296658a769649186150 Author: Bernie Thompson Date: Mon Feb 15 06:46:26 2010 -0800 Staging: udlfb: Support for fbdev mmap clients (defio) Add support for fbdev mmap clients who don't send damage ioctls Because DisplayLink devices are out on the other end of usb, their "framebuffer" is just normal system memory. So memory mapped writes don't automatically trigger anything. So up to this point, standard fbdev clients who rely on mmap() will get an unchanging screen. This patch makes udlfb a client of Jaya Kumar's defio framework - which sets up page fault triggers, and those faults are accumulated and sent to udlfb on a defferred basis, to process as damage notifications for the framebuffer. Because this involves more overhead than a notification directly from the application (e.g. just passing on X DAMAGE extension notifications), a sysfs attribute is provided by udlfb to control defio support. /sys/class/graphics/fb*/use_defio - writing a "0" to this file before calling mmap() causes defio to not be initialized - instead udlfb will rely on getting damage notifications directly through the damage ioctl. There are unsolved rendering problems with defio (horizontal dead regions on framebuffer, that accumulate over time) which still needs a fix. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 530f43a8a69d9fa10ec6d30652244bb5e2a29694 Author: Bernie Thompson Date: Mon Feb 15 06:46:21 2010 -0800 Staging: udlfb: improved rendering performance Rework rendering for improved performance Approx 10-20% gain avg across several "benchmarks": x11perf, gtkperf, glxgears Moves from a single pre-alloc'd urb protected by a long-held mutex To a list of (4) pre-alloc'd urbs which can be dispatched asynchonously Improved rendering algorithm to hardware with lower CPU consumption, fewer system memory accesses, and slightly higher compression. Better scalability to multiple processors, especially with multiple framebuffers active. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 2469d5dbcafe064859475a8aaf8da00ab33d440c Author: Bernie Thompson Date: Mon Feb 15 06:46:13 2010 -0800 Staging: udlfb: Rework startup and teardown to fix race conditions Rework probe to use refcounts and std functions Because the different parts of the driver (usb, fbdev) tear down in different orders, the driver previously could crash accessing data that had already been freed. Refcounting system used to handle. Reworked probe to make use of refcounts, set mode using std fbops, and set up sysfs and pre-allocated urbs. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 7d9485e2c53caaaed9606a39de1c2746cc9ba262 Author: Bernie Thompson Date: Mon Feb 15 06:46:08 2010 -0800 Staging: udlfb: Add functions to expose sysfs metrics and controls Add sysfs controls for edid and performance metrics There are 8 new files exposed in /sys/class/graphics/fb* edid - returns 128 byte edid blog, suitable for parsing with parse-edid metrics_bytes_identical metrics_bytes_rendered metrics_bytes_sent metrics_cpu_kcycles_used metrics_misc and metrics_reset, which resets all perf metrics to zero The 6 perf metrics are of type atomic_t. So these metrics return precise results for short benchmarks, but any test approx a minute or longer runtime may roll over. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 4574203f45eb26b3fd76a171a77dd298dc1dc1ae Author: Bernie Thompson Date: Mon Feb 15 06:46:04 2010 -0800 Staging: udlfb: clean up function naming Move to more consistent naming scheme All udlfb functions start with udlfb_ All functions for udlfb's fbdev interface start with udlfb_ops_ All functinos for udlfb's usb interface start with udlfb_usb_ Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 4a4854dd2049ddc066a162a0f843dc2a78481060 Author: Bernie Thompson Date: Mon Feb 15 06:45:55 2010 -0800 Staging: udlfb: pre-allocated urb list helpers Add functions to pre-allocate and free usb bulk urbs for core render path. Udlfb currently allocates a single urb, guarded by a mutex, that is a key bottleneck. Because udlfb sends so much data, preallocation is most efficient. Functions will be used by new rendering functions in later patches. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit cc403dc67d10b895fec14b837fa2a6cb6ee6c8bd Author: Bernie Thompson Date: Mon Feb 15 06:45:49 2010 -0800 Staging: udlfb: reorganize function order Reorganize the location of a few things to be closer to related code Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 1d31a9ee698f9b8d72c5813fe62a5184197443c3 Author: Bernie Thompson Date: Mon Feb 15 06:45:43 2010 -0800 Staging: udlfb: checkpatch cleanup Eliminate checkpatch.pl warnings and errors so later patches in series are clean Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit cd18964a1d67c4989474ffca0109ef1c0f8502a3 Author: Larry Finger Date: Sun Feb 14 22:07:57 2010 -0600 Staging: r8187se: Remove dead code from r8185b_init.c Remove dead code from r8185b_init.c. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 8daba6b94dce76254b10de0a9a777f792a120322 Author: Larry Finger Date: Sun Feb 14 22:04:56 2010 -0600 Staging: r8187se: Remove two private variables that have a fixed value For the RTL8187SE, the variable priv->rf_chip is always RF_ZEBRA4 and priv->RegThreeWireMode is always HW_THREE_WIRE_SI. Remove these 2 variables. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit b1b7621b08e49638aa65b5f67cdd35478f00a4c4 Author: Larry Finger Date: Sun Feb 14 21:55:16 2010 -0600 staging: r8187se: Remove write_phy routine Remove a routine that is not used. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 5dd8acc8fd6b0476a2dc49bc6de4712d22c368c0 Author: Svenne Krap Date: Sun Feb 14 18:59:00 2010 +0100 Staging: wlan-ng: multiple safe style cleanups Cleanups as suggested by checkpatch.pl utiltiy. .o's from before and after cleanup have matching SHA1s. Signed-off-by: Svenne Krap Signed-off-by: Greg Kroah-Hartman commit 46800b225f8c9dc264e1e9c15b1e104b9e0af5b5 Author: Svenne Krap Date: Sun Feb 14 18:59:42 2010 +0100 Staging: wlan-ng: clean up assignments in if statements Trivial changes to code-paths. Signed-off-by: Svenne Krap Signed-off-by: Greg Kroah-Hartman commit bc2955ddf48d2da94019680fa46deae88d39b40e Author: Graham M Howe Date: Sat Feb 13 20:21:43 2010 +0000 Staging: comedi: bracing fix to ni_atmio.c This is a patch to ni_atmio.c file to fix up bracing style problems found by checkpatch.pl tool Signed-off-by: Graham M Howe Signed-off-by: Greg Kroah-Hartman commit cd9d25ba31b2def7f84da1e3cedf21e8ebb90722 Author: Dan Carpenter Date: Fri Feb 12 14:48:01 2010 +0300 staging: vt6655: add missing curly braces It's clear from the indent levels and the context that there are supposed to be curly braces here. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 6de92dd6495e36c0c2cddbee3e7c6a49f608e7cf Author: Larry Finger Date: Thu Feb 11 14:41:24 2010 -0600 Staging: r8187se: Fix for LED not following radio switch The current driver does not follow the state of the RF switch. Signed-off-by: Larry Finger Signed-off-by: Greg Kroah-Hartman commit 742821ce5fdf691826154fe72ba0884f71a40982 Author: Larry Finger Date: Thu Feb 11 12:07:35 2010 -0600 staging: r8187se: Change to use common eeprom routines in EEPROM_93CX The TODO list includes switching this driver to use the common EEPROM routines in EEPROM_93CX. Signed-off-by: Larry Finger Tested by: Bernhard Schiffner Signed-off-by: Greg Kroah-Hartman commit 13a21ad18cb43574a1a642baf105afdf2a9260c4 Author: Jochen Maes Date: Thu Feb 11 17:10:42 2010 +0100 staging: dream: more Code style fixes Removed parenthesis from return statements, split up assignment and if condition Signed-off-by: Jochen Maes Cc: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 451ff3737d220a17869d7304d5735146f9cc587f Author: Jochen Maes Date: Wed Feb 10 10:27:14 2010 +0100 staging: dream: another Codestyle patch Fixed code style issues. Signed-off-by: Jochen Maes Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit df16b962f06724f006ff06aa9e69971113e2fa46 Author: Jochen Maes Date: Wed Feb 10 00:19:46 2010 +0100 staging: dream: Codestyle fix Fixed Codestyle issues Signed-off-by: Jochen Maes Cc: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit 326bdc6537d3f18d894745a344c44c9c34777014 Author: Benjamin Adolphi Date: Sat Feb 6 15:12:32 2010 +0100 Staging: comedi: rti800: more Checkpatch cleanups This fixes all checkpatch issues in the rti800 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 3913add413ab95b1e33738b44e9a2118afb11346 Author: Mark Allyn Date: Fri Feb 5 10:53:34 2010 -0800 Staging: rar_register: add suspend and resume functions Add suspend and resume functions (which are currently stubs returning -ENOSYS) Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 433e63c63eee9fd8ac3735ce5b41797f30d5ce58 Author: Mark Allyn Date: Fri Feb 5 10:53:18 2010 -0800 Staging: rar_register: fix checkpatch errors and debug program file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit 9cedb3924bfa3f70d0c562c65e26ce824c686fc4 Author: Mark Allyn Date: Fri Feb 5 10:53:00 2010 -0800 Staging: rar_register: fix checkpatch errors and debug header file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit bafb6f63af819269c23871ba9ca8d9eb3f6893cc Author: Mark Allyn Date: Fri Feb 5 10:52:46 2010 -0800 Staging: rar_register: provide better explanation in Kconfig Provides a better explanation of what this driver is for in the Kconfig file Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e33cc5cec039ac6aef68568c06998707bceb0953 Author: Mark Allyn Date: Fri Feb 5 10:52:26 2010 -0800 Staging: rar_register: renaming directory to rar_register Renames the directory in which the driver files are located; again for clarity. Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit ee7dfb7e245e92c011c335e7bac2474967eda192 Author: Mark Allyn Date: Fri Feb 5 10:52:09 2010 -0800 staging: rar_register: renaming driver to rar_register Patch renames rar_driver to rar_register to clarifiy and differentiate from rar_handler that will be submitted later Signed-off-by: Mark Allyn Signed-off-by: Greg Kroah-Hartman commit e37bcc0de040127281de13a84a608570355c20eb Author: Greg Kroah-Hartman Date: Thu Feb 11 17:15:14 2010 -0800 Staging: mimio: remove the mimio driver It turns out that Mimio has a userspace solution for this product using libusb, and the in-kernel driver is just getting in the way now and causing problems. So they have asked that the in-kernel driver be removed. As the staging driver wasn't quite working anyway, and Mimio supports their libusb solution for all distros, I am removing the in-kernel driver. The libusb solution can be downloaded from: http://www.mimio.com/downloads/mimio_studio_software/linux.asp Cc: Cc: Phil Hannent Cc: Marc Rousseau Cc: stable Signed-off-by: Greg Kroah-Hartman commit ef97e4ef156500eb1c26de57354ad685f0b6127b Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: fix coding style issues in dt3155_io.c This fixes up the sparse and coding style issues found in the dt3155_io.c file. No code is changed, only formatting and removing unused code. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit dcff74ce8b458792c1628ad9f3803fc648f94e11 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: replace u_int and u_long usage Use u32 and u64 instead, that's the proper thing to do. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 5d3921117d7c3bfec5a5877ba0be0430e2aec491 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:41:38 2010 -0800 Staging: dt3155: replace u_char usage Use u8 instead, that's the proper thing to do. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 062d164719fcbffae6e2fe5e7ba5ab68da12ce33 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:38:13 2010 -0800 Staging: dt3155: coding cleanups for dt3155_io.h This fixes up some coding style issues in the dt3155_io.h file Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit f721ad7a9c4cec5b151134b2ace164861aca0df9 Author: Greg Kroah-Hartman Date: Tue Feb 9 12:37:25 2010 -0800 Staging: dt3155: fix build warnings This fixes the build warnings in the dt3155 driver Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit dee86e8c9279110d787da64cbca5d4bda63d93c6 Author: Greg Kroah-Hartman Date: Sun Feb 7 08:51:51 2010 -0800 Staging: comedi: ssc_dnp: fixed a brace coding style issue Fixed a coding style issue. Created during the keynote presentation at FOSDEM 2010 Signed-off-by: Greg Kroah-Hartman commit 2d2facda0b71609be294aa1fd5f56d2cdbcbb794 Author: Benjamin Adolphi Date: Sat Feb 6 16:17:06 2010 +0100 Staging: comedi: ni_pcidio: Checkpatch cleanups This fixes almost all checkpatch issues in the ni_pcidio comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 83c41dabcca05eacc5917928a3e6a3bdfefad652 Author: Benjamin Adolphi Date: Sat Feb 6 15:08:46 2010 +0100 Staging: comedi: rti802: Checkpatch cleanups This fixes all checkpatch issues in the rti802 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 0acc516aee7b1527ad125a53deff328ef29be9e6 Author: Benjamin Adolphi Date: Sat Feb 6 15:02:50 2010 +0100 Staging: comedi: dt2815: Checkpatch cleanups This fixes all checkpatch issues in the dt2815 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d3c796fd57f33a20b2ca968e0e449382397c8dba Author: Chihau Chau Date: Fri Feb 5 15:23:48 2010 -0300 Staging: samsung-laptop: fix coding style issues This fixes some lines over 80 characters coding style issues. Signed-off-by: Chihau Chau Signed-off-by: Greg Kroah-Hartman commit e41e5d601e1c035fde488f9543c978b8ae86e1be Author: Yong Zhang Date: Fri Feb 5 21:52:40 2010 +0800 Staging: rt2860: correct onstack wait_queue_head declaration Use DECLARE_WAIT_QUEUE_HEAD_ONSTACK to make lockdep happy Signed-off-by: Yong Zhang Cc: Greg Kroah-Hartman Cc: Bartlomiej Zolnierkiewicz Cc: Alexander Beregalov Cc: David S. Miller Signed-off-by: Greg Kroah-Hartman commit 01823a13dca4de28ddb55b63c3334ff928b3abbc Author: Tim Schofield Date: Thu Feb 4 19:57:09 2010 +0000 Staging: rtl8192e: fix spacing style issues in r8180_93cx6.c This is a patch to the r8180_93cx6.c file that fixes up spacing issue warnings found by the checkpatch.pl tool Signed-off-by: Tim Schofield Signed-off-by: Greg Kroah-Hartman commit f4098b4f8ac65e0e44bbe579ac7d32b6e05ffa3b Author: Paul Elms Date: Thu Feb 4 08:24:28 2010 +0000 Staging: comedi: fix brace coding style in comedi_fops.c This patch to the comedi_fops.c file fixes a brace warning found by the checkpatch.pl tool Signed-off-by: Paul Elms Signed-off-by: Greg Kroah-Hartman commit 412bd046b0a1726f8b168d5056d21213932f9d84 Author: tony burrows Date: Tue Feb 2 16:52:49 2010 +0000 Staging: comedi: fix brace coding style issues in ni_labpc.c This patch fixes all of the brace style warnings found by the checkpatch.pl tool Signed-off-by: Tony Burrows Signed-off-by: Greg Kroah-Hartman commit c7e10c99565d7a4d2f4bcc37e7bccd6c8120a0a3 Author: Joe Perches Date: Mon Feb 1 23:22:14 2010 -0800 Staging: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 8455cd1bdba3331e07291c455ca70be33ff39860 Author: Richard Kennedy Date: Thu Feb 4 11:33:49 2010 +0000 Staging: wlan-ng: minor cleanups Remove iw_handle_def private initialisations as they are no longer need these. Signed-off-by: Richard Kennedy Signed-off-by: Greg Kroah-Hartman commit bc56894234e55ad53419cfda1bbfc401a8be3e46 Author: Joe Perches Date: Sun Jan 31 12:02:08 2010 -0800 Staging: Fix continuation line formats String constants that are continued on subsequent lines with \ are not good. Fixed a "is tryied" / tried typo Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 7df1735bebee6d1f3492c79ab110f3a6e67e0244 Author: Benjamin Adolphi Date: Mon Feb 1 00:04:14 2010 +0100 Staging: comedi: adq12b: Checkpatch cleanups 2 This fixes all checkpatch issues in the adq12b comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 27aa7320972a130ba3cd2d4004c2568e7c40f01e Author: Benjamin Adolphi Date: Sun Jan 31 23:29:28 2010 +0100 Staging: comedi: fl512: Checkpatch cleanups This fixes all checkpatch issues in the fl512 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d8dfb3882e12539f34c6eeb01dee6f425e92e892 Author: Benjamin Adolphi Date: Sat Jan 30 13:03:20 2010 +0100 Staging: comedi: ni_65xx: Checkpatch cleanups This fixes all checkpatch issues in the ni_65xx comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit c733110ae3c49a69907b89f37ff1721a157df0f3 Author: Benjamin Adolphi Date: Sat Jan 30 12:40:29 2010 +0100 Staging: comedi: ni_670x: Checkpatch cleanups This fixes all checkpatch issues in the ni_670x comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 900b78088567d2033c58d4e2433c3d2558f56b76 Author: Benjamin Adolphi Date: Fri Jan 29 00:42:30 2010 +0100 Staging: comedi: ni_660x: Checkpatch cleanups This fixes all checkpatch issues in the ni_660x comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 94941bc805d2b77e6b548b83529b3fa5e98a3636 Author: Benjamin Adolphi Date: Fri Jan 29 00:28:46 2010 +0100 Staging: comedi: poc: Checkpatch cleanups This fixes all checkpatch issues in the poc comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit b1e68ea5e1b0829037a1dc97e8a2ef4bb6e9c91d Author: Benjamin Adolphi Date: Fri Jan 29 00:17:06 2010 +0100 Staging: comedi: pcm3730: Checkpatch cleanups This fixes all checkpatch issues in the pcm3730 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 50ae2a521f60a62dce3fedfc3046064a680a6d5e Author: Benjamin Adolphi Date: Fri Jan 29 00:16:19 2010 +0100 Staging: comedi: pcm3724: Checkpatch cleanups This fixes all checkpatch issues in the pcm3724 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 1130ebbaae8ed0dcf8be707449601f8d7dbb7538 Author: Nitin Gupta Date: Thu Jan 28 21:21:35 2010 +0530 Staging: ramzswap: Update copyright notice Update copyright notice. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit c25d75a234df36446dc0d9bb3365ab8b83374d50 Author: Nitin Gupta Date: Thu Jan 28 21:19:59 2010 +0530 Staging: ramzswap: Handle case for invalid backing swap Currently, we crash (issue BUG_ON) if backing swap disk size is zero. This can happen is user specified an extended partition or simply a bad disk as backing swap. A crash is really an unpleasant surprise to user for such trivial problems. Now, we check for this condition and simply fail device initialization if this is the case. Additional cleanups: * use static for all functions * remove extra newline between functions * memset backing_swap_name to NULL on device reset Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 2e882281742f7e483e751bbbaf6c0946b5f8513f Author: Nitin Gupta Date: Thu Jan 28 21:13:41 2010 +0530 Staging: ramzswap: Remove redundant check for zero page ramzswap_free_page() already handles the case for zero filled pages. So, remove redundant logic for the same in ramzswap_write(). Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit de1a21a0f1f614dac0d8cacc13f41e32a15bba98 Author: Nitin Gupta Date: Thu Jan 28 21:13:40 2010 +0530 Staging: ramzswap: Return proper error code on device create failure Currently, we return 0 if create_device() fails and 1 otherwise. Now, proper error code is returned from create_device() and the same is propagated as module error code from ramzswap_init(). Also added some cleanups for ramzswap_init(), improving function structure. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 5d83d5a0b5ee332b724978d657c0af17f14e807e Author: Nitin Gupta Date: Thu Jan 28 21:13:39 2010 +0530 Staging: ramzswap: Set block size to PAGE_SIZE ramzswap block size needs to be set equal to PAGE_SIZE to avoid receiving any unaligned block I/O requests (happens due to readahead logic during swapon). These unaligned accesses produce unnecessary I/O errors, scaring users. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 7eef7533909f3ea50e8b375777242f778e8da11e Author: Nitin Gupta Date: Thu Jan 28 21:13:38 2010 +0530 Staging: ramzswap: Flush block device before reset Make sure we flush block device before freeing all metadata during reset ioctl. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 6a90772886d5d6812f9b2775d3caa0dc002754e0 Author: Nitin Gupta Date: Thu Jan 28 21:13:37 2010 +0530 Staging: ramzswap: Use lock for 64-bit stats 64-bit stats corruption was observed when ramzswap was used on SMP systems. To prevent this, use separate spinlock to protect these stats. Also, replace stat_*() with rzs_stat*() to avoid possible conflict with core kernel code. Eventually, these will be converted to per-cpu counters if this driver finds use on large scale systems and this locking is found to affect scalability. Signed-off-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 1994130e4f881696aad562429fbbafeb73418e5a Author: Larry Finger Date: Mon Jan 25 13:11:49 2010 -0600 Staging: r8187se: Fix a faulty if and do additional cleanups Cleanup the driver and fix a faulty if statement. Signed-off-by: Larry Finger Tested by: Bernhard Schiffner Signed-off-by: Greg Kroah-Hartman commit e501b36bdf85212d537b30babf60dfedf3fdcebd Author: d binderman Date: Tue Jan 26 10:00:25 2010 +0000 Staging: otus: fix memory leak Fix memory leak in drivers/staging/otus Signed-off-by: David Binderman commit 411a861fc4f92cf0f5039928b448dcc7ca31d423 Author: Himanshu Date: Sat Jan 23 17:52:02 2010 +0530 Staging: usbip: Seperate usbip config debug from CONFIG_USB_DEBUG Signed-off-by: Himanshu Signed-off-by: Greg Kroah-Hartman commit a439f5bff51d3e0c93d61ee6886b9dbf29a03da9 Author: Himanshu Chauhan Date: Sat Jan 23 10:36:56 2010 +0530 Staging: usbip: Remove dead code This patch removes the dead uncompiled code in usbip_common.c Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit aad86577b829be29048e0a692e1c28c3ffeda6ca Author: Himanshu Chauhan Date: Sat Jan 23 02:52:41 2010 +0530 Staging: usbip: use print_hex_dump() instead of open coding it. Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit 1e5065dbd6fe53b46d8281db7b4286751dcf607a Author: Himanshu Chauhan Date: Sat Jan 23 01:51:57 2010 +0530 Staging: usbip: minor code cleanup Signed-off-by: Himanshu Chauhan Signed-off-by: Greg Kroah-Hartman commit 22e0967f72494564e416b157568ed5876666ad26 Author: Alan Cox Date: Mon Jan 18 15:35:35 2010 +0000 Staging: et131x_kill MAC_STAT_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit bd03d0d5bc253533a6d169a82f56626d552d9471 Author: Alan Cox Date: Mon Jan 18 15:35:30 2010 +0000 Staging: et131x: kill off the rxmac ctrl type Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit fef5ba3ae9760fdc2688b7160fa056e7ef2700bb Author: Alan Cox Date: Mon Jan 18 15:35:24 2010 +0000 Staging: et131x: kill the rxmac ERROR_REG_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dcb0789bb344b76fdeb32876f1e498a5cd19ecc1 Author: Alan Cox Date: Mon Jan 18 15:35:19 2010 +0000 Staging: et131x: Kill MIF_CTL_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 370d52acf7f2a8f4fccbf9fa49defd6e364ae1f3 Author: Alan Cox Date: Mon Jan 18 15:35:13 2010 +0000 Staging: et131x: Kill the SPACE_AVAIL type Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f7ae1957cac1388e7bbe070b13a5f5f5a98107d2 Author: Alan Cox Date: Mon Jan 18 15:35:08 2010 +0000 Staging: et131x: Kill off the rxq_diag types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 287acb63a593c9872005824d6866937617624668 Author: Alan Cox Date: Mon Jan 18 15:35:02 2010 +0000 Staging: et131x: Kill of the MCIF types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit b186f33137a124b3d10bcd7b9b35d76247b82014 Author: Alan Cox Date: Mon Jan 18 15:34:57 2010 +0000 Staging: et131x: kill off RXMAC_PF_CTRL_t Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 70a29a24088211369169b6285f33795be4d3a616 Author: Alan Cox Date: Mon Jan 18 15:34:51 2010 +0000 Staging: et131x: Kill rxmac crc fields More we don't need Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit afa7e5ec93b4e9e991fd3feb0bda2589f785e357 Author: Alan Cox Date: Mon Jan 18 15:34:46 2010 +0000 Staging: et13x: kill off TXMAC_ERR_INT_t This completes the structures within the txmac block so we can now propogate a name change and type removal up a layer and clean up TXMAC as well Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 003e52e85b1cf04c0bccc70c124d67aea3036fda Author: Alan Cox Date: Mon Jan 18 15:34:40 2010 +0000 Staging: et131x: Kill off the TXMAC_ERR_t type This is another one we don't really need to do much to get rid of Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1cb180dc9dadf7739fe5bf9a8f159097abb67590 Author: Alan Cox Date: Mon Jan 18 15:34:35 2010 +0000 Staging: et131x: kill txmac err count typedef Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 6720949d55623cb8c4cb6b06f218d8be68780a6f Author: Alan Cox Date: Mon Jan 18 15:34:29 2010 +0000 Staging: et131x: Kil the txmac type Only used for one trivial thing so turn that into something trivial instead Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 69ea5fcb5e33b785f3f554db0ab0c2694da3f22f Author: Alan Cox Date: Mon Jan 18 15:34:24 2010 +0000 Staging: et131x: Collapse all the function definitions into one place We have lots of tiny files right now that could be one Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit ec7d9f61012b9ab902810d63c4b5a7c796e4ceed Author: Alan Cox Date: Mon Jan 18 15:34:18 2010 +0000 Staging: et131x: Kill unused error defines Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f1471660df8e88fa7840459e3ea28ac1f3187296 Author: Alan Cox Date: Mon Jan 18 15:34:13 2010 +0000 Staging: et131x: kill MP_ERR_COUNTERS which is unused Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8f12785dd008f4ad94e3c9aad00517e082563935 Author: Alan Cox Date: Mon Jan 18 15:34:07 2010 +0000 Staging: et131x: Kill off RX_RING_t This completes the typedef clean up of the rx specific structures, although there is plenty do on field names and the like Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 4ba64c1ba5f26a445255dd7684c175e298d84d07 Author: Alan Cox Date: Mon Jan 18 15:34:02 2010 +0000 Staging: et131x: clean up the pkt_desc_stat_t types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 8a66278cf91c9b0bfedd70865954d5fccba02237 Author: Alan Cox Date: Mon Jan 18 15:33:56 2010 +0000 Staging: et131x: Clean up the fbr lookup table All the subtypes are sane so just turn it into something struct and linux like Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 07563ac691c284a5b9402556a270b8cc14164ff8 Author: Alan Cox Date: Mon Jan 18 15:33:51 2010 +0000 Staging: et131x: Fix rx_status typing Use the proper pointer types for the higher level pointers to the rx_status object and kill casts Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit f926d216502c55e3d1089e5845045d0c16004428 Author: Alan Cox Date: Mon Jan 18 15:33:45 2010 +0000 Staging: et131x: rx_status_block_t is now clean So kill off the top level type and turn it into a struct Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit c9a8ad187a67da5892ff1155960cd14912c49efb Author: Alan Cox Date: Mon Jan 18 15:33:40 2010 +0000 Staging: et131x: kill off the rx interrupt state enum Another verbose enum we don't need Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 61aa21f208314496c4fa6c28c4a96c610831ed5e Author: Alan Cox Date: Mon Jan 18 15:33:34 2010 +0000 Staging: et131x: Clean up the rx status word types Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit dc26ffc7729e5a35c7019a6fb7d306005fdae518 Author: Alan Cox Date: Mon Jan 18 15:33:29 2010 +0000 Staging: et131x: Kill MAC_STAT_t All the contents of this type are now clean, so kill the top level type as well Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 461e0e8b15864b2f8d7b13a5bf86acf40d7a6fd6 Author: Alan Cox Date: Mon Jan 18 15:33:23 2010 +0000 Staging: et131x: Kill off MMC_t The contents of MMC_t are clean so kill off the MMC_t typedef Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 060a78a07a06d78e64a00a25f4a4a7d5fe7402d1 Author: Alan Cox Date: Mon Jan 18 15:33:18 2010 +0000 Staging: et131x: Kill off TXDMA_t All the contents are clean so kill off the top level typedefs Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 2b903327d34a48250da3f559a8906f3a55db9901 Author: Alan Cox Date: Mon Jan 18 15:33:12 2010 +0000 Staging: et131x: GLOBAL_t is now sane so kill the GLOBAL_t itself Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 254472ac59e2298fe3af9edafe291439e7756645 Author: Alan Cox Date: Mon Jan 18 15:33:07 2010 +0000 Staging: et131x: kill EXP_ROM This is another unused type for the bin Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 61d5ed8c62fcceba08812f176de233ea7c78f5da Author: Alan Cox Date: Mon Jan 18 15:33:01 2010 +0000 Staging: et131x: Kill off the rxdma type We have a clean struct of this now so turn the top level typedefs into a struct Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 1bd751c1abc1029e8a0ae63ef4f19357c735a2a3 Author: Alan Cox Date: Mon Jan 18 15:32:55 2010 +0000 Staging: et131x: Clean up rxdma_csr This is another set of flags as typedef that can be cleaned up. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 13a79c697f737c19b5dd2f642374d9f289f9b830 Author: Alan Cox Date: Mon Jan 18 15:32:50 2010 +0000 Staging: et131x: fbr_desc is now only sane types Clean up the typdef for fbr_desc itself so we know it is done Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 7d9e15eb31debad09ef055290d04e162998b766f Author: Alan Cox Date: Mon Jan 18 15:32:44 2010 +0000 Staging: et131x: kill of FBR_WORD2 This is only used meaningfully as a definition, we never mask and fetch the bits apart Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 09b25c6fa36ea3c961e75cede0f86f1fed5c33b5 Author: Alan Cox Date: Mon Jan 18 15:32:39 2010 +0000 Staging: et131x: kill off the FBR_NUM_DES type This is another 10 bit value with the high bits clear, and where the type doesn't get used anywhere properly anyway Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 5fe68019c600ac0b92475654cbee66208dddb800 Author: Dave Airlie Date: Wed Jan 20 17:29:10 2010 -0500 Staging: crystalhd: fix build on powerpc Add necessary include to fix build on PowerPC Signed-off-by: Dave Airlie Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit cffd4e16cd6e5893148c31f86d1b48db10b64baa Author: Dan Carpenter Date: Mon Jan 18 14:23:20 2010 +0300 Staging: rtl8187se: fix if statement I removed a misplace semicolon. It is clear from the indentation that TxPwrTracking87SE() was only supposed to be called if CheckTxPwrTracking() returned true. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c22202faade08b6b45f14fd86bfb57f79d73464c Author: Ben Hutchings Date: Mon Jan 18 03:25:56 2010 +0000 Staging: rt{2860,2870}sta: Use request_firmware() to load firmware When originally introduced into staging, these drivers had custom firmware-loading code which checked a version number and CRC at the end of each blob. This reintroduces those checks, using crc-ccitt instead of custom code. The removed firmware will be added to the linux-firmware.git repository. Based on work by Darren Salt . Signed-off-by: Ben Hutchings Tested-By: Darren Salt Signed-off-by: Greg Kroah-Hartman commit 8838d2560a8ccbc5e03688d55bf075793b36a04e Author: Ben Hutchings Date: Mon Jan 18 02:50:24 2010 +0000 Staging: rt2870sta: constify RTUSBMultiWrite(), RTUSBFirmwareWrite() These functions do not modify the data they are passed. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 35f077dca73132dcac2cac1706417229a68f38c3 Author: Roel Kluin Date: Sun Jan 17 16:50:10 2010 +0100 Staging: serqt_usb2: Two branches the same in qt_set_termios() Regardless of the condition, the branches executed the same code Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit a2c3fdb996a926a45622428405a042f011eb03ba Author: Roel Kluin Date: Sun Jan 17 16:44:37 2010 +0100 Staging: rt2860/sta_ioctl.c: Two branches the same in rt_ioctl_giwscan() Regardless of the condition, the branches execute the same code Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 57ac827c9b17f2cc2f0f86c4fd43c3597c40253c Author: Ian Abbott Date: Wed Jan 20 13:04:51 2010 +0000 Staging: comedi: pcl818: Remove unneeded chanlist_len check For AI command testing, the driver does not need to range-check the length of the channel list as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 64a1f7bd56e0f26bd4dd621805facffde9fbb0a3 Author: Ian Abbott Date: Wed Jan 20 13:04:50 2010 +0000 Staging: comedi: pcl816: Check channel list in AI command test Check the channel list is valid in step 5 of the AI command test. Split function check_and_setup_channel_list() in two. Also, remove unnecessary chanlist_len tests in step 3 of the AI command test as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit c203b521e64e062d94f1ced1510206c0a55d5b55 Author: Ian Abbott Date: Wed Jan 20 13:04:49 2010 +0000 Staging: comedi: pcl812: Update MUX for multi-channel AI command For multi-channel AI commands, the interrupt handler is missing code to switch to the next channel. Add some (untested) code to handle this. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 8f87b832dea11dd00f6a30aaaf934c5c93556cfe Author: Ian Abbott Date: Wed Jan 20 13:04:48 2010 +0000 Staging: comedi: adv_pci1710: Remove unneeded chanlist_len check For AI command testing, the driver does not need to range-check the length of the channel list as the comedi core has already checked it. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 61283d227c6b39e30afc6346db099521b0b64fa1 Author: Ian Abbott Date: Wed Jan 20 13:04:47 2010 +0000 Staging: comedi: adv_pci1710: Correct AI scan count and channel checks For AI commands, the internal channel list used to check incoming data was only set up partially if the channel list contained repeats. Set it up fully. Also the current scan position was not updated properly when moving a block of data from the FIFO unless a whole number of scans was moved. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit b3559cb1aa5f863e1ce9b94b518be7ddf6680e45 Author: Ian Abbott Date: Wed Jan 20 13:04:46 2010 +0000 Staging: comedi: pcl818: Correct AI scan counting and channel checks For AI commands, the scan counter should be updated after every scan. It was being updated after every sample except for DMA mode where it was being updated after every repeated segment of the channel list. Also AI commands with multiple channels were being terminated with an error prematurely except in DMA mode. This was because the driver was comparing channel numbers received from the hardware (combined with the sample value) with the expected channel numbers to check for a "channel dropout". This test was failing incorrectly because the driver was not keeping the current position within the (repeated segment of the) channel list up to date. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 13de4f000ec491b16a820e4ed59de2c98b7807be Author: Ian Abbott Date: Wed Jan 20 13:04:45 2010 +0000 Staging: comedi: pcl816: Correct AI scan counting For AI commands, the scan counter should be updated after every scan. In DMA mode, it was being updated after every repeated segment of the channel list. In non-DMA mode, it was being updated after every sample. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 7edfa10689615255e65909bb893fd8f8620cff92 Author: Ian Abbott Date: Wed Jan 20 13:04:44 2010 +0000 Staging: comedi: pcl812: Correct AI scan counting The AI scan counter should be updated after every completed scan, not after every channel. Keep track of current channel. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 6c381c5775ea5eb799bdc790dd6d6d43fe966134 Author: Roel Kluin Date: Tue Jan 19 21:46:48 2010 +0100 Staging: Comedi: G1-3 status registers not read in ni_gpct_to_660x_register() Read from the right status register Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 615d5b6c56ff6bfd6ae223e99df26cf28d55f566 Author: Benjamin Adolphi Date: Mon Jan 18 22:32:07 2010 +0100 Staging: comedi: pcl730: Checkpatch cleanups This fixes all checkpatch issues in the pcl730 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit acb60e915a68c44757e12c45a8cede11339b6172 Author: Benjamin Adolphi Date: Mon Jan 18 12:57:42 2010 +0100 Staging: comedi: pcl725: Checkpatch cleanups This fixes all checkpatch issues in the pcl725 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 186539192c37c0ebe95ddac341cf7e037b096966 Author: Benjamin Adolphi Date: Mon Jan 18 12:48:16 2010 +0100 Staging: comedi: pcl724: Checkpatch cleanups This fixes all checkpatch issues in the pcl724 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 266bfbdd3eb7f080612977f22055c82b951b179e Author: Benjamin Adolphi Date: Sat Jan 16 18:58:58 2010 +0100 Staging: comedi: pcl711: Checkpatch cleanups This fixes some checkpatch issues in the pcl711 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit f51f90300010937bc9a2455cef88366448a6e718 Author: Julia Lawall Date: Sat Jan 16 16:59:22 2010 +0100 Staging: go7007: Eliminate useless code The variable s is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 79a22d5c264f5ddfc8573aa7eb234fe62dd1ee32 Author: Benjamin Adolphi Date: Fri Jan 15 18:03:35 2010 +0100 Staging: comedi: rti800: Checkpatch cleanups This fixes some checkpatch issues in the rti800 comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 23d53b1768f9396d0e259a9b4e62bfcc03122bab Author: Benjamin Adolphi Date: Fri Jan 15 17:37:47 2010 +0100 Staging: comedi: c6xdigio: Checkpatch cleanups This fixes some checkpatch issues and some spelling mistakes in the c6xdigio comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit d2e01434fd9c01687a7cace957f182594cccc829 Author: Benjamin Adolphi Date: Fri Jan 15 12:08:01 2010 +0100 Staging: comedi: adq12b: Checkpatch cleanups This fixes some checkpatch issues in the adq12b comedi driver. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 0289bb5d18ad57e23a7be681857f070980c66790 Author: Roel Kluin Date: Thu Jan 14 21:25:56 2010 +0100 Staging: rtl8192u: ieee80211: CurrentMPDUDensity assigned to itself in HTUseDefaultSetting() CurrentMPDUDensity was designed to itself. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 3af805735a2538c38ec16014f19d19030544aaef Author: Wu Zhangjin Date: Wed Jan 6 16:33:10 2010 +0800 staging: sm7xx: remove the buggy 2D acceleration support When scrolling the screen on the console with the 2D acceleration support, the whole system may hang. for example, when copying some files from another machine to YeeLoong netbook with the sm7xx video driver via scp and when the screen output is enabled, the system may hang. Before the bug is fixed, remove the 2D acceleration! Signed-off-by: Wu Zhangjin Cc: Teddy Wang Signed-off-by: Greg Kroah-Hartman commit d5a2ffd8e8d602293339f69180aff8914c454d83 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:59 2010 +0100 staging: fix typos "couter" -> "counter" This patch was generated by git grep -l 'couter' drivers/staging | xargs -r perl -p -i -e 's/couter/counter/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9d220c6b54f3d0b141846321814ec1c4e4fbdc67 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:58 2010 +0100 staging: fix typos "aquire" -> "acquire" This patch was generated by git grep -E -i -l '[Aa]quire' drivers/staging | xargs -r perl -p -i -e 's/([Aa])quire/$1cquire/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit a82fd70197e1e59d2127e5536d6a1d502699528d Author: Uwe Kleine-König Date: Tue Jan 12 15:57:57 2010 +0100 staging: fix typos "selct" -> "select" This patch was generated by git grep -E -i -l 's(le|el)ct' drivers/staging | xargs -r perl -p -i -e 's/([Ss])(le|el)ct/$1elect/' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 1832664ae124df0c58dc26985e4963b2c39b6b05 Author: Uwe Kleine-König Date: Tue Jan 12 15:57:56 2010 +0100 staging: fix typos "enalbe" -> "enable" This patch was generated by git grep -E -l 'enalbe' drivers/staging | xargs -r perl -p -i -e 's/enalbe/enable/g' Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman commit 9f64859208f3a56f33f2e893e11df585768f1705 Author: Andy Shevchenko Date: Thu Jan 14 15:07:23 2010 +0200 staging: wlags49: don't use custom implementation of atoi() Kernel has its own method called simple_strtoul() to do such things. Here we are using simple_strtoul(value, NULL, 0) because in original function the recognized base is 10 or 16 and input data is assumed to be unsigned. Signed-off-by: Andy Shevchenko Signed-off-by: Greg Kroah-Hartman commit e4c3a24dc5c318e57e5295a54f03eb8ae54d9ffa Author: Ben Hutchings Date: Wed Jan 13 23:36:46 2010 +0000 Staging: sep: declare MODULE_FIRMWARE Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 4401e8243d2e02a991a475eea11885a56f854f69 Author: Ben Hutchings Date: Wed Jan 13 23:36:27 2010 +0000 Staging: sep: include driver name in firmware filenames The current names "cache.image.bin" and "resident.image.bin" are far too generic. Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 5d929a71908968905331cda0d52c44570d402110 Author: Ben Hutchings Date: Wed Jan 13 23:36:09 2010 +0000 staging: declare MODULE_FIRMWARE in various drivers Signed-off-by: Ben Hutchings Signed-off-by: Greg Kroah-Hartman commit 32dbb67138fdb8cefa348d29850eb9a9ce964e09 Author: Pavel Vasilyev Date: Mon Jan 11 21:08:02 2010 +0300 Staging: dream: HTC Dream camera, not need sizeof http://bugzilla.kernel.org/show_bug.cgi?id=14825 sizeof(extlen), always will be sizeof( unit32_t) or 4 It seems that something is wrong?!?! Signed-off-by: Pavel Vasilyev Signed-off-by: Greg Kroah-Hartman commit 362f46e3ab6ee4fc771da55067921c39dd13877d Author: Jeff Mahoney Date: Mon Jan 11 10:54:31 2010 -0500 Staging: vme/tsi148: Depend on VIRT_TO_BUS This driver depends on virt_to_bus working correctly, but it doesn't exist on ppc64 (and probably other arches). Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 23639126523b274e094515b609c987e927284920 Author: Jeff Mahoney Date: Mon Jan 11 10:54:30 2010 -0500 Staging: otus: fix assignment makes integer from pointer without a cast warnings This patch fixes some %x pointer printing to %p. It also uses the skb_tail_pointer and skb_mac_header macros for accessing thos members. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit ab59186c7545dcffbeda8a78b75bfcdb14c4566d Author: Jeff Mahoney Date: Mon Jan 11 10:54:29 2010 -0500 Staging: rtl8192u: dont use -mhard-float rtl8192u uses -mhard-float, which doesn't exist on ia64. Since in-kernel floating-point isn't allowed, this is implied anyway. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 1c7ec2e8e0fb6e8acda4f6b9a682cf7f8e650e2f Author: Jeff Mahoney Date: Mon Jan 11 10:54:27 2010 -0500 Staging: rtl8192e: Use skb_tail_pointer rtl8192e uses skb->tail directly. This patch uses the tail pointer macros instead. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 53cf8743d227283e78c27ada407b506014c9223d Author: Jeff Mahoney Date: Mon Jan 11 10:54:25 2010 -0500 Staging: rt2860: Use skb_tail_pointer rt2860 uses skb->tail directly. This patch uses the tail pointer macros instead. Signed-off-by: Jeff Mahoney Signed-off-by: Greg Kroah-Hartman commit 3bf040c75294ad9470b11902477e2c07af2031bd Author: Minchan Kim Date: Mon Jan 11 16:15:53 2010 +0900 Staging: ramzswap: Free memory when create_device is failed If create_device is failed, it can't free gendisk and request_queue of preceding devices. It cause memory leak. This patch fixes it. Signed-off-by: Minchan Kim Acked-by: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit b76a32638d9d7d6b421fccce02e667007509bd7b Author: Németh Márton Date: Sun Jan 10 00:18:41 2010 +0100 staging: make i2c device id constant The id_table field of the struct i2c_driver is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit a457732b836b970c82c7ba35b4cfc938c9c543f9 Author: Németh Márton Date: Sun Jan 10 00:18:34 2010 +0100 staging: make USB device id constant The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 13ac58dac0c6b1edeb060102049b07ebceea9a40 Author: Németh Márton Date: Sun Jan 10 00:18:26 2010 +0100 staging: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Németh Márton Cc: Julia Lawall Cc: cocci@diku.dk Signed-off-by: Greg Kroah-Hartman commit 75b16013e29f6058e5bd648e6f4a9c03d262cf4f Author: Jonathan Cameron Date: Sat Jan 9 17:01:33 2010 +0000 staging: iio: Fix incorrect existence check for a shared event pointer. A second smatch detected error. First part fixes in a typo in the comment directly above that I noticed whilst trying to remember what this code actually does. Second part is the actual fix. I'm fairly amazed this one never caused trouble in testing as it is in one of the most common paths. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 75c8075394906b4bda4b056328bd9b401277d9b8 Author: Jonathan Cameron Date: Sat Jan 9 16:57:34 2010 +0000 staging: iio: Ensure mutex is correctly unlocked in __iio_push_event This error was picked up by running the smatch static checker over all the IIO subsytem. Signed-off-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit 0daa04a586f03de8f9022e29fb41c9dc0de28c4a Author: Simon Horman Date: Tue Jan 12 11:50:09 2010 +1100 Staging: otus: zfTkipInit(): increment another pointer Increment the pointer rather than its value. These appear to be logic errors. Thanks to Dan Carpenter for the first hunk of this change. Cc: Dan Carpenter Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit e36e8c0add960eb523a8a1bc93c7efa744339415 Author: horms@vergenet.net Date: Fri Jan 8 18:57:52 2010 +1100 Staging: otus: Fix ZM_SEQ_DEBUG macro for no-debug case tcp_seq is only initialised in case where ZM_ENABLE_PERFORMANCE_EVALUATION is defined. So move the call to ZM_SEQ_DEBUG() and the decleration of tcp_seq in there too. This allows ZM_SEQ_DEBUG() to be removed from the non-ZM_ENABLE_PERFORMANCE_EVALUATION case in the header file. This resolves several compile warnings for the non-ZM_ENABLE_PERFORMANCE_EVALUATION case. However, the ZM_ENABLE_PERFORMANCE_EVALUATION case seems to be completely broken. $ gcc (Debian 4.4.2-8) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/otus/80211core/cagg.c: In function 'zfAggRxEnabled': drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of comma expression has no effect drivers/staging/otus/80211core/cagg.c:1872: warning: left-hand operand of comma expression has no effect drivers/staging/otus/80211core/cagg.c:1872: warning: statement with no effect ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 3db96cd871e7cfea6e671b262a8ef661b27dadf1 Author: horms@vergenet.net Date: Fri Jan 8 18:57:51 2010 +1100 Staging: otus: remove unused constants Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d74385fd9c81d2168aa3a556abcc55f5e1558626 Author: horms@vergenet.net Date: Fri Jan 8 18:57:50 2010 +1100 Staging: otus: remove unused variables Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d027936949b839a858cd822975491e19ec316621 Author: horms@vergenet.net Date: Fri Jan 8 18:57:49 2010 +1100 Staging: otus: dont mix declarations and code $ gcc (Debian 4.4.2-8) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/otus/ioctl.c: In function 'usbdrv_wpa_ioctl': drivers/staging/otus/ioctl.c:2253: warning: ISO C90 forbids mixed declarations and code ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 90d49b4f32c243215c0620162e6cae6af980047c Author: Jarod Wilson Date: Thu Jan 7 18:37:36 2010 -0500 staging: crystalhd: trim register defines We don't actually need most of the register defines to build, and most of the ones we don't need aren't currently interesting. We'll leave a full copy of all of them in libcrystalhd's source, and only include what we need and/or think might be interesting in the driver. Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit 88d43000098017d93d9bb2f88d33950e6c7a6bf4 Author: Jarod Wilson Date: Thu Jan 7 18:35:58 2010 -0500 staging: crystalhd: add missing fixes for userspace lib build I somehow managed to not actually include these two fixes in the submission that was committed to the staging tree. libcrystalhd should eventually be built against the kernel-provided header, and needs the stdint.h include. The VOID bit is to keep things in sync with the Mac OS X driver and library that Scott Davilla is also working on. Signed-off-by: Scott Davilla Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit 8a8e29752dfdba014b866d3c587d3409e57263dd Author: Peter Huewe Date: Thu Jan 7 21:21:35 2010 +0100 Staging: wlan-ng: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the p80211wext.c fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Cc: stable [2.6.33 only] Signed-off-by: Greg Kroah-Hartman commit 733acf902fbafb6571fce45ee77b1516aaae1bc6 Author: Peter Huewe Date: Fri Jan 8 09:10:13 2010 +0100 Staging: rtl8192u: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the driver fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 95702ef05b9b6554c2669bdb9a6121af9f034171 Author: Peter Huewe Date: Fri Jan 8 09:09:12 2010 +0100 Staging: otus: Add select WEXT_PRIV to Kconfig to prevent build failure Without WEXT_PRIV set the driver fails to build due to unknown fields in the iw_handler_def struct. Those fields are enclosed in WEXT_PRIV conditionals in the prototype of iw_handler_def in include/net/iw_handler.h Signed-off-by: Peter Huewe Acked-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 0df28be06e08b9a53c26a53974bf3afea4928b3e Author: Peter Huewe Date: Thu Jan 7 19:57:36 2010 +0100 Staging: asus_oled: Add NULL test for kmalloc This patch adds a NULL test to check wether kmalloc was successful or not. Signed-off-by: Peter Huewe Signed-off-by: Greg Kroah-Hartman commit c424d46fdc79df201707fe815aa8480751918025 Author: Alexander Beregalov Date: Thu Jan 7 03:21:48 2010 +0300 staging: cx25821: avoid NULL pointer dereference Assign dev only if fh is not NULL. Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman commit 267c39c918cd0c239148a281d51693f47d2e1e54 Author: Roel Kluin Date: Wed Jan 6 23:27:47 2010 +0100 Staging: v56655: add missing parentheses (in comment) `!' has a higher precedence than `&' so parentheses are required. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 9d4682d070e1f90f75cb27dd44d9cc7ab79577f1 Author: Andrew Lunn Date: Wed Jan 6 07:30:48 2010 +0100 Staging: batman-adv: Update the README for mainline usage. The module now only compiles inside mainline, so remove the comments about different versions of the kernel it can be used with. Also update comments about building with debug enabled and how to use the VIS data now that it no longer natively outputs dot or JSON. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 182374a0bddeef46769d2f8ab56fcccc433b96f3 Author: Evgeniy Polyakov Date: Wed Feb 3 01:04:30 2010 +0300 Staging: Fixed pohmelfs regression because of per-bdi writeback. Since pohmelfs isn't tied to a single block device, it needs to setup a backing dev like nfs/btrfs/etc do. Signed-off-by: Jens Axboe Signed-off-by: Evgeniy Polyakov Cc: stable Signed-off-by: Greg Kroah-Hartman commit e3c0acf44d837d3095ab8222d3271f9ba0d3db44 Author: Dan Carpenter Date: Fri Jan 8 14:51:50 2010 +0300 Staging: pohmelfs: avoid null dereference err_out_put is for when the netfs_trans_alloc() succeeded. Signed-off-by: Dan Carpenter Acked-by: Evgeniy Polyakov Signed-off-by: Greg Kroah-Hartman commit 0c14c06cc18bc0d7f968d0bf1e531bcb8ced387d Author: Joe Perches Date: Tue Jan 5 17:20:14 2010 -0800 Staging: pohmelfs: Remove uses of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Signed-off-by: Greg Kroah-Hartman commit 74e1cd4555c7b8d2fe9de657658f92f859427025 Author: Alan Cox Date: Mon Jan 4 16:25:02 2010 +0000 Staging: sep: Fix use of legacy ioctl fop SEP doesn't need lock_kernel. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit db376005ab4abe4a57fd96c8e007cf5d3b2e22bf Author: Alan Cox Date: Mon Jan 4 16:24:47 2010 +0000 Staging: sep: Fix build problems from header changes Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 274350fe401474d0c30cd10bbad74b5dbf34f4fe Author: Roel Kluin Date: Thu Dec 31 13:28:32 2009 +0100 Staging: otus: 80211core: Fix &&/|| confusion This always evaluates to true. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit f3557cc180b73308048867b591111df6436987ff Author: Benjamin Adolphi Date: Thu Dec 31 21:54:46 2009 +1300 Staging: rar: Fix all coding style issues. This fixes all coding style issues and some spelling mistakes. Signed-off-by: Benjamin Adolphi Signed-off-by: Greg Kroah-Hartman commit 88e05d854cbbd583d528be9295a74586f920492b Author: Dan Carpenter Date: Wed Dec 30 18:10:18 2009 +0200 Staging: rtl8192su: buffer overflow in r8192U_core.c There was a buffer overflow in the original code. rf_path was 2 and it should have been only 0 or 1. I don't have the hardware for this, so I can't test it. Looking at the code, there are two almost identical sections for updating the hal variables. The first one was clearly wrong and had the array overflow as well. The second one looked correct. I decided to use the second section as is except for whitespace changes. The differences between the two original sections: 1) The second one had more debug output. 2) The second one looped over rf_path instead of corrupting data. 3) The second one had these additional assigments. if (rf_path == 0) { priv->TxPowerLevelOFDM24G[i] = priv->RfTxPwrLevelOfdm1T[rf_path][i] ; priv->TxPowerLevelCCK[i] = priv->RfTxPwrLevelCck[rf_path][i]; } Signed-off-by: Dan Carpenter Cc: Jerry chuang Signed-off-by: Greg Kroah-Hartman commit 00367a6d7caae9c6b077e177aeebad5b0a91ea62 Author: H Hartley Sweeten Date: Mon Dec 28 19:38:22 2009 -0500 Staging: vt6655/device_main.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: Forest Bond Signed-off-by: Greg Kroah-Hartman commit 6756993bafb436af088dacdef92b756f5f96134e Author: H Hartley Sweeten Date: Mon Dec 28 19:33:17 2009 -0500 r8192U_core.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman commit 820793c396846e5885b0d28c68512d08b5cb77cf Author: H Hartley Sweeten Date: Mon Dec 28 19:28:11 2009 -0500 Staging: r8192E_core.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Signed-off-by: Greg Kroah-Hartman commit 28a2333413b2fbb74b35d55e1dd8c349dc825a16 Author: H Hartley Sweeten Date: Mon Dec 28 19:21:34 2009 -0500 Staging: et131x_netdev.c: use %pM to shown MAC address Trivial, use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten Cc: Olaf Hartmann Signed-off-by: Greg Kroah-Hartman commit 1c7e4a7c326c916918b5a29051db4f93973e775a Author: Dan Carpenter Date: Mon Dec 28 19:01:34 2009 +0200 Staging: otus: off by one in usbdrvwext_siwessid() A 33 char ESSID is too long and it could cause a buffer overflow a couple lines below when we put a NULL terminator on the end. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ed30013207ef3e36da4f39db1298ae53f799e29c Author: Dan Carpenter Date: Mon Dec 28 19:00:24 2009 +0200 Staging: cx25821: off by one in cx25821_enum_input() The INPUT(n) macro indexes an array of size 2. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 7a02f549fcc30fe6be0c0024beae9a3db22e1af6 Author: Dan Carpenter Date: Mon Dec 28 18:59:46 2009 +0200 Staging: cx25821: fix double unlock in medusa_video_init() medusa_set_videostandard() takes the lock but it always drops it before returning. This was found with a static checker and compile tested only. :/ Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 4b2ba24399cfcd7c80a20cd3bbedc5df0ebd4345 Author: Dan Carpenter Date: Mon Dec 28 18:59:01 2009 +0200 Staging: comedi: reorder check in pcmmio_attach() The check for dio_num_asics is used to determine if there is more than 1 irq. If it is false then irq[1] is past the end of the array. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 5d3aed742498ffe5692e3f974f3f7ea0e99a93bb Author: Dan Carpenter Date: Mon Dec 28 18:57:51 2009 +0200 Staging: comedi: off by one in doDevConfig() Changed > to >= to avoid array overflow. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit ef4ffb7ade54f7669172cf5cead69695e588c06a Author: C yp Date: Wed Jan 6 13:42:00 2010 +0100 Staging: ramzswap: Minor spelling fixes Also removed an extra semicolon. Signed-off-by: Cyp Cc: Nitin Gupta Signed-off-by: Greg Kroah-Hartman commit 2141ec629c9c9a70c905cfebcc8fa69373dd982a Author: Simon Horman Date: Thu Dec 24 22:42:31 2009 +1100 Staging: dt3155: remove compat code Remove compatibility code as this is not an older version of the kernel. Signed-off-by: Simon Horman Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit cf137d5c49379c5f05fba40baf1535b611410ec0 Author: Simon Horman Date: Wed Dec 23 19:54:54 2009 +1100 Staging: rtl8192su, rtl8192u: use min_t() in store_debug_level() sizeof() returns a size_t but the other types involved are unsigned long, so using min() results in a warning. As sizeof() is called on an 11 character buffer defined immediately above unsigned long is obviously wide enough for the result. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 27b93f80e47a49a0584a4c8fb58bc44f9e026256 Author: Simon Horman Date: Wed Dec 23 19:54:53 2009 +1100 Staging: rtl8192e: remove some functions from the __exit section ieee80211_crypto_tkip_exit(), ieee80211_crypto_deinit() and ieee80211_crypto_ccmp_exit() are called by ieee80211_rtl_init() which are in section __init, so they can't be in section __exit. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 9bfafe825d0af5f4cbb2aaaecad0cf9a459cf6b1 Author: Simon Horman Date: Wed Dec 23 19:54:52 2009 +1100 Staging: rtl8192e: print the elements of tx_pn and rx_pn not the arrays themselves Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit db15438cd5be7380cdf27c8adb8fc71a72da0210 Author: Simon Horman Date: Wed Dec 23 19:54:51 2009 +1100 Staging: rt2870: Remove unnecessary forward declarations Remove unnecessary forward declaration of rtusb_probe() and rtusb_disconnect() Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit c33c2065fc4d424e23547b58900ded5eb4444e9d Author: Simon Horman Date: Wed Dec 23 19:54:50 2009 +1100 Staging: rt2870: rtusb_probe() should be in section __devinit $ make CONFIG_DEBUG_SECTION_MISMATCH=y WARNING: drivers/staging/rt2870/rt2870sta.o(.text+0x2f4c5): Section mismatch in reference from the function rtusb_probe() to the function .devinit.text:rt2870_probe() The function rtusb_probe() references the function __devinit rt2870_probe(). This is often because rtusb_probe lacks a __devinit annotation or the annotation of rt2870_probe is wrong. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 6910dadf3f11254bc0af79f578c7228b4e1334ac Author: Simon Horman Date: Thu Dec 24 22:41:13 2009 +1100 Staging: DT3155: Use pci_get_device() The use of pci_find_device() is deprecated. Signed-off-by: Simon Horman Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit c22090facd354749cfe99a46e903449c7ac07788 Author: Greg Kroah-Hartman Date: Thu Feb 25 16:43:15 2010 -0800 Staging: hv: match on DMI values to know if we should run. The HV core mucks around with specific irqs and other low-level stuff and takes forever to determine that it really shouldn't be running on a machine. So instead, trigger off of the DMI system information and error out much sooner. This also allows the module loading tools to recognize that this code should be loaded on this type of system. Cc: Haiyang Zhang Cc: Hank Janssen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9a775dbd4e8c87b7d35549183145321c7205404e Author: Greg Kroah-Hartman Date: Thu Feb 25 16:42:10 2010 -0800 Staging: hv: add a pci device table This allows the HV core to be properly found and autoloaded by the system tools. It uses the Microsoft virtual VGA device to trigger this. Cc: Haiyang Zhang Cc: Hank Janssen Cc: stable Signed-off-by: Greg Kroah-Hartman commit 0fa37b1ee936811c8aa8fcb72d189d02cf1575b9 Author: Chris Nicholson Date: Sat Feb 20 20:36:23 2010 +0000 Staging: hv: fix brace coding style issue in Channel.c This is a patch to the Channel.c file that fixes up a brace warning found by checkpatch.pl Signed-off-by: Chris Nicholson Signed-off-by: Greg Kroah-Hartman commit f916a34dc066c13ff2c8986657634cef06c07719 Author: Haiyang Zhang Date: Wed Feb 17 20:58:47 2010 +0000 Staging: hv: Rename struct device_context and re-arrange the fields inside Rename struct device_context and re-arrange the fields inside. Rename struct device_context to struct vm_device, and move struct device field to the end according to Document/driver-model standard. Signed-off-by: Hank Janssen Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 26c14cc119204adc218259251919c5198d07dafe Author: Hank Janssen Date: Thu Feb 11 23:02:42 2010 +0000 Staging: hv: Add proper versioning to HV drivers Provide proper versioning information for all HV drivers. With removal of build time/date/and Minor number as requested by Greg KH Signed-off-by: Hank Janssen Signed-off-by: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit 4408f5319b6c8784120e0784df315b87e8a5dfef Author: C. Bartlett Date: Wed Feb 3 15:34:27 2010 +0000 Staging: hv: fix various coding style issues in RingBuffer.c This is a patch to the RingBuffer.c file that corrects various coding style warnings and errors found by checkpatch.pl [ The real solution here is to get rid of this file entirely, and use the kernel's internal ring buffer api, but until then, make these changes so as to make checkpatch.pl happy, and keep others from continuously sending this type of patch. - gkh] Signed-off-by: Craig Bartlett Cc: Bill Pemberton Cc: Nicolas Palix Cc: Hank Janssen Cc: Haiyang Zhang Signed-off-by: Greg Kroah-Hartman commit a73e6b7c508f610eeb315c443d9ac79041124af0 Author: Hank Janssen Date: Fri Jan 22 19:17:50 2010 +0000 Staging: hv: Remove xen legacy code and check for Hyper-V Removed legacy XEN layer from hypervisor setup, and made sure only Hyper-V is Is a valid hypervisor to run on. Signed-off-by: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 4f28900bcf9bb5e6fb0c18fc7ee325df66fe8bbd Author: Greg Kroah-Hartman Date: Fri Jan 8 10:25:01 2010 -0800 Staging: hv: remove unneeded OnClose callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 2d0753464b497287565c2e54d3ae67666852ef57 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:24:42 2010 -0800 Staging: hv: remove unneeded OnOpen callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 354b0a643e89dd3163278c9a0ac9cbcb9ef5c298 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:24:26 2010 -0800 Staging: hv: remove unneeded OnHostReset callback This callback only calls one function, so just call the function instead, no need for indirection at all. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 99358ca725513de0a97971eb019d4a5544d83760 Author: Greg Kroah-Hartman Date: Fri Jan 8 10:21:58 2010 -0800 Staging: hv: storvsc_drv: move unused functions Now that the callback pointer was removed, we can remove the code itself, as it is never used. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 65e65a3e73b31c097e59c6e8d4a9ed1eebbe9d8d Author: Greg Kroah-Hartman Date: Fri Jan 8 10:20:27 2010 -0800 Staging: hv: remove unneeded OnHostRescan callback This callback was never called, so delete the thing. Cc: Hank Janssen Cc: Haiyang Zhang . Signed-off-by: Greg Kroah-Hartman commit 4230020c42457e51c98636a328c60e9f3744152c Author: Linus Lüssing Date: Sat Jan 2 11:30:52 2010 +0100 Staging: batman-adv: Dont deactivate aggregation on wrong input A non-integer changes the aggregation mode. Therefore this patch changes the behaviour to explicitly check strict_strtoul()'s return code. Signed-off-by: Linus Lüssing Acked-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit abad5446585b0b9519fad00c05156f373ea114ad Author: Simon Wunderlich Date: Sat Jan 2 11:30:51 2010 +0100 Staging: batman-adv: Remove compat.h Since we are now part of mainline, we don't need compat.h to allow building of the module with old versions of the kernel. Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b9b27e4ef6313449a6b40a21e0e9a1bdd9a1d8ce Author: Andrew Lunn Date: Sat Jan 2 11:30:50 2010 +0100 Staging: batman-adv: Use printk(%pM) for MAC addresses printk() since kernel version 2.6.29 has supported printing MAC addresses directly, as an extension to the %p processing. This patch makes use of this for printk() and bat_dbg(). This will remove the overhead of using addr_to_string() which is normally never actually output. Fixed a typo found by Gus Wirth. Signed-off-by: Andrew Lunn Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit a9c2910aa15c5b2559e80d1406176f8456d3e34e Author: Andrew Lunn Date: Sat Jan 2 11:30:49 2010 +0100 Staging: batman-adv: Allow the MAC address to be set Some embedded devices have very limited sources of entropy for the random number generator. It has been observed that the random MAC address on the interface bat0 is not always random. When testing with a collection of identical hardware, sometimes the bat0 device the same MAC address on multiple devices, causing mayhem. This patch allows the MAC address to be set by the user. Signed-off-by: Andrew Lunn Signed-off-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit e70171957a3ac67fd62af0c66efe7b7749121899 Author: Simon Wunderlich Date: Sat Jan 2 11:30:48 2010 +0100 Staging: batman-adv: receive packets directly using skbs This patch removes the (ugly and racy) packet receiving thread and the kernel socket usage. Instead, packets are received directly by registering the ethernet type and handling skbs instead of self-allocated buffers. Some consequences and comments: * we don't copy the payload data when forwarding/sending/receiving data anymore. This should boost performance. * packets from/to different interfaces can be (theoretically) processed simultaneously. Only the big originator hash lock might be in the way. * no more polling or sleeping/wakeup/scheduling issues when receiving packets * this might introduce new race conditions. * aggregation and vis code still use packet buffers and are not (yet) converted. * all spinlocks were converted to irqsave/restore versions to solve some lifelock issues when preempted. This might be overkill, some of these locks might be reverted later. * skb copies are only done if neccesary to avoid overhead performance differences: * we made some "benchmarks" with intel laptops. * bandwidth on Gigabit Ethernet increased from ~500 MBit/s to ~920 MBit/s * ping latency decresed from ~2ms to ~0.2 ms I did some tests on my 9 node qemu environment and could confirm that usual sending/receiving, forwarding, vis, batctl ping etc works. Signed-off-by: Simon Wunderlich Acked-by: Sven Eckelmann Acked-by: Marek Lindner Acked-by: Linus Lüssing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit c4bf05d3960981a4291bcc9580f3d73eb4dcbe84 Author: Simon Wunderlich Date: Sat Jan 2 11:30:47 2010 +0100 Staging: batman-adv: check all kmalloc()s there are some kmallocs left which are not checked whether they succeeds or not, which might lead to corrupted data structures if the system memory is full. This patch should clean up the remaining unchecked kmalloc()s. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit e9b764506aeb06ada6a7d0a24eda3e6eb70bade1 Author: Marek Lindner Date: Sat Jan 2 11:30:46 2010 +0100 Staging: batman-adv: splitting /proc vis file into vis_server and vis_data The /proc vis file was used to enable/disable the vis server and to output the vis data at the same time. This behaviour was confusing and lacked a proper method to display the current vis server status. This patch seperates the 2 functionalities: * use vis_server to enable/disable the vis server and to retrieve its status * use vis_data to retrieve the vis raw data (if the server is enabled) Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 6051d44cb1210e79b39143921b9e162983a03005 Author: Linus Luessing Date: Sat Jan 2 11:30:45 2010 +0100 Staging: batman-adv: remove obsoleted vis_format /proc file batman-adv used to export the vis data using different formats that were switchable via /proc/net/batman-adv/vis_format. The various formats moved to user space and rendered this configuration switch useless. Signed-off-by: Linus Luessing Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b801fede6bd94a4b3b0bd4ba1f35f69a6b34158b Author: Andrew Lunn Date: Sat Jan 2 11:30:44 2010 +0100 Staging: batman-adv: moving vis output formats out of the kernel The batman-adv kernel module is able to output visualization data using the dot draw or JSON format. This patch transforms the output into a generic format (called vis raw). User space tool may convert the raw data to support a variety of formats without the need of modifying the kernel module. Signed-off-by: Andrew Lunn Signed-off-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit b665aac8a7b44bbffc32dfff8543227704136ed5 Author: Marek Lindner Date: Sat Jan 2 11:30:43 2010 +0100 Staging: batman-adv: fix minor orig table layout bug The originator table contained a TAB instead of a space which broke the layout as well as the batctl parser. Signed-off-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 9bbf1ecdb36e2395eecbf04229eaaedce3589db5 Author: Linus Lüssing Date: Sat Jan 2 11:30:42 2010 +0100 Staging: batman-adv: Fixes rounding issues in vis.c This patches fixes two rounding issues in vis.c for sending and purging vis packets. Before, the timers and timeouts always got rounded down to seconds, though we want a precision in milliseconds. This also fixes a kernel panic that occures when lowering the timer for sending vis packets (vis_interval) to less than 1000ms in main.c manually. Signed-off-by: Linus Lüssing Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit cec4a69cfc2bc780b4107193cb9bd621b67ab2b6 Author: Sven Eckelmann Date: Sat Jan 2 11:30:41 2010 +0100 Staging: batman-adv: Use forw_bcast_list_lock always with disabled interrupts forw_bcast_list_lock is spin_locked in both process and softirq context. SoftIRQ calls the spinlock with disabled IRQ and normal process context with enabled IRQs. When process context is inside an spin_locked area protected by forw_bcast_list_lock and gets interrupted by an IRQ, it could happen that something tries to lock forw_bcast_list_lock again in SoftIRQ context. It cannot proceed further since the lock is already taken somewhere else, but no reschedule will happen inside the SoftIRQ context. This leads to an complete kernel hang without any chance of resurrection. All functions called in process context must disable IRQs when they try to get get that lock to to prevent any reschedule due to IRQs. Signed-off-by: Sven Eckelmann Acked-by: Marek Lindner Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 5ea84fa369baa3d36fa8a78e9af3dc71bbcbca51 Author: Simon Wunderlich Date: Sat Jan 2 11:30:40 2010 +0100 Staging: batman-adv: consistent spelling of "neighbors" we have written "neighbors", "neighbours" and bad spelled versions of this word, this patch should make it consistent. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit b6c359767bc743a7b6830660daa8f7e5c4273ad8 Author: Simon Wunderlich Date: Sat Jan 2 11:30:39 2010 +0100 Staging: batman-adv: initialize static hash iterators instead of dynamically registering hash iterators, calling functions are changed to register the iterator objects statically. The two advantages are: * no memory leaks when aborting from hash_iterate() * no calls to kmalloc/kfree, therefore a little faster/safer Tested with 9 QEMU instances, no obvious regression found. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4ce21a7faf320bdb750a2e1639f8f2dbb27bdb89 Author: Andrew Lunn Date: Sat Jan 2 11:30:38 2010 +0100 Staging: batman-adv: Replace KERN_DEBUG with bat_dbg Ameya Palande requested we replace printk(KERN_DEBUG "") by pr_debug() I decided it was better to use our debug macro. Signed-off-by: Andrew Lunn Acked-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit 183cd9ee543c9364fa42be8d30265fd47a914b59 Author: Simon Wunderlich Date: Sat Jan 2 11:30:37 2010 +0100 Staging: batman-adv: update README for latest kernel state in the README that we also (compile) support 2.6.32 Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit acdfd0e088502dc225f594b5a5598cab53ffd375 Author: Sven Eckelmann Date: Sat Jan 2 11:30:36 2010 +0100 Staging: batman-adv: Remove NULL pointer check It is safe to call kfree(NULL) which makes this extra check unneeded. It was found using checkpatch.pl from linux-2.6 Signed-off-by: Sven Eckelmann Acked-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 23a51a8061567a47347ade59edf2a0bde0eece30 Author: Roel Kluin Date: Sat Dec 26 20:00:47 2009 +0100 Staging: rt2860: test off by one in RtmpAsicSendCommandToMcu() `i' reaches 101 after the loop, so if it was 100 then it succeeded in the last iteration. This is probably unlikely to cause problems. Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 716323c09319ae5e6c9e413a6378d61a77b26996 Author: Roel Kluin Date: Wed Dec 23 02:36:43 2009 +0100 Staging: rtl8192u: ieee80211: add missing parentheses not(!) has a higher precedence than bit and(&). Signed-off-by: Roel Kluin Signed-off-by: Greg Kroah-Hartman commit 7963eb432be2ebbf7e740bcdf6b385cc68fb7627 Author: Jarod Wilson Date: Mon Jan 4 18:02:27 2010 -0500 staging: add Broadcom Crystal HD driver This patch supersedes the earlier ones sent by Manu Abraham to add the Broadcom Crystal HD driver to the staging tree, per discussion with him about it. I've been working with Broadcom's Naren Sankar on this driver for a number of months, and had already talked Naren about submitting this on Broadcom's behalf, didn't expect anyone else to jump on submitting it as quickly as Manu did. ;) This version is a one-shot deal, incorporating the original driver, Manu's coding style clean-ups, udev device creation support from Edgar 'gimli' Hucek, and a number of other small tweaks from myself and Scott Davilla, the other individual who has been working closely on this code with Naren and I. I've tested this iteration of the code lightly on a mini pci-e board in a ThinkPad T61p running x86_64 Fedora 12, with the expected results, and will test further on other systems with other variants of the card (I have three varieties of this device currently in hand). Scott has also tested on assorted primarily i686 varieties of Ubuntu, and Naren has tested with both Fedora and Ubuntu, iirc. Note: only the 70012 is currently supported by this driver, 70015 support will follow later. Also note that Blu-Ray support isn't enabled (at the firmware level), due to misc fun related to the BD encryption scheme, DRM, etc. :\ I *do* have a git tree containing the driver, lib, gst plugin and firmware that I'm working from at the moment[*], as there are inter- dependencies between the driver and lib, and the driver can be used with kernels going a ways back (I've only tested back to 2.6.18 as it exists in Red Hat Enterprise Linux 5). I'm exporting from there, into a linux-next tree, then generating patches from there. The goal is to feed everything upstream as quickly as possible, but there are users who want this code for earlier kernels too... The firmware will be submitted for inclusion in dwmw2's linux-firmware tree once there is a suitable redistribution-no-modification type of license on it (I believe Naren is working with Broadcom legal to get that in place). Changelog from initial Broadcom release to here: commit d20475d444610c5683d09e63f707f5bb22359062 Author: Jarod Wilson Date: Mon Jan 4 13:55:16 2010 -0500 include: lib doesn't build w/o the removed stdint include So add it back... Signed-off-by: Jarod Wilson commit c181070a330530b792d2b80e3ec6ab12a5a57394 Author: Scott Davilla Date: Mon Jan 4 13:38:37 2010 -0500 include: don't define VOID if its already defined Signed-off-by: Scott Davilla Signed-off-by: Jarod Wilson commit 33d8a2b691e81212e398f53770578d79650bf0bc Author: Jarod Wilson Date: Mon Jan 4 13:12:10 2010 -0500 driver: create crystalhd device using udev Based on: http://sourceforge.net/apps/trac/archvdr/browser/trunk/archvdr/crystalhd/use_udev.patch Signed-off-by: Edgar ( gimli ) Hucek Formatting tweaks, error-handling path fixups and any bugs added by Jarod. Signed-off-by: Jarod Wilson commit c44c64dea5537814796fcbe2d9db0209383c78b9 Author: Manu Abraham Date: Mon Jan 4 10:32:47 2010 -0500 crystalhd: coding style cleanups Signed-off-by: Manu Abraham Signed-off-by: Jarod Wilson commit cffa6da7467ff697a656d1dfff54bb0513a053dc Author: Jarod Wilson Date: Mon Jan 4 10:17:27 2010 -0500 crystalhd: run dos2unix over everything, this is linux source... Signed-off-by: Jarod Wilson commit 7fa38a282db7af5a5746055f7c6cef8a9b8ee138 Author: Jarod Wilson Date: Mon Jan 4 10:02:33 2010 -0500 crystalhd: initial import of released Broadcom code Straight import of: http://www.broadcom.com/docs/support/crystalhd/crystalhd_linux_20091229.zip Unfortunately, we're unable to publicly publish all the history that got us from the initial internal code to what was released here, but such is life, we can just be happy we've got this open-sourced now. :) Signed-off-by: Jarod Wilson Signed-off-by: Naren Sankar Signed-off-by: Scott Davilla Signed-off-by: Manu Abraham Signed-off-by: Jarod Wilson Signed-off-by: Greg Kroah-Hartman commit ca1f29c01aaa37d522dc6ce311769731f5f1919e Author: Greg Kroah-Hartman Date: Tue Dec 22 16:38:10 2009 -0800 Staging: altpciechdma: remove driver No one seems to be able to maintain this, or merge it into mainline, so remove it. Acked-by: Leon Woestenberg Signed-off-by: Greg Kroah-Hartman commit 2d629030ca649bd4a7356befedbe7bbefa840b21 Author: Greg Kroah-Hartman Date: Tue Dec 22 16:35:21 2009 -0800 Staging: p9auth: remove driver from tree No one seems to be maintaining this anymore, and it is not on any track to be merged to mainline. Cc: Ashwin Ganti Signed-off-by: Greg Kroah-Hartman commit a945db65436a2666927b555d752e67a1bd193a9c Author: Greg Kroah-Hartman Date: Tue Dec 22 16:29:26 2009 -0800 staging: remove the b3dfg driver It has no users, and no developers to maintain it to get it merged into mainline. So sad. Cc: Daniel Drake Cc: Justin Bronder Cc: Duane Griffin Signed-off-by: Greg Kroah-Hartman commit 8c6356e2a57044614799de3f1e7f40561724893a Author: Greg Kroah-Hartman Date: Tue Dec 22 15:19:21 2009 -0800 Staging: dt3155: coding style cleanups for the .h files This cleans up some of the coding style issues in the .h files. More remains to be done. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 1769fd86e13eadeca64881fb8494a17afeccbbbf Author: Greg Kroah-Hartman Date: Tue Dec 22 15:18:28 2009 -0800 Staging: dt3155: coding style cleanups for allocator code This fixes up the worst of the coding style errors for the allocator code. Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit 8125e2f66800f9e16e632df20fa3195c07f6aaf9 Author: Simon Horman Date: Mon Dec 21 15:09:53 2009 +1100 Staging: wlan-ng: initialise mibitem $ gcc --version gcc (Debian 4.4.2-5) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_dorequest’: drivers/staging/wlan-ng/p80211wext.c:139: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:139: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwretry’: drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:967: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwretry’: drivers/staging/wlan-ng/p80211wext.c:1057: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1057: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwtxpow’: drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1149: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwtxpow’: drivers/staging/wlan-ng/p80211wext.c:1123: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:1123: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwfrag’: drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:891: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwfrag’: drivers/staging/wlan-ng/p80211wext.c:933: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:933: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwrts’: drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:826: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwrts’: drivers/staging/wlan-ng/p80211wext.c:866: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:866: warning: ‘mibitem.status’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwrate’: drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:775: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_giwfreq’: drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.len’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.status’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:273: warning: ‘mibitem.data’ is used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwfreq’: drivers/staging/wlan-ng/p80211wext.c:320: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c: In function ‘p80211wext_siwmode’: drivers/staging/wlan-ng/p80211wext.c:401: warning: ‘mibitem.len’ may be used uninitialized in this function drivers/staging/wlan-ng/p80211wext.c:401: warning: ‘mibitem.status’ may be used uninitialized in this function ... Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit e8ffaa3a06a71a5a02373cfcb5f474f9a181ec68 Author: Simon Horman Date: Mon Dec 21 15:08:15 2009 +1100 Staging: prism2-usb: Build should select WIRELESS_EXT The prevailing idiom is to select WIRELESS_EXT not depend on it. Depending leaves this driver in a situation where it can only be built if another driver that selects WIRELESS_EXT has been enabled. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit d512a142f0a3d5ce138880fb2a70462542d5f711 Author: Simon Horman Date: Mon Dec 21 15:07:50 2009 +1100 Staging: rtl8192su: Use z format qualifier for output of sizeof() $ gcc --version gcc (Debian 4.4.2-5) 4.4.2 Copyright (C) 2009 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ make ... drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_ADDBAReq’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:342: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_ADDBARsp’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:443: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c: In function ‘ieee80211_rx_DELBA’: drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c:573: warning: format ‘%ld’ expects type ‘long int’, but argument 3 has type ‘unsigned int’ ... Also some style fixes for these lines: + Fix excessively long lines + Remove leading space before struct + Remove unnecessary parentheses Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 784d3119475652d34a8d8ec3911e39c5e3d3036f Author: Simon Horman Date: Mon Dec 21 15:07:10 2009 +1100 Staging: rtl8192su: Build should select WIRELESS_EXT The prevailing idiom is to select WIRELESS_EXT not depend on it. Depending leaves this driver in a situation where it can only be built if another driver that selects WIRELESS_EXT has been enabled. Signed-off-by: Simon Horman Signed-off-by: Greg Kroah-Hartman commit 8c172dde41db666f7a5f3bb62205da017e23c0ec Author: Justin Madru Date: Fri Dec 18 15:52:53 2009 -0800 Staging: s5k3e2fx.c: simplify complexity by factoring the code was looping, setting s_move[i] to the following calculations if (actual_step>= 0) s_move[i] = ((((i + 1) * gain + 0x200) - (i * gain + 0x200)) / 0x400); else s_move[i] = ((((i + 1) * gain - 0x200) - (i * gain - 0x200)) / 0x400); but, this code reduces to the expression s_move[i] = gain>> 10; The reason for the complexity was to generate a step function with integer division and rounding to land on specific values. But these calculations can be simplified to the following code: gain = ((actual_step<< 10) / 5)>> 10; for (i = 0; i<= 4; i++) s_move[i] = gain; Signed-off-by: Justin Madru Reviewed-by: Ray Lee Signed-off-by: Greg Kroah-Hartman commit 096417e087a391dc78780cc1843369a521635522 Author: Pekka Enberg Date: Fri Dec 18 23:08:22 2009 +0200 Staging: w35und: Remove unused typedefs MLME_DEAUTHREQ_PARA and MLME_DISASSOCREQ_PARA Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 8fab4020fa1aa5ee3ad4e409323be9edfbd6c20e Author: Pekka Enberg Date: Fri Dec 18 23:08:21 2009 +0200 Staging: w35und: Remove unused typedef RXLAYER1 Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 2b6e6df4d911e5ef1f438b84ee00cfc48865aff3 Author: Pekka Enberg Date: Fri Dec 18 23:08:20 2009 +0200 Staging: w35und: Remove unused typedef TXRETRY_REC Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 23b0dce239426ff8a7068b8d617d0c6eb4544cf7 Author: Pekka Enberg Date: Fri Dec 18 23:08:19 2009 +0200 Staging: w35und: Remove unused typedef CHAN_LIST Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 440a233db4c117f34397abd3722d5802fe1b8c30 Author: Pekka Enberg Date: Fri Dec 18 23:08:18 2009 +0200 Staging: w35und: Convert typedef ChanInfo to struct chan_info Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 395af561825095b2df30ed2ee86c3ed898783e8f Author: Pekka Enberg Date: Fri Dec 18 23:08:17 2009 +0200 Staging: w35und: Remove unused typedef _EVENTLOG Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 92ce4703920dc1bb380c12498a2f6bb825effbc7 Author: Pekka Enberg Date: Fri Dec 18 23:08:16 2009 +0200 Staging: w35und: Convert typedef RadioOff to struct radio_off Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 1bc5e651295ab35fc7d396d940cf9a1e530c0a7e Author: Pekka Enberg Date: Fri Dec 18 23:08:15 2009 +0200 Staging: w35und: Convert typedef LOCAL_PARA to struct wb_local_para Acked-by: Pavel Machek Signed-off-by: Pekka Enberg Signed-off-by: Greg Kroah-Hartman commit 3fc0d278e3198c8aa9baa71c49a8364d31686ba9 Author: Adam Buchbinder Date: Fri Dec 18 15:43:52 2009 -0500 staging: Fix misspelling of "invocation" in comment. A comment misspells "invocation"; this fixes it. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 39cfb97b0d89a99c8e50782b17e65114b89c2e59 Author: Adam Buchbinder Date: Fri Dec 18 15:43:51 2009 -0500 staging: Fix misspelling of "should" and "shouldn't" in comments. Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 2ed71d5a14c887b7632aa21579ff7fc5770381d8 Author: Adam Buchbinder Date: Fri Dec 18 15:43:50 2009 -0500 staging: Fix misspelling of "successful" and variants. Some comments and one message misspell "successful" or variants of the word; this fixes them. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Greg Kroah-Hartman commit 59277b679f8b5ce594e367759256668eba652d0d Author: Bernie Thompson Date: Tue Nov 24 15:52:21 2009 -0800 Staging: udlfb: add dynamic modeset support Add dynamic modeset support udlfb uses EDID to find the monitor’s preferred mode udlfb no longer has fixed mode tables – it’s able to set any mode dynamically, from the standard VESA timing characteristics of the monitor. Draws from probe and setmode code of both displaylink-mod 0.3 branch of Roberto De Ioris, and Jaya Kumar's displaylinkfb. Lays foundation for defio support and making backbuffer optional. With additional changes to minimize diffs and clean for checkpatch.pl style. Does not yet include new ioctls or refcount/mutex code from displaylink-mod. Tested to work with existing xf-video-displaylink X server unmodified. Signed-off-by: Bernie Thompson Signed-off-by: Greg Kroah-Hartman commit 293c0db0dd2a7f1a8074645faa9d3a0294623002 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:04:54 2009 -0800 Staging: dt3155: add it to the build Now it will build with the rest of the kernel Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit bad9f950c011c50e8302b48244229c0250add9b4 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:06:11 2009 -0800 Staging: dt3155: add TODO file Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit ae7fd7b818e728fd90e08460dd45ce81e79c99b0 Author: Greg Kroah-Hartman Date: Fri Dec 18 11:05:25 2009 -0800 Staging: dt3155: add needed #include This is needed so the code properly builds Cc: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit aa337ef1fbc9650f8b5b9087af1dac33f71eb01c Author: Scott Smedley Date: Fri Dec 18 10:54:26 2009 -0800 Staging: add dt3155 driver This is a driver for the DT3155 Digitizer Signed-off-by: Scott Smedley Signed-off-by: Greg Kroah-Hartman commit da94a755cabe96d2c00af2b1b1aff84307c437fe Author: Radu Voicilas Date: Mon Dec 7 18:20:09 2009 -0800 Staging: rtl8192e: Small code fixes for r819xE_firmware.c Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 4db3d5e4e7fce813648215d99fdc5d0fcb73128c Author: Radu Voicilas Date: Mon Dec 7 18:20:08 2009 -0800 Staging: rtl8192e: Code style fixes for r819xE_phy.h Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 1719e1190a019c65750bc515b3ff2ec694e52bc2 Author: Radu Voicilas Date: Mon Dec 7 18:20:07 2009 -0800 Staging: rtl8192e: Code style fix for r819xE_phyreg.h Changed all the comments to conform to the standard, aligned register values. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 8f2668418f182ac6b50b994851c36bd0a116e4f8 Author: Radu Voicilas Date: Fri Dec 4 20:43:16 2009 -0800 Staging: rtl8192e: fix more coding style issues. Fixes to the way code looks. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit 65a4378471510787e080188f933913315f1afa0c Author: david woo Date: Tue Dec 22 09:40:36 2009 -0800 Staging: rtl9192e: fix power usage issues This patch should allow the driver to consume a lot less power. Signed-off-by: david woo Signed-off-by: Greg Kroah-Hartman commit 789d9dbdad5cb24fbf0c0e4fa5c5f1b792e4e81e Author: Radu Voicilas Date: Fri Dec 4 20:42:53 2009 -0800 Staging: rtl8192e: fix some codingstyle issues dot11d.h needed a good refactoring - I've dropped some of the // comments or transformed them to match the kernel documentation. r8180_93cx6.h - fixed a little bit the copyright section. Signed-off-by: Radu Voicilas Signed-off-by: Greg Kroah-Hartman commit f70615a8f134c4ebe3c2848bb43a68335406a001 Author: Huang Weiyi Date: Sun Dec 13 22:06:25 2009 +0800 Staging: ramzswap: remove unused #include Remove unused #include ('s) in drivers/staging/ramzswap/ramzswap_drv.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit 6309017f050af5bb66350ec25a2a1dd0c5643422 Author: Huang Weiyi Date: Sun Dec 13 21:14:10 2009 +0800 Staging: wlags49_h2: remove duplicated #include Remove duplicated #include('s) in drivers/staging/wlags49_h2/wl_pci.c Signed-off-by: Huang Weiyi Signed-off-by: Greg Kroah-Hartman commit c4ad074f11acc46a4ded25dec4f4c2b8d2d4ebb8 Author: Ameya Palande <2ameya@gmail.com> Date: Mon Dec 14 13:57:59 2009 +0200 Staging: iio: checkinclude.pl fix Remove which is included twice Signed-off-by: Ameya Palande <2ameya@gmail.com> Signed-off-by: Greg Kroah-Hartman commit 734cc82a65cd5abc1b616fb0699eb2c251de7831 Author: Andrew Lunn Date: Sat Dec 12 23:39:46 2009 +0100 Staging: batman-adv: Fix the naming of the debug option. So that the configuration hierarchy is correct, set the debug option to have the same base as the main BATMAN option. Signed-off-by: Andrew Lunn Signed-off-by: Marek Lindner Signed-off-by: Greg Kroah-Hartman commit 8a2e042c2d9b4f1252dbbbb7c31bd3f8af19c8f2 Author: Andrew Lunn Date: Sat Dec 12 23:39:45 2009 +0100 Staging: batman-adv: Split originator handling parts out of routing.c Bug found and fixed in origional version by Linus Luessing. Signed-off-by: Simon Wunderlich Signed-off-by: Linus Luessing Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4088c7ca57b6dbe25683bb16f25233cce373996c Author: Andrew Lunn Date: Sat Dec 12 23:39:44 2009 +0100 Staging: batman-adv: Always receive when discarding. It does not matter if the interface is to be activated or not, we must read the packet in order that it be discarded. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit da6b9ba95f2ce3f923013ce09793ab16f05bac25 Author: Andrew Lunn Date: Sat Dec 12 23:39:43 2009 +0100 Staging: batman-adv: stop persistent warnings if a device is deactivated. Without this change we spam the kernel log on every packet received on any other interface when an interface has been added, but is not yet active, ie UP. Signed-off-by: Simon Wunderlich Signed-off-by: Andrew Lunn Signed-off-by: Greg Kroah-Hartman commit 4efe0b06559e8cb39c3d6a9bd01cc99604dfd247 Author: Andrew Lunn Date: Sat Dec 12 23:39:42 2009 +0100 Staging: batman-adv: Refactor routing.c Break up a lot of the big functions up into many smaller ones. This helps with readability and there is now a lot less code squashed against the right hand margin. Signed-off-by: Andrew Lunn Acked-by: Marek Lindner Acked-by: Simon Wunderlich Signed-off-by: Greg Kroah-Hartman commit bad2239e87d73fd999a9c5d5efa5024b16046c6c Author: Andre