commit f4efdd65b754ebbf41484d3a2255c59282720650 Merge: d831220... 6b44003... Author: Linus Torvalds Date: Wed Apr 8 18:00:55 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: work_on_cpu(): rewrite it to create a kernel thread on demand kthread: move sched-realeted initialization from kthreadd context kthread: Don't looking for a task in create_kthread() #2 commit d8312204768861d77ec868265b2c1a36a1bf078f Merge: 3d4d4c8... 5bf2b99... Author: Linus Torvalds Date: Wed Apr 8 17:45:02 2009 -0700 Merge git://git.infradead.org/battery-2.6 * git://git.infradead.org/battery-2.6: pda_power: Add optional OTG transceiver and voltage regulator support pcf50633_charger: Remove unused mbc_set_status function pcf50633_charger: Enable periodic charging restart commit 3d4d4c8bb63a705d95a46d299469d8a10b8b229c Merge: c71d9ca... 5bf37ec... Author: Linus Torvalds Date: Wed Apr 8 17:44:28 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: cap_prctl: don't set error to 0 at 'no_change' commit c71d9caf6cfdee56da2924a054cc84cbe91d82b6 Merge: a219ee8... 2a3abf6... Author: Linus Torvalds Date: Wed Apr 8 17:43:58 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: igb: remove sysfs entry that was used to set the number of vfs igbvf: add new driver to support 82576 virtual functions drivers/net/eql.c: Fix a dev leakage. niu: Fix unused variable warning. r6040: set MODULE_VERSION bnx2: Don't use reserved names FEC driver: add missing #endif niu: Fix error handling mv643xx_eth: don't reset the rx coal timer on interface up smsc911x: correct debugging message on mii read timeout ethoc: fix library build errors netfilter: ctnetlink: fix regression in expectation handling netfilter: fix selection of "LED" target in netfilter netfilter: ip6tables regression fix commit a219ee88b679c275863b882a0bb7b3330763e609 Merge: a7b334d... 018ef96... Author: Linus Torvalds Date: Wed Apr 8 17:43:39 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Hook up sys_preadv and sys_pwritev sparc64: add_node_ranges() must be __init serial: sunsu: sunsu_kbd_ms_init needs to be __devinit sparc: Fix section mismatch warnings in cs4231 sound driver. sparc64: Fix section mismatch warnings in PCI controller drivers. sparc64: Fix section mismatch warnings in power driver. sparc64: get_cells() can't be marked __init commit a7b334de4d3651491ccd8c52c744af88d48785b9 Merge: 72ae9e0... 430db32... Author: Linus Torvalds Date: Wed Apr 8 17:42:32 2009 -0700 Merge branch 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'ext3-latency-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext3: Try to avoid starting a transaction in writepage for data=writepage block_write_full_page: switch synchronous writes to use WRITE_SYNC_PLUG commit 6b44003e5ca66a3fffeb5bc90f40ada2c4340896 Author: Andrew Morton Date: Thu Apr 9 09:50:37 2009 -0600 work_on_cpu(): rewrite it to create a kernel thread on demand Impact: circular locking bugfix The various implemetnations and proposed implemetnations of work_on_cpu() are vulnerable to various deadlocks because they all used queues of some form. Unrelated pieces of kernel code thus gained dependencies wherein if one work_on_cpu() caller holds a lock which some other work_on_cpu() callback also takes, the kernel could rarely deadlock. Fix this by creating a short-lived kernel thread for each work_on_cpu() invokation. This is not terribly fast, but the only current caller of work_on_cpu() is pci_call_probe(). It would be nice to find some other way of doing the node-local allocations in the PCI probe code so that we can zap work_on_cpu() altogether. The code there is rather nasty. I can't think of anything simple at this time... Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Rusty Russell commit 1c99315bb36b5d776210546d438ca928dc9b1f22 Author: Oleg Nesterov Date: Thu Apr 9 09:50:36 2009 -0600 kthread: move sched-realeted initialization from kthreadd context kthreadd is the single thread which implements ths "create" request, move sched_setscheduler/etc from create_kthread() to kthread_create() to improve the scalability. We should be careful with sched_setscheduler(), use _nochek helper. Signed-off-by: Oleg Nesterov Cc: Christoph Hellwig Cc: "Eric W. Biederman" Cc: Ingo Molnar Cc: Pavel Emelyanov Cc: Vitaliy Gusev Signed-off-by: Rusty Russell commit 3217ab97f14c5c8f9f975ed8c40c351164b0b10e Author: Vitaliy Gusev Date: Thu Apr 9 09:50:35 2009 -0600 kthread: Don't looking for a task in create_kthread() #2 Remove the unnecessary find_task_by_pid_ns(). kthread() can just use "current" to get the same result. Signed-off-by: Vitaliy Gusev Acked-by: Oleg Nesterov Signed-off-by: Rusty Russell commit 5bf37ec3e0f5eb79f23e024a7fbc8f3557c087f0 Author: Serge E. Hallyn Date: Wed Apr 8 16:55:58 2009 -0500 cap_prctl: don't set error to 0 at 'no_change' One-liner: capsh --print is broken without this patch. In certain cases, cap_prctl returns error > 0 for success. However, the 'no_change' label was always setting error to 0. As a result, for example, 'prctl(CAP_BSET_READ, N)' would always return 0. It should return 1 if a process has N in its bounding set (as by default it does). I'm keeping the no_change label even though it's now functionally the same as 'error'. Signed-off-by: Serge Hallyn Acked-by: David Howells Signed-off-by: James Morris commit 2a3abf6d17b6026a59e5cf7452d70ec1ad6a69fa Author: Alexander Duyck Date: Tue Apr 7 14:37:52 2009 +0000 igb: remove sysfs entry that was used to set the number of vfs This patch removes the sysfs entry num_vfs which was added to support enabling pci virtual functions for 82576. To prevent VFs from loading automatically a module parameter "max_vfs" was added so that the number of VFs per PF can be limited. This is especially useful when 4 or more 82576 ports are on the system because otherwise to load all VFs would result in 8 interface per physical port. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit d4e0fe01a38a073568aee541a0247fe734095979 Author: Alexander Duyck Date: Tue Apr 7 14:37:34 2009 +0000 igbvf: add new driver to support 82576 virtual functions This adds an igbvf driver to handle virtual functions provided by the igb driver when SR-IOV has been enabled. A virtual function is a lightweight pci-e function that supports a single queue and shares resources with the 82576 physical function contained within the igb driver. To spawn virtual functions from the igb driver all that is needed is to enable CONFIG_PCI_IOV and have an 82576 Ethernet adapter on a system that supports SR-IOV in the BIOS. The virtual functions will appear after the interface is loaded. Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 93889d7574ec90bb4455929ad0536d8df74bc730 Author: Yang Hongyang Date: Wed Apr 8 15:56:33 2009 -0700 drivers/net/eql.c: Fix a dev leakage. After dev_get_by_name(), we should follow a dev_put(). Signed-off-by: Yang Hongyang Signed-off-by: David S. Miller commit efb6c736da8f9c455c22bcbf717dbcf1889d0325 Author: David S. Miller Date: Wed Apr 8 15:52:16 2009 -0700 niu: Fix unused variable warning. Don't strain gcc's tiny mind. Signed-off-by: David S. Miller commit bc4de26040d3bdc170aaa47044adf9d318a06772 Author: Florian Fainelli Date: Wed Apr 8 15:50:43 2009 -0700 r6040: set MODULE_VERSION This patch sets MODULE_VERSION in order to help users track changes to this module. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 5ee1c32628e4baa0d99146a8adc594220f947aad Author: Bastian Blank Date: Wed Apr 8 15:50:07 2009 -0700 bnx2: Don't use reserved names The mips identifier is reserved by gcc on mips plattforms. Don't use it in the code. Signed-off-by: Bastian Blank Tested-by: Martin Michlmayr Signed-off-by: David S. Miller commit fb922b0de60d64473f68515a90a7df603267d245 Author: Sascha Hauer Date: Wed Apr 8 15:44:45 2009 -0700 FEC driver: add missing #endif Signed-off-by: Sascha Hauer Signed-off-by: David S. Miller commit 58f3e0a864c46dadbeadf682e6bbdcab14ba19d3 Author: Dan Carpenter Date: Wed Apr 8 15:44:04 2009 -0700 niu: Fix error handling platform_device_register_simple() returns ERR_PTR(), not NULL, if an error occurs. Found by smatch (http://repo.or.cz/w/smatch.git). Compile tested. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit b5e86db4c7f6397ef86ab5e4a3fbece966935577 Author: Lennert Buytenhek Date: Wed Apr 8 15:42:46 2009 -0700 mv643xx_eth: don't reset the rx coal timer on interface up Move SDMA configuration from interface up to port probe, to prevent overwriting the receive coalescing timer value on interface up. Signed-off-by: Lennert Buytenhek Signed-off-by: David S. Miller commit 150899d29367eb60302bcb710e779617d04aceea Author: Steve Glendinning Date: Wed Apr 8 15:42:15 2009 -0700 smsc911x: correct debugging message on mii read timeout the warning printed when a mii READ times out currently says "Timed out waiting for MII write to finish". This patch corrects this. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit c5cacb3bf91b0841e5a721ca303658a407d5c34f Author: Randy Dunlap Date: Wed Apr 8 15:41:25 2009 -0700 ethoc: fix library build errors ethoc indirectly uses crc32_le() and bitrev32(), so select those library functions to be built. drivers/built-in.o: In function `ethoc_set_multicast_list': ethoc.c:(.text+0x6226f): undefined reference to `crc32_le' ethoc.c:(.text+0x62276): undefined reference to `bitrev32' Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 72ae9e092c8a62ef60a364ec812f5f88eb6442fc Merge: 7b85a88... 8851d37... Author: Linus Torvalds Date: Wed Apr 8 15:36:42 2009 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] wire up preadv/pwritev system calls commit 7b85a88ca7760d6d5f34bdaa793c71d921a3e853 Merge: 139ef17... 8897c18... Author: Linus Torvalds Date: Wed Apr 8 15:32:06 2009 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: x86 ACPI: Add support for Always Running APIC timer ACPI x86: Make aperf/mperf MSR access in acpi_cpufreq read_only ACPI x86: Cleanup acpi_cpufreq structures related to aperf/mperf ACPICA: delete check for AML access to port 0x81-83 ACPI: WMI: use .notify method instead of installing handler directly sony-laptop: use .notify method instead of installing handler directly panasonic-laptop: use .notify method instead of installing handler directly fujitsu-laptop: use .notify method instead of installing hotkey handler directly fujitsu-laptop: use .notify method instead of installing handler directly ACPI: video: use .notify method instead of installing handler directly ACPI: thermal: use .notify method instead of installing handler directly ACPI battery: fix async boot oops ACPI: delete acpi_device.g_list NULL noise: drivers/platform/x86/panasonic-laptop.c ACPI: cpufreq: remove dupilcated #include ACPI: Adjust Kelvin offset to match local implementation ACPI: convert acpi_device_lock spinlock to mutex commit 139ef17a464a222aadf7b543d734a4001d06b720 Merge: d2e2d7c... 3d6fdf7... Author: Linus Torvalds Date: Wed Apr 8 15:24:09 2009 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array [ARM] 5445/1: AT91: Remove flexible array from USBH platform data [ARM] 5447/1: Add SZ_32K [ARM] omap: fix omap1 clock usecount decrement bug [ARM] pxa: register AC97 controller devices [ARM] pxa/csb701: do not register devices on non-csb726 boads [ARM] pxa/colibri: get rid of set_irq_type() [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL [ARM] pxa/cm-x2xx: fix ucb1400 not being registered [ARM] pxa: Add support for suspend on PalmTX, T5 and LD [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight [ARM] pxa: Palm Tungsten E2 basic support [ARM] pxa/em-x270: add libertas device registration [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power commit d2e2d7ca14f123cb1d03408c2bc6db8d402f416d Merge: 7831d56... ab5a643... Author: Linus Torvalds Date: Wed Apr 8 14:33:59 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: mmc_spi: support for non-byte-aligned cards omap_hsmmc: Do not expect cmd/data to be non-null when CC/TC occurs mmc: Fix compile for omap_hsmmc.c mmc_spi: convert timeout handling to jiffies and avoid busy waiting mmc_spi: do not check CID and CSD blocks with CRC16 omap_hsmmc: Flush posted write to IRQ New mail address for Pierre Ossman imxmmc: move RSSR BLR imxmmc: init-exit rework mmc: Accept EXT_CSD rev 1.3 since it is backwards compatible with 1.2 commit 7831d56b0a3544cbb6f82f76c34ca95e24d5b676 Author: Alan Cox Date: Wed Apr 8 20:13:16 2009 +0100 tty: MAX3100 Thou shalt remember to use 'git add' or errors shall be visited on your downloads and there shall be wrath from on list and much gnashing of teeth. Thou shalt remember to use git status or there shall be catcalls and much embarrasment shall come to pass. Signed-off-by: Alan "I'm hiding" Cox Signed-off-by: Linus Torvalds commit 8851d3712a73649e1ae0d4620e7690c8db8742df Author: Tony Luck Date: Wed Apr 8 13:46:14 2009 -0700 [IA64] wire up preadv/pwritev system calls Gerd Hoffmann added these to Linux. Let ia64 use them. Signed-off-by: Tony Luck commit fd1cc4802482d13ba1dbc44b390c5a6b16411a03 Merge: 577c9c4... 8373167... Author: David S. Miller Date: Wed Apr 8 13:39:54 2009 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit 3d6fdf7563d0a67c6973cf421f7405524ed8bdaf Author: Justin Waters Date: Fri Apr 3 21:06:53 2009 +0100 [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array Currently, the vbus_pin assignment loop is limited by the value of the "ports" variable in the platform data. Now that the vbus_pin array is no longer flexible, we can use its actual size. Signed-off-by: Justin Waters Acked-by: Andrew Victor Signed-off-by: Russell King commit d0176f612f5c3edca00b9d0cc65555ad34843ec7 Author: Justin Waters Date: Fri Apr 3 21:03:59 2009 +0100 [ARM] 5445/1: AT91: Remove flexible array from USBH platform data The flexible array in the USBH platform data is not safe to copy. The compiler will not allocate any extra memory for the non-init platform data structure (in the *_devices.c files) since it isn't given any defaults at compile time. When the probe function attempts to address that array, it will actually attempt to access data in an adjacent structure. Since there are currently no (known) implementations of the at91 USBH IP with more than 2 vbus pins, I am capping the value at 2. If somebody tries to assign more, then the compiler will produce a warning. Signed-off-by: Justin Waters Acked-by: David Brownell Acked-by: Andrew Victor Signed-off-by: Russell King commit 8bd239d2ef00ed3319bf7384acd19c8253f0bb68 Author: Linus Walleij Date: Wed Apr 8 01:32:20 2009 +0100 [ARM] 5447/1: Add SZ_32K This adds a SZ_32K define to the available sizes. I need it for an upcoming platform support. Signed-off-by: Linus Walleij Signed-off-by: Russell King commit ab5a643cf597f2214feb6ff7288c72589661bde1 Author: Wolfgang Muees Date: Wed Apr 8 09:48:58 2009 +0100 mmc_spi: support for non-byte-aligned cards A very large subset of SD cards in the market send their responses and data non-byte-aligned. So add logic to the mmc spi driver to handle this mess. Signed-off-by: Wolfgang Muees Signed-off-by: Pierre Ossman commit a8fe29d8bcdfbf85ba26c7f3522c4bdfbc83e71d Author: Jarkko Lavinen Date: Wed Apr 8 11:18:32 2009 +0300 omap_hsmmc: Do not expect cmd/data to be non-null when CC/TC occurs With spurious interrupt cmd can be null even when we have CC set in irq status. Fixes: NB#106295 - prevent potential kernel crash in the MMC driver Signed-off-by: Jarkko Lavinen Signed-off-by: Adrian Hunter Signed-off-by: Pierre Ossman commit d31f65e8464927f2cfdee6b0b01b9e3a8ce5db9c Author: Tony Lindgren Date: Tue Apr 7 17:04:33 2009 -0700 mmc: Fix compile for omap_hsmmc.c This fixes the issue noted by Russell King: drivers/mmc/host/omap_hsmmc.c: In function 'mmc_omap_xfer_done': drivers/mmc/host/omap_hsmmc.c:301: error: implicit declaration of function 'mmc_omap_fclk_lazy_disable' This got broken by 4a694dc915c9a223044ce21fc0d99e63facd1d64. Signed-off-by: Tony Lindgren Signed-off-by: Pierre Ossman commit 56e303ebeec7ef43dbd9d7998f8ad1a9f75d59bc Author: Wolfgang Muees Date: Tue Apr 7 15:26:30 2009 +0100 mmc_spi: convert timeout handling to jiffies and avoid busy waiting SD/MMC card timeouts can be very high. So avoid busy-waiting, using the scheduler. Calculate all timeouts in jiffies units, because this will give us the correct sign when to involve the scheduler. Signed-off-by: Wolfgang Muees Signed-off-by: Pierre Ossman commit 9d9f25c036dd584db175552a7d162403d3ab54b3 Author: Wolfgang Muees Date: Tue Apr 7 14:48:16 2009 +0100 mmc_spi: do not check CID and CSD blocks with CRC16 Some cards are not able to calculate a valid CRC16 value for CID and CSD reads (CRC for 512 byte data blocks is OK). By moving the CRC enable after the read of CID and CSD, these cards can be used. This patch was tested with a faulty 8 GByte takeMS Class 6 SDHC card. This patch was suggested by Pierre Ossman. Signed-off-by: Wolfgang Muees Signed-off-by: Pierre Ossman commit 00adadc12196c7b3e8923729e728162267e98ff7 Author: Kevin Hilman Date: Mon Apr 6 15:01:19 2009 +0300 omap_hsmmc: Flush posted write to IRQ Spurious IRQs seen on MMC after 2.6.29. Flush posted write in IRQ handler. The interrupt line is released by clearing the error status bits in the MMCHS_STAT register, which must occur before the interrupt handler returns to avoid unwanted irqs. Hence the need to flush the posted write. Signed-off-by: Kevin Hilman Signed-off-by: Adrian Hunter Acked-by: Tony Lindgen Signed-off-by: Pierre Ossman commit 32710e8fd537adeb53f98dec92e4a77caac512f5 Author: Pierre Ossman Date: Wed Apr 8 20:14:54 2009 +0200 New mail address for Pierre Ossman Signed-off-by: Pierre Ossman commit 34b28950168abd7ad55fe3493ea21f1340c7294a Author: Paulius Zaleckas Date: Wed Mar 25 11:18:50 2009 +0200 imxmmc: move RSSR BLR DMA request source (RSSR) needs to be set only once (in probe). DMA burst length (BLR) need to be set only in set_ios() This cleans up imxmci_setup_data() and should make it a little bit faster :) Signed-off-by: Paulius Zaleckas Signed-off-by: Pierre Ossman commit b513b6cc0fcbb0ef733eec487618da7ea2d7cc61 Author: Paulius Zaleckas Date: Wed Mar 25 11:17:42 2009 +0200 imxmmc: init-exit rework Add __init __exit for appropriate probe and remove functions. Conver to platform_driver_probe() Signed-off-by: Paulius Zaleckas Acked-by: Sascha Hauer Signed-off-by: Pierre Ossman commit 3e44ddd44ea59354221b811605745ec453130c06 Author: Jarkko Lavinen Date: Thu Nov 27 14:30:32 2008 +0200 mmc: Accept EXT_CSD rev 1.3 since it is backwards compatible with 1.2 Signed-off-by: Jarkko Lavinen Signed-off-by: Pierre Ossman commit 3a709703538c471530405556dda136fd0d82b0dc Author: Roland McGrath Date: Tue Apr 7 23:21:06 2009 -0700 ptrace: some checkpatch fixes This fixes all the checkpatch --file complaints about kernel/ptrace.c and also removes an unused #include. I've verified that there are no changes to the compiled code on x86_64. Signed-off-by: Roland McGrath [ Removed the parts that just split a line - Linus ] Signed-off-by: Linus Torvalds commit 4c967291fc875a53de7126d256ad5e48f42a6521 Author: Nobuhiro Iwamatsu Date: Tue Apr 7 21:21:43 2009 -0700 nommu: fix typo vma->pg_off to vma->vm_pgoff 6260a4b0521a41189b2c2a8119096c1e21dbdf2c ("/proc/pid/maps: don't show pgoff of pure ANON VMAs" had a typo. fs/proc/task_nommu.c:138: error: 'struct vm_area_struct' has no member named 'pg_off' distcc[21484] ERROR: compile fs/proc/task_nommu.c on sprygo/32 failed Signed-off-by: Nobuhiro Iwamatsu Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b3fffefea993a94c386b2d96de2d09469c343d1 Author: Alexander Beregalov Date: Tue Apr 7 21:21:42 2009 -0700 befs: fix build on parisc fs/befs/super.c:85: error: 'PAGE_SIZE' undeclared Signed-off-by: Alexander Beregalov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 430db323fae7665da721768949ade6304811c648 Author: Jan Kara Date: Tue Apr 7 18:25:01 2009 -0400 ext3: Try to avoid starting a transaction in writepage for data=writepage This does the same as commit 9e80d407736161d9b8b0c5a0d44f786e44c322ea (avoid starting a transaction when no block allocation is needed) but for data=writeback mode of ext3. We also cleanup the data=ordered case a bit to stick to coding style... Signed-off-by: Jan Kara Signed-off-by: "Theodore Ts'o" commit 6e34eeddf7deec1444bbddab533f03f520d8458c Author: Theodore Ts'o Date: Tue Apr 7 18:12:43 2009 -0400 block_write_full_page: switch synchronous writes to use WRITE_SYNC_PLUG Now that we have a distinction between WRITE_SYNC and WRITE_SYNC_PLUG, use WRITE_SYNC_PLUG in __block_write_full_page() to avoid unplugging the block device I/O queue between each page that gets flushed out. Otherwise, when we run sync() or fsync() and we need to write out a large number of pages, the block device queue will get unplugged between for every page that is flushed out, which will be a pretty serious performance regression caused by commit a64c8610. Signed-off-by: "Theodore Ts'o" commit 018ef96969098487ea3fdabd904d775a4cd93975 Author: David S. Miller Date: Wed Apr 8 03:55:30 2009 -0700 sparc: Hook up sys_preadv and sys_pwritev Signed-off-by: David S. Miller commit 01c4538158051768ecb7953396d10af8ae8a2518 Author: David S. Miller Date: Tue Apr 7 01:05:22 2009 -0700 sparc64: add_node_ranges() must be __init Signed-off-by: David S. Miller commit f5d378ace9a5bd08cef344df096ea0c871e99c18 Author: David S. Miller Date: Tue Apr 7 01:08:09 2009 -0700 serial: sunsu: sunsu_kbd_ms_init needs to be __devinit Signed-off-by: David S. Miller commit 7816238a539bf56311f04e7ff17076f66d5c902a Author: David S. Miller Date: Tue Apr 7 00:45:51 2009 -0700 sparc: Fix section mismatch warnings in cs4231 sound driver. Signed-off-by: David S. Miller commit 9a2ed5cc9ef6cb60abd3ea66d7be549d8023581a Author: David S. Miller Date: Tue Apr 7 01:03:58 2009 -0700 sparc64: Fix section mismatch warnings in PCI controller drivers. Signed-off-by: David S. Miller commit 19ab6db66ce1b32de54ecb474f16ade3247f8323 Author: David S. Miller Date: Tue Apr 7 00:47:44 2009 -0700 sparc64: Fix section mismatch warnings in power driver. Signed-off-by: David S. Miller commit 6bbc0b08db0750c2564578bd1be909bc8f7dee1a Author: David S. Miller Date: Tue Apr 7 00:54:27 2009 -0700 sparc64: get_cells() can't be marked __init Signed-off-by: David S. Miller commit 8897c1859521cf33077256725b2377164b130c75 Merge: 18b2646... db954b5... fdbdc7f... 13614e3... 33b5715... f61bb93... Author: Len Brown Date: Tue Apr 7 18:18:42 2009 -0400 Merge branches 'release', 'APERF', 'ARAT', 'misc', 'kelvin', 'device-lock' and 'bjorn.notify' into release commit db954b5898dd3ef3ef93f4144158ea8f97deb058 Author: Venkatesh Pallipadi Date: Mon Apr 6 18:51:29 2009 -0700 x86 ACPI: Add support for Always Running APIC timer Add support for Always Running APIC timer, CPUID_0x6_EAX_Bit2. This bit means the APIC timer continues to run even when CPU is in deep C-states. The advantage is that we can use LAPIC timer on these CPUs always, and there is no need for "slow to read and program" external timers (HPET/PIT) and the timer broadcast logic and related code in C-state entry and exit. Signed-off-by: Venkatesh Pallipadi Acked-by: H. Peter Anvin Signed-off-by: Len Brown commit 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c Author: Venkatesh Pallipadi Date: Mon Apr 6 11:26:08 2009 -0700 ACPI x86: Make aperf/mperf MSR access in acpi_cpufreq read_only Do not write zeroes to APERF and MPERF by ondemand governor. With this change, other users can share these MSRs for reads. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit e4f6937222dbb61b8b8e62caca3d32e648b3b14b Author: Venkatesh Pallipadi Date: Mon Apr 6 11:26:07 2009 -0700 ACPI x86: Cleanup acpi_cpufreq structures related to aperf/mperf Change structure name to make the code cleaner and simpler. No functionality change in this patch. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit fdbdc7fc79c02ae4ede869d514179a2c65633d28 Author: Len Brown Date: Tue Apr 7 17:33:58 2009 -0400 ACPICA: delete check for AML access to port 0x81-83 Sony laptops apparently write 4-bytes (rather than 1 byte) to debug port 0x80, which spews error messages: Denied AML access to port 0x00000080/4 (DMA1 0x0081-0x0083) [20090320] http://bugzilla.kernel.org/show_bug.cgi?id=13036 Signed-off-by: Len Brown commit f61bb93927fbc2933abe870813daba9d331aa121 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:37 2009 +0000 ACPI: WMI: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Carlos Corbacho Signed-off-by: Len Brown commit 8037d6e67709cf497134bbabd77b07dfc7c31fd6 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:32 2009 +0000 sony-laptop: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Mattia Dongili Signed-off-by: Len Brown commit cddd1f71d972a43c88f0ef91e1b71023539cd6e0 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:27 2009 +0000 panasonic-laptop: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Harald Welte Signed-off-by: Len Brown commit b4ec0275464756f4fd4108b4a4ca7aff61358ad3 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:22 2009 +0000 fujitsu-laptop: use .notify method instead of installing hotkey handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Tested by Tony on Fujitsu-Siemens Lifebook S6420 [FJNB1E6] with BIOS 1.18 (01/09/2009). Tested by Jonathan on Fujitsu S7020. Signed-off-by: Bjorn Helgaas Acked-By: Tony Vroon Tested-By: Tony Vroon Acked-by: Jonathan Woithe Tested-by: Jonathan Woithe Signed-off-by: Len Brown commit 700b6721cd1b891b67c2dcee046be12154a21fd6 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:16 2009 +0000 fujitsu-laptop: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Tested by Tony on Fujitsu-Siemens Lifebook S6420 [FJNB1E6] with BIOS 1.18 (01/09/2009). Tested by Jonathan on Fujitsu S7020. Signed-off-by: Bjorn Helgaas Acked-By: Tony Vroon Tested-By: Tony Vroon Acked-by: Jonathan Woithe Tested-by: Jonathan Woithe Signed-off-by: Len Brown commit 7015558fca5ee82fc17227b61d88ddaa02d82242 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:11 2009 +0000 ACPI: video: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Zhang Rui Signed-off-by: Len Brown commit 342d550db1bc0b879007a8cdb38645558e839680 Author: Bjorn Helgaas Date: Tue Apr 7 15:37:06 2009 +0000 ACPI: thermal: use .notify method instead of installing handler directly This patch adds a .notify() method. The presence of .notify() causes Linux/ACPI to manage event handlers and notify handlers on our behalf, so we don't have to install and remove them ourselves. Signed-off-by: Bjorn Helgaas CC: Zhang Rui Signed-off-by: Len Brown commit 5d38258ec026921a7b266f4047ebeaa75db358e5 Author: Vegard Nossum Date: Tue Apr 7 10:55:38 2009 +0200 ACPI battery: fix async boot oops > BUG: unable to handle kernel NULL pointer dereference at (null) What happens is that the battery module's init sections are being freed before the async callback (which was marked __init) has run. This theory is supported by the fact that the bad RIP value is a vmalloc address. The immediate fix is to make this a non-init call. (A better long-term fix is of course to wait with init-section unloading until a module's async initcalls have been run, which would allow us to discard this function which is still only run once, after all. Perhaps a new async_initcall() function for the async/module API, if this is needed for other modules in the future?) Reported-by: Arkadiusz Miskiewicz Signed-off-by: Vegard Nossum Tested-by: Alessandro Suardi Tested-by: Rafael J. Wysocki Signed-off-by: Len Brown commit 33b571501553ceb008c0aef8b89e932d4efda2a2 Author: Len Brown Date: Mon Dec 15 22:09:26 2008 -0500 ACPI: delete acpi_device.g_list unused Signed-off-by: Len Brown commit a3c270561ea4455cbcea0ac2b53335655d9fc805 Author: Hannes Eder Date: Thu Mar 5 20:15:44 2009 +0100 NULL noise: drivers/platform/x86/panasonic-laptop.c Fix this sparse warning: drivers/platform/x86/panasonic-laptop.c:273:70: warning: Using plain integer as NULL pointer Signed-off-by: Hannes Eder Signed-off-by: Len Brown commit d22616942804798105e61428afa41a9132421bb9 Author: Huang Weiyi Date: Mon Apr 6 17:16:46 2009 +0800 ACPI: cpufreq: remove dupilcated #include Remove dupilicated #include in arch/x86/kernel/cpu/cpufreq/longhaul.c. Signed-off-by: Huang Weiyi Signed-off-by: Len Brown commit 13614e37e94da4606a300ee6fe25c8c4a19ee670 Author: Jean Delvare Date: Mon Apr 6 16:01:46 2009 +0200 ACPI: Adjust Kelvin offset to match local implementation The exact offset between Kelvin and degree Celsius is 273.15. However ACPI handles temperature values with a single decimal place. As a consequence, some implementations use an offset of 273.1 and others use an offset of 273.2. Try to find out which one is being used, to present the most accurate and visually appealing number. Tested on a Sony Vaio PGC-GR214EP (which uses 273.1) and a Lenovo Thinkpad T60p (which uses 273.2). Signed-off-by: Jean Delvare Acked-by: Zhang Rui Signed-off-by: Len Brown commit 9090589d87506c578ea1523ffd7ae7fd9424fb28 Author: Shaohua Li Date: Tue Apr 7 10:24:29 2009 +0800 ACPI: convert acpi_device_lock spinlock to mutex Convert acpi_device_lock to a mutex to avoid a potential race upon access to /proc/acpi/wakeup Delete the lock entirely in wakeup.c since it is not necessary (and can not sleep) Found-by: Linus Torvalds Signed-off-by: Shaohua Li Signed-off-by: Len Brown commit 83731671d9e6878c0a05d309c68fb71c16d3235a Author: Pablo Neira Ayuso Date: Mon Apr 6 17:47:20 2009 +0200 netfilter: ctnetlink: fix regression in expectation handling This patch fixes a regression (introduced by myself in commit 19abb7b: netfilter: ctnetlink: deliver events for conntracks changed from userspace) that results in an expectation re-insertion since __nf_ct_expect_check() may return 0 for expectation timer refreshing. This patch also removes a unnecessary refcount bump that pretended to avoid a possible race condition with event delivery and expectation timers (as said, not needed since we hold a reference to the object since until we finish the expectation setup). This also merges nf_ct_expect_related_report() and nf_ct_expect_related() which look basically the same. Reported-by: Patrick McHardy Signed-off-by: Pablo Neira Ayuso Signed-off-by: Patrick McHardy commit 3ae16f13027c26cb4c227392116c2027524a6444 Author: Alex Riesen Date: Mon Apr 6 17:09:43 2009 +0200 netfilter: fix selection of "LED" target in netfilter It's plural, not LED_TRIGGERS. Signed-off-by: Alex Riesen Signed-off-by: Patrick McHardy commit 49a88d18a1721ac14dbc67cd390db18ee1f3a42f Author: Eric Dumazet Date: Mon Apr 6 17:06:55 2009 +0200 netfilter: ip6tables regression fix Commit 7845447 (netfilter: iptables: lock free counters) broke ip6_tables by unconditionally returning ENOMEM in alloc_counters(), Reported-by: Graham Murray Signed-off-by: Eric Dumazet Signed-off-by: Patrick McHardy commit 89de3820c7ae615345c093ae6fddac01f326fdc4 Merge: 3ef48fa... 80748fb... Author: Russell King Date: Mon Apr 6 09:57:38 2009 +0100 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 3ef48fac6e8e2362a4e6ef31dd043c89fe107875 Author: Russell King Date: Sun Apr 5 12:27:24 2009 +0100 [ARM] omap: fix omap1 clock usecount decrement bug Same fix as per a7f8c59, but for OMAP1 instead. Signed-off-by: Russell King commit 80748fb8ff3bc068dccacb690cd2eb417b034ec7 Author: Mark Brown Date: Fri Apr 3 12:45:49 2009 +0100 [ARM] pxa: register AC97 controller devices The tosa, e740, e750, e800 and mioa701 all use AC97 audio codecs but does not register the platform device for the AC97 controller. Doing so is now required by ASoC. Signed-off-by: Mark Brown Acked-by: Dmitry Eremin-Solenikov Acked-by: Ian Molton Signed-off-by: Robert Jarzmik Signed-off-by: Eric Miao commit 675b5d869fe8f6f9cdb3c6758228f211fb1773e6 Author: Dmitry Eremin-Solenikov Date: Wed Apr 1 03:40:05 2009 +0400 [ARM] pxa/csb701: do not register devices on non-csb726 boads csb701 driver can currently only be used on csb726 boards, limit the csb701 devices registration to csb726 board. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit 8a28b10e915fff4a4e8be4f152a8e8695d0cb044 Author: Daniel Mack Date: Thu Apr 2 08:33:15 2009 +0200 [ARM] pxa/colibri: get rid of set_irq_type() In commit 47cb035560a41bd1bd3db506eeab93088815203e, the ax88796 driver learned to take IRQ flags from platform_device definition. Use that here to get rid of the set_irq_type() hack. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 22a0200b18b8526043d3014efdaf839b01767111 Author: Daniel Mack Date: Thu Apr 2 08:33:14 2009 +0200 [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL In 67fca028f1535e510689d2e444b0289e264e05c1, the ax88796 ethernet driver learned a way to let the platform data hand in the MAC address. Use it here as the original Colibri bootloader passes in a MAC address via ATAG_SERIAL. Reported-by: Matthias Meier Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 50f6bb0ab75794ad02cb5db503cc8c99465ceaf4 Author: Marek Vasut Date: Wed Apr 1 22:30:07 2009 +0800 [ARM] pxa/cm-x2xx: fix ucb1400 not being registered This patch fixes cm-x2xx not registering the ucb1400. This is because of the splitting of ucb1400 driver half year ago. Signed-off-by: Marek Vasut Acked-by: Mike Rapoport Signed-off-by: Eric Miao commit 81854f82c5c1a203b2f5c94f6aa2ed8b8e19f025 Author: Marek Vasut Date: Sat Mar 28 12:37:42 2009 +0100 [ARM] pxa: Add support for suspend on PalmTX, T5 and LD Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 8c8aa5fa3060abc17e8a07d15f575485f6a0c0b8 Author: Marek Vasut Date: Tue Mar 24 21:23:39 2009 +0100 [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 54088bf50f31e5f20e005922dae8948f9f856b79 Author: Marek Vasut Date: Tue Mar 24 00:29:29 2009 +0100 [ARM] pxa: Palm Tungsten E2 basic support This contains support for keypad, MMC, AC97, LCD and backlight. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit c9be0e39618984b925ec758c1384853db4435ea8 Author: Mike Rapoport Date: Tue Feb 3 09:15:30 2009 +0200 [ARM] pxa/em-x270: add libertas device registration Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao commit eb650b9ed0f69be075a5a86ef9c4fc2cf7915293 Author: Philipp Zabel Date: Sat Jan 31 12:13:57 2009 +0100 [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power With this patch, the bq24022 battery charger is controlled by the USB gadget framework (via gpio_vbus) when connected to USB. To compile, this patch depends on the "regulator: Allow init data to be supplied for bq24022" patch (queued for next in the regulator tree) to add the init_data field to struct bq24022_mach_info. It also depends on the "add optional OTG transceiver and voltage regulator support to pda_power" patch (queued for next in the power supply tree) to enable charging when connected to the AC charger. Signed-off-by: Philipp Zabel Signed-off-by: Eric Miao commit 5bf2b994bfe11bfe86231050897b2d881ca544d9 Author: Philipp Zabel Date: Sun Jan 18 17:40:27 2009 +0100 pda_power: Add optional OTG transceiver and voltage regulator support This patch allows machines to use an OTG transceiver driver instead of supplying a custom is_usb_online callback to check USB power. Also, in the case that the OTG transceiver handles charger control when connected to USB, a regulator named "ac_draw" can be supplied instead of the custom set_charge callback to control the charger when connected to AC. The check for (transceiver->state == OTG_STATE_B_PERIPHERAL) in otg_is_usb_online is probably too simple, I'm just using this with a peripheral only device and gpio_vbus + bq24022. I'm not sure which other OTG states can supply power. Signed-off-by: Philipp Zabel Signed-off-by: Anton Vorontsov commit cc52a29e6245acd9032fcfa0ffcab4cc612de986 Author: Balaji Rao Date: Tue Jan 27 19:22:55 2009 +0530 pcf50633_charger: Remove unused mbc_set_status function The 'pcf50633_mbc_set_status' function is unused, so remove it. Signed-off-by: Balaji Rao Cc: Andy Green Signed-off-by: Anton Vorontsov commit 9705ecc5c1f8f34f756164a711b4cc61110c0283 Author: Balaji Rao Date: Tue Jan 27 19:23:12 2009 +0530 pcf50633_charger: Enable periodic charging restart The battery charger state machine switches into charging mode when the battery voltage falls below 96% of a battery float voltage. But the voltage drop in Li-ion batteries is marginal(1~2 %) till about 80% of its capacity - which means, after a BATFULL, charging won't be restarted until 80%. This work_struct function restarts charging at regular intervals to make sure the battery doesn't discharge too much. Signed-off-by: Balaji Rao Cc: Andy Green Signed-off-by: Anton Vorontsov