commit 0882e8dd3aad33eca41696d463bb896e6c8817eb Author: Linus Torvalds Date: Tue Apr 14 13:51:48 2009 -0700 Linux 2.6.30-rc2 commit b897e6fbc49dd84b2634bca664344d503b907ce9 Merge: 6f66cbc 68c8434 Author: Linus Torvalds Date: Tue Apr 14 13:16:40 2009 -0700 Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: fix scheduling while holding the new active list spinlock drm/i915: Allow tiling of objects with bit 17 swizzling by the CPU. drm/i915: Correctly set the write flag for get_user_pages in pread. drm/i915: Fix use of uninitialized var in 40a5f0de drm/i915: indicate framebuffer restore key in SysRq help message drm/i915: sync hdmi detection by hdmi identifier with 2D drm/i915: Fix a mismerge of the IGD patch (new .find_pll hooks missed) drm/i915: Implement batch and ring buffer dumping commit 6f66cbc63081fd70e3191b4dbb796746780e5ae1 Author: Hugh Dickins Date: Tue Apr 14 19:25:42 2009 +0100 x86 microcode: revert some work_on_cpu Revert part of af5c820a3169e81af869c113e18ec7588836cd50 ("x86: cpumask: use work_on_cpu in arch/x86/kernel/microcode_core.c") That change is causing only one Intel CPU's microcode to be updated e.g. microcode: CPU3 updated from revision 0x9 to 0x17, date = 2005-04-22 where before it announced that also for CPU0 and CPU1 and CPU2. We cannot use work_on_cpu() in the CONFIG_MICROCODE_OLD_INTERFACE code, because Intel's request_microcode_user() involves a copy_from_user() from /sbin/microcode_ctl, which therefore needs to be on that CPU at the time. Signed-off-by: Hugh Dickins Signed-off-by: Linus Torvalds commit 68c84342171034120c8a1f6dfb8ef51b14250f11 Author: Shaohua Li Date: Wed Apr 8 10:58:23 2009 +0800 drm/i915: fix scheduling while holding the new active list spinlock regression caused by commit 5e118f4139feafe97e913df67b1f7c1e5083e535: i915_gem_object_move_to_inactive() should be called in task context, as it calls fput(); Signed-off-by: Shaohua Li [anholt: Add more detail to the comment about the lock break that's added] Signed-off-by: Eric Anholt commit 610f26e75176aeb896618c26b16cbc0601f0e3cf Merge: e9de427 27b1956 Author: Linus Torvalds Date: Tue Apr 14 10:12:31 2009 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: warn about lockdep disabling after kernel taint, fix commit e9de427e403f2670a44b5795707d8a240fb018c2 Merge: 9fc0178 3121bfe Author: Linus Torvalds Date: Tue Apr 14 10:12:07 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: fix "direct_io" private mmap fuse: fix argument type in fuse_get_user_pages() commit 9fc0178caa30070f65bded433f91756491a3cf26 Merge: 2b6b6d3 c85399c Author: Linus Torvalds Date: Tue Apr 14 10:10:53 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix possible mismatch of sufile counters on recovery nilfs2: segment usage file cleanups nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error nilfs2: simplify handling of active state of segments fix nilfs2: remove module version nilfs2: fix lockdep recursive locking warning on meta data files nilfs2: fix lockdep recursive locking warning on bmap nilfs2: return f_fsid for statfs2 commit 2b6b6d385d2933c105e27f2d25fdb36d392d7f59 Merge: 3e862dd 0a8c791 Author: Linus Torvalds Date: Tue Apr 14 10:10:16 2009 -0700 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Add missing FILE tag to MAINTAINERS microblaze: remove duplicated #include's microblaze: struct device - replace bus_id with dev_name() microblaze: Simplify copy_thread() microblaze: Add TIMESTAMPING constants to socket.h microblaze: Add missing empty ftrace.h file microblaze: Fix problem with removing zero length files commit 3e862dd5c94cc53ba6494804c7388303e3d25403 Merge: 2344b5b e588a00 Author: Linus Torvalds Date: Tue Apr 14 10:00:42 2009 -0700 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: sh: Add in PCI bus for DMA API debugging. sh: Pre-allocate a reasonable number of DMA debug entries. sh: sh7786: modify usb setup timeout judgment bug. MAINTAINERS: Update sh architecture file patterns. sh: ap325: use edge control for ov772x camera sh: Plug in support for ARCH=sh64 using sh SRCARCH. sh: urquell: Fix up address mapping in board comments. sh: Add support for DMA API debugging. sh: Provide cpumask_of_pcibus() to fix NUMA build. sh: urquell: Add board comment sh: wire up sys_preadv/sys_pwritev() syscalls. sh: sh7785lcr: fix PCI address map for 32-bit mode sh: intc: Added resume from hibernation support to the intc commit 2344b5b6851466511663154e517f8b31f70c4bb6 Author: David Howells Date: Tue Apr 14 17:08:34 2009 +0100 Fix lpfc_parse_bg_err()'s use of do_div() Fix lpfc_parse_bg_err()'s use of do_div(). It should be passing a 64-bit variable as the first parameter. However, since it's only using a 32-bit variable, it doesn't need to use do_div() at all, but can instead use the division operator. This deals with the following warnings: CC drivers/scsi/lpfc/lpfc_scsi.o drivers/scsi/lpfc/lpfc_scsi.c: In function 'lpfc_parse_bg_err': drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: comparison of distinct pointer types lacks a cast drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: right shift count >= width of type drivers/scsi/lpfc/lpfc_scsi.c:1397: warning: passing argument 1 of '__div64_32' from incompatible pointer type Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 78c5b82ee68207a176ad5ca5eabdb2dbe5cfbfd3 Author: Leandro Dorileo Date: Tue Apr 14 14:59:51 2009 +0100 tty: Update some of the USB kernel doc Updates some usb_serial_port members documentation. Signed-off-by: Leandro Dorileo Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 19e05426201651fe24c4e07bef7f6de0d2305218 Author: Tony Breeds Date: Tue Apr 14 14:58:41 2009 +0100 parport_pc: Fix build failure drivers/parport/parport_pc.c for powerpc In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 ("parport: Use the PCI IRQ if offered") parport_pc_probe_port() gained an irqflags arg. This isn't being supplied on powerpc. This patch make powerpc fallback to the old behaviour, that is using "0" for irqflags. Fixes build failure: In file included from drivers/parport/parport_pc.c:68: arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports': arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port' make[3]: *** [drivers/parport/parport_pc.o] Error 1 Signed-off-by: Tony Breeds Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 28783eb52013ad20784550bccd482e541c9619c2 Author: Alan Cox Date: Tue Apr 14 14:58:23 2009 +0100 parport: Fix various uses of parport_pc These got overlooked first time around. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit cf5450930db0ae308584e5361f3345e0ff73e643 Author: Alan Cox Date: Tue Apr 14 14:58:11 2009 +0100 tty: Fix leak in ti-usb If the ti-usb adapter returns an zero data length frame (which happens) then we leak a kref. Found by Christoph Mair who proposed a patch. The patch here is different as Christoph's patch didn't work for the case where tty = NULL and data arrived but Christoph did all the hard work chasing it down. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 7a9a65ced11ece416b730d6f21040a18e62d78a8 Author: Alan Cox Date: Tue Apr 14 14:57:36 2009 +0100 cdc-acm: Fix long standing abuse of tty->low_latency ACM sets the low latency flag but calls the flip buffer routines from IRQ context which isn't permitted (and as of 2.6.29 causes a warning hence this one was caught) Fortunatelt ACM doesn't need to set this flag in the first place as it only set it to work around problems in ancient (pre tty flip rewrite) kernels. Reported-by: Chuck Ebbert Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 0a8c791437db4937bd160570f594d0286d3dd78d Author: Michal Simek Date: Tue Apr 14 11:38:57 2009 +0200 microblaze: Add missing FILE tag to MAINTAINERS Signed-off-by: Michal Simek commit 27b19565fe4ca5b0e9d2ae98ce4b81ca728bf445 Author: Ingo Molnar Date: Tue Apr 14 11:03:12 2009 +0200 lockdep: warn about lockdep disabling after kernel taint, fix Impact: build fix for Sparc and s390 Stephen Rothwell reported that the Sparc build broke: In file included from kernel/panic.c:12: include/linux/debug_locks.h: In function '__debug_locks_off': include/linux/debug_locks.h:15: error: implicit declaration of function 'xchg' due to: 9eeba61: lockdep: warn about lockdep disabling after kernel taint There is some inconsistency between architectures about where exactly xchg() is defined. The traditional place is in system.h but the more logical point for it is in atomic.h - where most architectures (especially new ones) have it defined. These architecture also still offer it via system.h. Some, such as Sparc or s390 only have it in asm/system.h and not available via asm/atomic.h at all. Use the widest set of headers in debug_locks.h and also include asm/system.h. Reported-by: Stephen Rothwell Cc: Frederic Weisbecker Cc: "David S. Miller" Cc: Linus Torvalds LKML-Reference: <20090414144317.026498df.sfr@canb.auug.org.au> Signed-off-by: Ingo Molnar commit 00300d6746b96ca9dba100ea9ea8d01737cc9a4d Author: Huang Weiyi Date: Tue Apr 14 06:56:15 2009 +0800 microblaze: remove duplicated #include's Remove duplicated #include's in arch/microblaze/include/asm/io.h arch/microblaze/kernel/prom.c arch/microblaze/kernel/ptrace.c arch/microblaze/kernel/signal.c arch/microblaze/kernel/sys_microblaze.c Signed-off-by: Huang Weiyi Signed-off-by: Michal Simek commit 5a86dc1a749211fd87341ee7943f985cde71ea11 Author: Michal Simek Date: Tue Apr 14 09:38:06 2009 +0200 microblaze: struct device - replace bus_id with dev_name() Signed-off-by: Michal Simek commit a8fb748e89957426fafb2e2efccd5ce635d6f530 Author: Michal Simek Date: Tue Apr 14 09:18:19 2009 +0200 microblaze: Simplify copy_thread() Removing nr parameter from copy_tread function commit 6f2c55b843836d26528c56a0968689accaedbc67 Signed-off-by: Michal Simek commit 39141bfcad22e6d7393c0d0f81b2e180db6983df Author: Michal Simek Date: Tue Apr 14 09:16:01 2009 +0200 microblaze: Add TIMESTAMPING constants to socket.h This changes was introduce with commit: cb9eff097831007afb30d64373f29d99825d0068 net: new user space API for time stamping of incoming and outgoing packets Signed-off-by: Michal Simek commit 6c149fd7cda601ebd178dd2f07ccff6bb0d010cf Author: Michal Simek Date: Tue Apr 14 08:37:30 2009 +0200 microblaze: Add missing empty ftrace.h file Signed-off-by: Michal Simek commit 5a9bd51810bce6ac79b65f07116035b6b217986e Author: Michal Simek Date: Mon Apr 13 20:51:22 2009 +0200 microblaze: Fix problem with removing zero length files Adding one new line was recommended solution. Test with make distclean Tested-by: Jeff Garzik Signed-off-by: Michal Simek commit e588a00fe546695e93077b3f7b7009f0c31d9370 Author: Paul Mundt Date: Tue Apr 14 15:23:40 2009 +0900 sh: Add in PCI bus for DMA API debugging. This adds in the pci_bus_type for DMA API debug. Signed-off-by: Paul Mundt commit 7b41f5688c1e03c41c772cd1766d6d80189380dd Author: Paul Mundt Date: Tue Apr 14 15:22:15 2009 +0900 sh: Pre-allocate a reasonable number of DMA debug entries. This prevents the DMA API debugging from running out of entries right away on boot. Defines 4096 entries by default, which while a bit on the heavy side, ought to leave enough breathing room for some time. Signed-off-by: Paul Mundt commit b21597d0268983f8f9e8b563494f75490403e948 Merge: 1c98aa7 39826a1 Author: Linus Torvalds Date: Mon Apr 13 18:16:09 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: tomoyo: version bump to 2.2.0. tomoyo: add Documentation/tomoyo.txt commit 1c98aa7424ff163637d8321674ec58dee28152d4 Author: Linus Torvalds Date: Mon Apr 13 18:09:20 2009 -0700 Fix quilt merge error in acpi-cpufreq.c We ended up incorrectly using '&cur' instead of '&readin' in the work_on_cpu() -> smp_call_function_single() transformation in commit 01599fca6758d2cd133e78f87426fc851c9ea725 ("cpufreq: use smp_call_function_[single|many]() in acpi-cpufreq.c"). Andrew explains: "OK, the acpi tree went and had conflicting changes merged into it after I'd written the patch and it appears that I incorrectly reverted part of 18b2646fe3babeb40b34a0c1751e0bf5adfdc64c while fixing the resulting rejects. Switching it to `readin' looks correct." Acked-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39826a1e17c1957bd7b5cd7815b83940e5e3a230 Author: Tetsuo Handa Date: Wed Apr 8 22:31:28 2009 +0900 tomoyo: version bump to 2.2.0. Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 17a7b7b39056a82c5012539311850f202e6c3cd4 Author: Tetsuo Handa Date: Mon Apr 13 11:04:19 2009 +0900 tomoyo: add Documentation/tomoyo.txt Signed-off-by: Kentaro Takeda Signed-off-by: Tetsuo Handa Signed-off-by: Toshiharu Harada Signed-off-by: James Morris commit 2e1c63b7ed36532b68f0eddd6a184d7ba1013b89 Merge: fbeb438 3ecb1b7 Author: Linus Torvalds Date: Mon Apr 13 15:30:20 2009 -0700 Merge branch 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen * 'for-rc1/xen/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: add FIX_TEXT_POKE to fixmap xen: honour VCPU availability on boot xen: clean up gate trap/interrupt constants xen: set _PAGE_NX in __supported_pte_mask before pagetable construction xen: resume interrupts before system devices. xen/mmu: weaken flush_tlb_other test xen/mmu: some early pagetable cleanups Xen: Add virt_to_pfn helper function x86-64: remove PGE from must-have feature list xen: mask XSAVE from cpuid NULL noise: arch/x86/xen/smp.c xen: remove xen_load_gdt debug xen: make xen_load_gdt simpler xen: clean up xen_load_gdt xen: split construction of p2m mfn tables from registration xen: separate p2m allocation from setting xen: disable preempt for leave_lazy_mmu commit 0ee50254dfe0c96f9eef4fc9fdf47a18d6a12df3 Author: Kuninori Morimoto Date: Fri Apr 10 00:54:07 2009 +0000 sh: sh7786: modify usb setup timeout judgment bug. This corrects a race with the PHY RST bit not being set properly if the PLL status changes right before timeout. This resulted in it potentially failing even if the device came up in time. Special thanks to Mr. Juha Leppanen and Iwamatsu-san for reporting this out and reviewing it. Reported-by: Juha Leppanen Reviewed-by: Nobuhiro Iwamatsu Tested-by: Paul Mundt Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit fbeb4384748abb78531bbe1e80d627412a0abcfa Author: Jean Delvare Date: Mon Apr 13 14:40:21 2009 -0700 edac: use to_delayed_work() The edac-core driver includes code which assumes that the work_struct which is included in every delayed_work is the first member of that structure. This is currently the case but might change in the future, so use to_delayed_work() instead, which doesn't make such an assumption. linux-2.6.30-rc1 has the to_delayed_work() function that will allow this patch to work Signed-off-by: Jean Delvare Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6da46b273443c8cebef81a68b2d0d955b8a07b4 Author: Jeff Haran Date: Mon Apr 13 14:40:20 2009 -0700 edac: fix local pci_write_bits32 Fix the edac local pci_write_bits32 to properly note the 'escape' mask if all ones in a 32-bit word. Currently no consumer of this function uses that mask, so there is no danger to existing code. Signed-off-by: Jeff Haran Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a7665b0a380585fbd70a2275f3120c6086e0c92d Author: Robin Holt Date: Mon Apr 13 14:40:19 2009 -0700 sgi-xpc: clean up numerous globals Introduce xpc_arch_ops and eliminate numerous individual global definitions. Signed-off-by: Robin Holt Cc: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efdd06ed181a88a11e612238c1ac04668e665395 Author: Robin Holt Date: Mon Apr 13 14:40:19 2009 -0700 sgi-xpc: implement opencomplete messaging sgi-xpc has a window of failure where an open message can be sent and a subsequent data message can get lost. We have added a new message (opencomplete) which closes that window. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a374c57b0764432a80303abee3d1afd1939b5a0a Author: Robin Holt Date: Mon Apr 13 14:40:18 2009 -0700 sgi-xpc: prevent false heartbeat failures The heartbeat timeout functionality in sgi-xpc is currently not trained to the connection time. If a connection is made and the code is in the last polling window prior to doing a timeout, the next polling window will see the heartbeat as unchanged and initiate a no-heartbeat disconnect. Signed-off-by: Robin Holt Signed-off-by: Dean Nelson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a06bba4643ae10ac6b202dade1cde38bc5e08b25 Author: Robin Holt Date: Mon Apr 13 14:40:17 2009 -0700 sgi-xpc: update SGI XP/XPC/XPNET maintainer Dean has moved on to other work. His responsibilities for XP/XPC/XPNET have been handed to me. Signed-off-by: Robin Holt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bbdba2737443ae7b530a453d8152f2068ca4cf56 Author: Shen Feng Date: Mon Apr 13 14:40:16 2009 -0700 doc: use correct debugfs mountpoint Use the default mountpoint of debugfs in the pktcdvd ABI. Signed-off-by: Shen Feng Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c863d835b7cd9a3c08a941d4ae59b8faefa31422 Author: Bharata B Rao Date: Mon Apr 13 14:40:15 2009 -0700 memcg: fix documentation The description about various statistics from memory.stat is not accurate and confusing at times. Correct this along with a few other minor cleanups. Signed-off-by: Bharata B Rao Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e930438c42e744ef1f8bfdbb338253c9f384df42 Author: Yang Hongyang Date: Mon Apr 13 14:40:14 2009 -0700 Replace all DMA_nBIT_MASK macro with DMA_BIT_MASK(n) This is the second go through of the old DMA_nBIT_MASK macro,and there're not so many of them left,so I put them into one patch.I hope this is the last round. After this the definition of the old DMA_nBIT_MASK macro could be removed. Signed-off-by: Yang Hongyang Cc: Russell King Cc: Tony Lindgren Cc: "David S. Miller" Cc: James Bottomley Cc: Greg KH Cc: Takashi Iwai Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 316cb4ef3eb2ad6e35e15cc56d39c6cda58c093a Author: Jan Kara Date: Mon Apr 13 14:40:14 2009 -0700 ext2: fix data corruption for racing writes If two writers allocating blocks to file race with each other (e.g. because writepages races with ordinary write or two writepages race with each other), ext2_getblock() can be called on the same inode in parallel. Before we are going to allocate new blocks, we have to recheck the block chain we have obtained so far without holding truncate_mutex. Otherwise we could overwrite the indirect block pointer set by the other writer leading to data loss. The below test program by Ying is able to reproduce the data loss with ext2 on in BRD in a few minutes if the machine is under memory pressure: long kMemSize = 50 << 20; int kPageSize = 4096; int main(int argc, char **argv) { int status; int count = 0; int i; char *fname = "/mnt/test.mmap"; char *mem; unlink(fname); int fd = open(fname, O_CREAT | O_EXCL | O_RDWR, 0600); status = ftruncate(fd, kMemSize); mem = mmap(0, kMemSize, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); // Fill the memory with 1s. memset(mem, 1, kMemSize); sleep(2); for (i = 0; i < kMemSize; i++) { int byte_good = mem[i] != 0; if (!byte_good && ((i % kPageSize) == 0)) { //printf("%d ", i / kPageSize); count++; } } munmap(mem, kMemSize); close(fd); unlink(fname); if (count > 0) { printf("Running %d bad page\n", count); return 1; } return 0; } Cc: Ying Han Cc: Nick Piggin Signed-off-by: Jan Kara Cc: Mingming Cao Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caefba1740d8016e6dfe8fda84f85bdcb8f8c85d Author: Hugh Dickins Date: Mon Apr 13 14:40:12 2009 -0700 shmem: respect MAX_LFS_FILESIZE SHMEM_MAX_BYTES was derived from the maximum size of its triple-indirect swap vector, forgetting to take the MAX_LFS_FILESIZE limit into account. Never mind 256kB pages, even 8kB pages on 32-bit kernels allowed files to grow slightly bigger than that supposed maximum. Fix this by using the min of both (at build time not run time). And it happens that this calculation is good as far as 8MB pages on 32-bit or 16MB pages on 64-bit: though SHMSWP_MAX_INDEX gets truncated before that, it's truncated to such large numbers that we don't need to care. [akpm@linux-foundation.org: it needs pagemap.h] [akpm@linux-foundation.org: fix sparc64 min() warnings] Signed-off-by: Hugh Dickins Cc: Yuri Tikhonov Cc: Paul Mackerras Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 61609d01cbb3ab865c8cccaf85e6837c47096480 Author: Yuri Tikhonov Date: Mon Apr 13 14:40:11 2009 -0700 shmem: fix division by zero Fix a division by zero which we have in shmem_truncate_range() and shmem_unuse_inode() when using big PAGE_SIZE values (e.g. 256kB on ppc44x). With 256kB PAGE_SIZE, the ENTRIES_PER_PAGEPAGE constant becomes too large (0x1.0000.0000) on a 32-bit kernel, so this patch just changes its type from 'unsigned long' to 'unsigned long long'. Hugh: reverted its unsigned long longs in shmem_truncate_range() and shmem_getpage(): the pagecache index cannot be more than an unsigned long, so the divisions by zero occurred in unreached code. It's a pity we need any ULL arithmetic here, but I found no pretty way to avoid it. Signed-off-by: Yuri Tikhonov Signed-off-by: Hugh Dickins Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 347486bb108fa6e0fd2753c1be3519d6be2516ed Author: Stefan Husemann Date: Mon Apr 13 14:40:10 2009 -0700 intelfb: support i854 Support the Intel 854 Chipset in fbdev. We test and use the patch on a Thomson IP1101 IPTV-Box. On the VGA-Port we get a normal signal. Here is the link to the Mambux-Project: http://www.mambux.de Cc: Keith Packard Cc: Dave Airlie Cc: Krzysztof Helt Signed-off-by: Stefan Husemann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a55ce6dc705c9ed0bb0d4f629dbcaf3b3ced5172 Author: Michael Ellerman Date: Mon Apr 13 14:40:09 2009 -0700 mm: add documentation describing what tsk->active_mm means vs tsk->mm I'm sure everyone knows this, but I didn't, so I googled it, and found a nice explanation from Linus. Might be worth sticking in Documentation. Signed-off-by: Michael Ellerman Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8031cb00e286600ea08bd00a6812dbfec412376 Author: KAMEZAWA Hiroyuki Date: Mon Apr 13 14:40:08 2009 -0700 memcg: remove warning when CONFIG_DEBUG_VM=n mm/memcontrol.c:318: warning: `mem_cgroup_is_obsolete' defined but not used [akpm@linux-foundation.org: simplify as suggested by Balbir] Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3d26dcf7679c5cc6c9f3b95ffdb2152fba2b7fae Author: Andi Kleen Date: Mon Apr 13 14:40:08 2009 -0700 kernel/sys.c: clean up sys_shutdown exit path Impact: cleanup, fix Clean up sys_shutdown() exit path. Factor out common code. Return correct error code instead of always 0 on failure. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4cafbd0b94d2c8cae6ede6d1c3ab90547547a3d2 Author: Geert Uytterhoeven Date: Mon Apr 13 14:40:07 2009 -0700 at25: make input buffers of at25_*write() const | drivers/misc/eeprom/at25.c:358: warning: assignment from incompatible pointer type Signed-off-by: Geert Uytterhoeven Cc: Kevin Hilman Cc: David Brownell Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 280ca299dea58180a59ec4b146595211b280f598 Author: Geert Uytterhoeven Date: Mon Apr 13 14:40:06 2009 -0700 at24: make input buffers of at24_*write() const | drivers/misc/eeprom/at24.c:508: warning: assignment from incompatible pointer type Signed-off-by: Geert Uytterhoeven Cc: Kevin Hilman Cc: David Brownell Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32433879480d13bc019d5a067ce884064a93dd63 Author: Jan Kara Date: Mon Apr 13 14:40:06 2009 -0700 jbd: update locking coments Update information about locking in JBD revoke code. Reported-by: Lin Tan . Signed-off-by: Jan Kara Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9de100d001564f58c3fb2ec1bd03e540ac0aa357 Author: Andy Grover Date: Mon Apr 13 14:40:05 2009 -0700 mm: document get_user_pages_fast() While better than get_user_pages(), the usage of gupf(), especially the return values and the fact that it can potentially only partially pin the range, warranted some documentation. Signed-off-by: Andy Grover Cc: Ingo Molnar Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d20d5a7456d57d8affa88f45f27ae96ea49c29e4 Author: Randy Robertson Date: Mon Apr 13 14:40:04 2009 -0700 initramfs: fix initramfs to work with hardlinked init Change cb6ff208076b5f434db1b8c983429269d719cef5 ("NOMMU: Support XIP on initramfs") seems to have broken booting from initramfs with /sbin/init being a hardlink. It seems like the logic required for XIP on nommu, i.e. ftruncate to reported cpio header file size (body_len) is broken for hardlinks, which have a reported size of 0, and the truncate thus nukes the contents of the file (in my case busybox), making boot impossible and ending with runaway loop modprobe binfmt-0000 - and of course 0000 is not a valid binary format. My fix is to only call ftruncate if size is non-zero which fixes things for me, but I'm not certain whether this will break XIP for those files on nommu systems, although I would guess not. Signed-off-by: Randy Robertson Acked-by: David Howells Acked-by: Paul Mundt Acked-by: H. Peter Anvin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1671f6d783a2385d32e11f456cbe32f0e4b4b49 Author: Oleg Nesterov Date: Mon Apr 13 14:40:03 2009 -0700 ptrace: fix exit_ptrace() vs ptrace_traceme() race Pointed out by Roland. The bug was recently introduced by me in "forget_original_parent: split out the un-ptrace part", commit 39c626ae47c469abdfd30c6e42eff884931380d6. Since that patch we have a window after exit_ptrace() drops tasklist and before forget_original_parent() takes it again. In this window the child can do ptrace(PTRACE_TRACEME) and nobody can untrace this child after that. Change ptrace_traceme() to not attach to the exiting ->real_parent. We don't report the error in this case, we pretend we attach right before ->real_parent calls exit_ptrace() which should untrace us anyway. Signed-off-by: Oleg Nesterov Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b102d034c0affc6ee703b576f2496ec6cb81d79 Author: Jean Delvare Date: Mon Apr 13 14:40:02 2009 -0700 MAINTAINERS: bluesmoke-devel list is moderated for non-subscribers Signed-off-by: Jean Delvare Acked-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c24b720188e9a1f83caa5b6d49b4cb5b843256f1 Author: David Howells Date: Mon Apr 13 14:40:01 2009 -0700 mm: reformat the Unevictable-LRU documentation Do a bit of reformatting on the Unevictable-LRU documentation. Signed-off-by: David Howells Acked-by: Lee Schermerhorn Cc: Rik van Riel Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a52edded382c2f436721d5a044ed16c290c5750 Author: David Howells Date: Mon Apr 13 14:40:01 2009 -0700 mm: point the UNEVICTABLE_LRU config option at the documentation Point the UNEVICTABLE_LRU config option at the documentation describing the option. Signed-off-by: David Howells Cc: Lee Schermerhorn Cc: Rik van Riel Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 267b01fe8345098b9459f5bac3d97cbba3264ec4 Author: Huang Weiyi Date: Mon Apr 13 14:40:00 2009 -0700 sysrq: remove duplicated #include Remove duplicated #include in drivers/char/sysrq.c. Signed-off-by: Huang Weiyi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1faca76fad20435328e6ffd7d852022097c94fa4 Author: Joe Perches Date: Mon Apr 13 14:39:59 2009 -0700 include/video/cyblafb.h: remove it, it's unused commit ddb53d48da5b0e691f35e703ac29118747f86c99 ("fbdev: remove cyblafb driver") removed drivers/video/cyblafb.c, but not its .h file Signed-off-by: Joe Perches Cc: Krzysztof Helt Cc: "Jani Monoses" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5341cfab94ec05b8a45726f9fe15e71c0cd9b915 Author: Andrea Righi Date: Mon Apr 13 14:39:58 2009 -0700 res_counter: update documentation After the introduction of resource counters hierarchies (28dbc4b6a01fb579a9441c7b81e3d3413dc452df) the prototypes of res_counter_init() and res_counter_charge() have been changed. Keep the documentation consistent with the actual function prototypes. Signed-off-by: Andrea Righi Cc: Paul Menage Cc: Pavel Emelyanov Cc: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdff549ebeff92b1a6952e5501caf16a6f8898c8 Author: David Brownell Date: Mon Apr 13 14:39:57 2009 -0700 spi: spi_write_then_read() bugfixes The "simplify spi_write_then_read()" patch included two regressions from the 2.6.27 behaviors: - The data it wrote out during the (full duplex) read side of the transfer was not zeroed. - It fails completely on half duplex hardware, such as Microwire and most "3-wire" SPI variants. So, revert that patch. A revised version should be submitted at some point, which can get the speedup on standard hardware (full duplex) without breaking on less-capable half-duplex stuff. Signed-off-by: David Brownell Cc: [2.6.28.x, 2.6.29.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0769c2981495c3d05429840d6fc7a1b5e26accaa Author: Andi Kleen Date: Mon Apr 13 14:39:56 2009 -0700 asm-generic/siginfo.h: update NSIGTRAP definition Impact: (nearly) trivial The patch commit da654b74bda14c45a7d98c731bf3c1a43b6b74e2 Author: Srinivasa Ds Date: Tue Sep 23 15:23:52 2008 +0530 signals: demultiplexing SIGTRAP signal forgot to update the NSIGTRAP define in asm-generic/siginfo.h to the new number of sigtrap subcodes. Nothing in the tree seems to use it, but presumably something in user space might. So update it. Cc: Srinivasa Ds Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0efb2a03af7eddadb4d0db5f855b1614ba9b0a00 Author: Krzysztof Helt Date: Mon Apr 13 14:39:55 2009 -0700 cirrusfb: do not allow unsupported pixel depth Do not allow modes with unsupported pixel depth. Otherwise, one can hang a computer by setting incorrect value with fbset command. Signed-off-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697f619fc87aa9bf5b6c8c756f7ea54e950d5cd5 Author: Randy Dunlap Date: Mon Apr 13 14:39:54 2009 -0700 filemap: fix kernel-doc warnings Fix filemap.c kernel-doc warnings: Warning(mm/filemap.c:575): No description found for parameter 'page' Warning(mm/filemap.c:575): No description found for parameter 'waiter' Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5dec8bfbdd4921522565a7b0e0c8760ae042ef6d Author: Eric Sandeen Date: Mon Apr 13 14:39:54 2009 -0700 include/linux/fiemap.h: include types.h now that it's exported Include in fiemap.h. Sam Ravnborg pointed out that this was missing in this newly-exported header which uses the __u32 and __u64 types. Signed-off-by: Eric Sandeen Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3e6210195c4e1157159779b7c700ba76f4546421 Author: Paul Menzel Date: Mon Apr 13 14:39:53 2009 -0700 drivers/video/aty/radeon_base.c: fix typo in comment Signed-off-by: Paul Menzel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 811a201374b10d60662504f9ea533e03914fdb27 Author: Michal Januszewski Date: Mon Apr 13 14:39:52 2009 -0700 sisfb: fix color component length for pseudocolor modes sisfb incorrectly sets the length of the color fields to 6 bits for PSEUDOCOLOR modes, even though 8 bits are always used per pixel. Fix this by setting the length to 8. Signed-off-by: Michal Januszewski Cc: Thomas Winischhofer Acked-by: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0a4534801468325fdb6a7b7bf73ad2a958a1e379 Author: Michal Januszewski Date: Mon Apr 13 14:39:51 2009 -0700 sa1100fb: fix color component length for pseudocolor modes sa1100fb incorrectly sets the length of the color fields to 8 bits for PSEUDOCOLOR modes for which only 4 bits are used per pixel. Fix this by setting the length to 4 bits for these modes. Signed-off-by: Michal Januszewski Cc: Krzysztof Helt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c26d7b29d9989cfd9004e688ad517925b0db37d0 Author: Michal Januszewski Date: Mon Apr 13 14:39:49 2009 -0700 s3fb: fix color component length for pseudocolor modes s3fb incorrectly sets the length of the color fields to 6 bits for PSEUDOCOLOR modes, even though 8 or 4 bits are used per pixel. Fix this by setting the length to 8 or 4, respectively. Signed-off-by: Michal Januszewski Acked-by: Ondrej Zajicek Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f26ec5baa67524b00311b8ec4626efc0a95925e1 Author: Geert Uytterhoeven Date: Mon Apr 13 14:39:48 2009 -0700 namespaces: move get_mq() inside #ifdef CONFIG_SYSCTL | ipc/mq_sysctl.c:26: warning: 'get_mq' defined but not used Signed-off-by: Geert Uytterhoeven Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17a5138d204014b00cb9c1d6e8ff311993041b5c Author: Alexey Dobriyan Date: Mon Apr 13 14:39:47 2009 -0700 aio: remove INIT_KIOCTX Unused after 20dcae32439384b6863c626bb3b2a09bed65b33e aka "[PATCH] aio: remove kioctx from mm_struct". Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb2e5f452a1456c7a20f7566a24d5a8f6ef3edd5 Author: Dave Anderson Date: Mon Apr 13 14:39:46 2009 -0700 hfs: fix memory leak when unmounting When an HFS filesystem is unmounted, it leaks a 2-page bitmap. Also, under extreme memory pressure, it's possible that hfs_releasepage() may use a tree pointer that has not been initialized, and if so, the release request should just be rejected. [akpm@linux-foundation.org: free_pages(0) is legal, remove obvious comment] Signed-off-by: Dave Anderson Tested-by: Eugene Teo Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 251eb40f5ccd07a905633a816fbf8f2b6b25cced Author: Jonathan Cameron Date: Mon Apr 13 14:39:45 2009 -0700 hwmon: sht15 humidity sensor driver Data sheet at: http://www.sensirion.ch/en/pdf/product_information/Datasheet-humidity-sensor-SHT1x.pdf These sensors communicate over a 2 wire bus running a device specific protocol. The complexity of the driver is mainly due to handling the substantial delays between requesting a reading and the device pulling the data line low to indicate that the data is available. This is handled by an interrupt that is disabled under all other conditions. I wasn't terribly clear on the best way to handle this, so comments on that aspect would be particularly welcome! Interpretation of the temperature depends on knowing the supply voltage. If configured in a board config as a regulator consumer this is obtained from the regulator subsystem. If not it should be provided in the platform data. I've placed this driver in the hwmon subsystem as it is definitely a device that may be used for hardware monitoring and with it's relatively slow response times (up to 120 millisecs to get a reading) a caching strategy certainly seems to make sense! Signed-off-by: Jonathan Cameron Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 133bb070e94ab41d750c6f2160c8843e46f11b78 Author: Matthew Garrett Date: Mon Apr 13 14:39:44 2009 -0700 efifb: exit if framebuffer address is invalid efifb will attempt to ioremap a framebuffer even if its starting address is 0, failing and causing an ugly backtrace in the process. Exit before probing if this is the case. Signed-off-by: Matthew Garrett Acked-by: Peter Jones Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0ca1071f7dbd673de826eb3fb01bfdfd1d423433 Author: Michal Januszewski Date: Mon Apr 13 14:39:43 2009 -0700 uvesafb: fix color component length for pseudocolor modes uvesafb incorrectly sets the length of the color fields to 6 bits for PSEUDOCOLOR modes, even though 8 bits are always used per pixel. Fix this by setting the length to 8. The switch of the DAC width from the default 6 bits to 8 bits is retained and tracked internally in the driver, but never exposed to userspace. Signed-off-by: Michal Januszewski Acked-by: Krzysztof Helt Cc: Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ebde441177da3bad156701d351509f34295282ab Author: Michal Januszewski Date: Mon Apr 13 14:39:41 2009 -0700 fbdev: fix color component field length documentation The documentation about the meaning of the color component bitfield lengths in pseudocolor modes is inconsistent. Fix it, so that it indicates the correct interpretation everywhere, i.e. that 1 << length is the number of palette entries. Signed-off-by: Michal Januszewski Acked-by: Krzysztof Helt Cc: Acked-by: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 513adb58685615b0b1d47a3f0d40f5352beff189 Author: Andrea Righi Date: Mon Apr 13 14:39:39 2009 -0700 fbdev: fix info->lock deadlock in fbcon_event_notify() fb_notifier_call_chain() is called with info->lock held, i.e. in do_fb_ioctl() => FBIOPUT_VSCREENINFO => fb_set_var() and the some notifier callbacks, like fbcon_event_notify(), try to re-acquire info->lock again. Remove the lock/unlock_fb_info() in all the framebuffer notifier callbacks' and be sure to always call fb_notifier_call_chain() with info->lock held. Reported-by: Pavel Roskin Reported-by: Eric Miao Signed-off-by: Andrea Righi Cc: Stefan Richter Cc: Krzysztof Helt Cc: Geert Uytterhoeven Cc: "Rafael J. Wysocki" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b52bb3712a64c404846f30300b339cfd01e316be Author: Nikanth Karthikesan Date: Mon Apr 13 14:39:38 2009 -0700 init/initramfs: fix warning with CONFIG_BLK_DEV_RAM=n init/initramfs.c:520: warning: 'clean_rootfs' defined but not used Signed-off-by: Nikanth Karthikesan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f6f6c6b5c4774cfdbe759eea1f5203a4b26fe6f Author: Huang Weiyi Date: Mon Apr 13 14:39:37 2009 -0700 hp_accel: remove unused #include Remove unused #include in drivers/hwmon/hp_accel.c. Signed-off-by: Huang Weiyi Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca8b9950298c84ca528a5943409a727c04ec88f8 Author: Li Zefan Date: Mon Apr 13 14:39:36 2009 -0700 Documentation/sysctl/net.txt: fix a typo s/spicified/specified Signed-off-by: Li Zefan Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f403bb802f634d5727e4d48a987ce02ef8dd8ce0 Author: Randy Dunlap Date: Mon Apr 13 14:39:36 2009 -0700 MAINTAINERS: fix Andreas's email address Correct typo in email address. Signed-off-by: Randy Dunlap Cc: Andreas Herrmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 510f32b308d121248ea2ccd1b241fed548993670 Author: Jan Dumon Date: Mon Apr 13 14:39:34 2009 -0700 MAINTAINERS: switch maintainer of the hso driver Since Denis is no longer working for Option, I will maintain the driver from now on. Signed-off-by: Jan Dumon Cc: "David S. Miller" Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4be6f6bb66111c9468733a4ed9cad10dc3a762c0 Author: Peter Zijlstra Date: Mon Apr 13 14:39:33 2009 -0700 mm: move the scan_unevictable_pages sysctl to the vm table vm knobs should go in the vm table. Probably too late for randomize_va_space though. Signed-off-by: Peter Zijlstra Acked-by: Lee Schermerhorn Acked-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c1795cc4bd9d57281bebc314315b8afa217b9c7 Merge: 80a04d3 dc2a553 Author: Linus Torvalds Date: Mon Apr 13 14:35:13 2009 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: remove xfs_flush_space xfs: flush delayed allcoation blocks on ENOSPC in create xfs: block callers of xfs_flush_inodes() correctly xfs: make inode flush at ENOSPC synchronous xfs: use xfs_sync_inodes() for device flushing xfs: inform the xfsaild of the push target before sleeping xfs: prevent unwritten extent conversion from blocking I/O completion xfs: fix double free of inode xfs: validate log feature fields correctly commit 066069e14f6b4651293ae0865c121bcb2b360666 Author: Paul Mundt Date: Tue Apr 14 06:32:08 2009 +0900 MAINTAINERS: Update sh architecture file patterns. Fill in missing entries for drivers/sh/ and Documentation/sh/. Signed-off-by: Paul Mundt commit f499cae1e59d75d5eb24c23d47cf8986e6032c6d Merge: fc3f55e 80a04d3 Author: Paul Mundt Date: Tue Apr 14 06:29:07 2009 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit 80a04d3f2f94fb68b5df05e3ac6697130bc3467a Merge: eebb2af 2810ae8 Author: Linus Torvalds Date: Mon Apr 13 12:20:01 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes: docbook: make cleandocs kbuild: fix spurious initramfs rebuild Documentation: explain the difference between __bitwise and __bitwise__ kbuild: make it possible for the linker to discard local symbols from vmlinux kbuild: remove pointless strdup() on arguments passed to new_module() in modpost kbuild: fix a few typos in top-level Makefile kbuild: introduce destination-y for exported headers kbuild: use git svn instead of git-svn in setlocalversion kconfig: fix update-po-config to accect backslash in input kbuild: fix option processing for -I in headerdep commit eebb2afb82c4f999e850d198af26ce6969d0f47a Merge: b534d38 f600535 Author: Linus Torvalds Date: Mon Apr 13 11:46:04 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ata: fix obviously wrong comment ahci: force CAP_NCQ for earlier NV MCPs [libata] sata_via: kill uninit'd var warning commit b534d388c268ad051c72b187106a3c99021be006 Merge: c751085 ba28f22 Author: Linus Torvalds Date: Mon Apr 13 11:37:23 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (22 commits) Input: i8042 - add HP DV9700 to the noloop list Input: arrange drivers/input/misc/Makefile in alphabetical order Input: add AD7879 Touchscreen driver Input: add AD7877 touchscreen driver Input: bf54x-keys - fix typo in warning Input: add driver for S1 button of rb532 Input: generic driver for rotary encoders on GPIOs Input: hilkbd - fix crash when removing hilkbd module Input: atkbd - add quirk for Fujitsu Siemens Amilo PA 1510 Input: atkbd - consolidate force release quirk setup Input: add accelerated touchscreen support for Marvell Zylonite Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events Input: wm97xx - use disable_irq_nosync() for Mainstone Input: wm97xx - add BTN_TOUCH event to wm97xx to use it with Android Input: fix polling of /proc/bus/input/devices Input: psmouse - add newline to OLPC HGPK touchpad debugging Input: ati_remote2 - check module params Input: ati_remote2 - add per device attrs Input: ati_remote2 - complete suspend support Input: stop autorepeat timer on key release ... commit c751085943362143f84346d274e0011419c84202 Author: Rafael J. Wysocki Date: Sun Apr 12 20:06:56 2009 +0200 PM/Hibernate: Wait for SCSI devices scan to complete during resume There is a race between resume from hibernation and the asynchronous scanning of SCSI devices and to prevent it from happening we need to call scsi_complete_async_scans() during resume from hibernation. In addition, if the resume from hibernation is userland-driven, it's better to wait for all device probes in the kernel to complete before attempting to open the resume device. Signed-off-by: Rafael J. Wysocki Acked-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 7b11428d37fe65643172feff66cd0a4d72d1932a Merge: b8256b4 e523b38 Author: Linus Torvalds Date: Mon Apr 13 11:35:50 2009 -0700 Merge git://git.infradead.org/iommu-2.6 * git://git.infradead.org/iommu-2.6: intel-iommu: Avoid panic() for DRHD at address zero. Intel-IOMMU Alignment Issue in dma_pte_clear_range() commit b8256b45d1245ad16221e8f965241267bd26c79d Merge: 8255309 a30469e Author: Linus Torvalds Date: Mon Apr 13 11:32:09 2009 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: add linux kernel support for YMM state x86: fix wrong section of pat_disable & make it static x86: Fix section mismatches in mpparse x86: fix set_fixmap to use phys_addr_t x86: Document get_user_pages_fast() x86, intr-remap: fix eoi for interrupt remapping without x2apic commit 8255309b887fcac11f791913a2d1d0b966a40d32 Merge: bf20753 44e9c8b Author: Linus Torvalds Date: Mon Apr 13 11:31:28 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing/filters: return proper error code when writing filter file tracing/filters: allow user input integer to be oct or hex tracing/filters: fix NULL pointer dereference tracing/filters: NIL-terminate user input filter ftrace: Output REC->var instead of __entry->var for trace format Make __stringify support variable argument macros too tracing: fix document references tracing: fix splice return too large tracing: update file->f_pos when splice(2) it tracing: allocate page when needed tracing: disable seeking for trace_pipe_raw commit bf20753c0cdf842c5c65af688c2cefd1eafa7630 Merge: 01599fc 574bbe7 Author: Linus Torvalds Date: Mon Apr 13 11:30:26 2009 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: lockdep: continue lock debugging despite some taints lockdep: warn about lockdep disabling after kernel taint commit 01599fca6758d2cd133e78f87426fc851c9ea725 Author: Andrew Morton Date: Mon Apr 13 10:27:49 2009 -0700 cpufreq: use smp_call_function_[single|many]() in acpi-cpufreq.c Atttempting to rid us of the problematic work_on_cpu(). Just use smp_call_fuction_single() here. This repairs a 10% sysbench(oltp)+mysql regression which Mike reported, due to 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 It seems that the kernel calls these acpi-cpufreq functions at a quite high frequency. Valdis Kletnieks also reports that this causes 70-90 forks per second on his hardware. Cc: Valdis.Kletnieks@vt.edu Cc: Rusty Russell Cc: Venkatesh Pallipadi Cc: Len Brown Cc: Zhao Yakui Acked-by: Dave Jones Cc: Thomas Gleixner Tested-by: Mike Galbraith Cc: "Zhang, Yanmin" Signed-off-by: Andrew Morton Acked-by: Ingo Molnar [ Made it use smp_call_function_many() instead of looping over cpu's with smp_call_function_single() - Linus ] Signed-off-by: Linus Torvalds commit 8371f87c9994d9942af5984309835aeb948ba579 Merge: 0ad30b8 9352986 Author: Linus Torvalds Date: Mon Apr 13 08:32:48 2009 -0700 Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6: i2c: Let new-style drivers implement attach_adapter i2c: Fix sparse warnings for I2C_BOARD_INFO() i2c-voodoo3: Deprecate in favor of tdfxfb i2c-algo-pca: Fix use of uninitialized variable in debug message commit 0ad30b8fd5fe798aae80df6344b415d8309342cc Author: Serge E. Hallyn Date: Mon Apr 13 09:56:14 2009 -0500 add some long-missing capabilities to fs_mask When POSIX capabilities were introduced during the 2.1 Linux cycle, the fs mask, which represents the capabilities which having fsuid==0 is supposed to grant, did not include CAP_MKNOD and CAP_LINUX_IMMUTABLE. However, before capabilities the privilege to call these did in fact depend upon fsuid==0. This patch introduces those capabilities into the fsmask, restoring the old behavior. See the thread starting at http://lkml.org/lkml/2009/3/11/157 for reference. Note that if this fix is deemed valid, then earlier kernel versions (2.4 and 2.2) ought to be fixed too. Changelog: [Mar 23] Actually delete old CAP_FS_SET definition... [Mar 20] Updated against J. Bruce Fields's patch Reported-by: Igor Zhbanov Signed-off-by: Serge E. Hallyn Cc: stable@kernel.org Cc: J. Bruce Fields Signed-off-by: Linus Torvalds commit d3ab02a7c51fcbceafe999a515cc8bc4f0d0cfee Merge: d811f23 be79b09 Author: Linus Torvalds Date: Mon Apr 13 08:23:46 2009 -0700 Merge branch 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods * 'gm_20090410' of git://repo.or.cz/linux-2.6/trivial-mods: MAINTAINERS - Update MN10300 patterns MAINTAINERS - Update frv arch patterns scripts/get_maintainer.pl - Allow multiple files on command line MAINTAINERS - Update Freescale sound patterns MAINTAINERS - Add additional patterns MAINTAINERS - Add missing "/" to some pattern directories MAINTAINERS - Update DRIVER CORE patterns MAINTAINERS - Update M68K patterns MAINTAINERS - Coalesce sections "DVB" and "Video for Linux" MAINTAINERS - Remove cyblafb frame buffer no longer in tree MAINTAINERS - Remove x86/Voyager no longer in tree MAINTAINERS - Update FPU Emulator contact address and web page MAINTAINERS - i2c_tiny_usb T: should be W: MAINTAINERS - Add Linus Torvalds' git MAINTAINERS - standardize "T: git urls" MAINTAINERS - Remove HP Fibre Channel HBA no longer in tree MAINTAINERS - Standardize style MAINTAINERS - Add file patterns Add scripts/get_maintainer.pl Acked-by: Pavel Machek Acked-by: Andrew Morton commit d811f236d90e58c67092eaadacab609e76c38749 Merge: 29a1e26 066123a Author: Linus Torvalds Date: Mon Apr 13 08:22:43 2009 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: percpu: unbreak alpha percpu mutex: have non-spinning mutexes on s390 by default commit 29a1e26febf4bd6eecab2a17a056c177d3627788 Merge: 01e4c5d ac15e95 Author: Linus Torvalds Date: Mon Apr 13 08:19:45 2009 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds: leds: just ignore invalid GPIOs in leds-gpio commit 01e4c5d39fcd8a5f41acd22c26072eecf1314a86 Merge: cec5455 3230e8c Author: Linus Torvalds Date: Mon Apr 13 08:18:30 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] omap_wdt.c: move probe function to .devinit.text [WATCHDOG] ks8695_wdt.c: move probe function to .devinit.text [WATCHDOG] at91rm9200_wdt.c: move probe function to .devinit.text [WATCHDOG] remove ARM26 sections [WATCHDOG] orion5x_wdt: Add shutdown callback, use watchdog ping function [WATCHDOG] i6300esb.c: Restructure initialization of the device [WATCHDOG] i6300esb.c: Fix the GETSTATUS and GETBOOTSTATUS ioctls. [WATCHDOG] i6300esb.c: Cleanup commit cec5455e457928153f5a51668dad3d68176feab5 Merge: b0cbc86 c6375b0 Author: Linus Torvalds Date: Mon Apr 13 08:17:52 2009 -0700 Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (60 commits) microblaze_v8: Add MAINTAINERS fragment microblaze_v8: Uartlite for Microblaze microblaze_v8: Makefiles for Microblaze cpu microblaze_v8: Kconfig patches microblaze_v8: Interrupt handling and timer support microblaze_v8: syscalls.h microblaze_v8: pci headers microblaze_v8: Kbuild file microblaze_v8: string.h thread_info.h microblaze_v8: unistd.h microblaze_v8: fcntl.h sockios.h ucontext.h microblaze_v8: pool.h socket.h microblaze_v8: device.h param.h topology.h microblaze_v8: headers files entry.h current.h mman.h registers.h sembuf.h microblaze_v8: namei.h microblaze_v8: gpio.h, serial.h microblaze_v8: headers simple files - empty or redirect to asm-generic microblaze_v8: sigcontext.h siginfo.h microblaze_v8: termbits.h termios.h microblaze_v8: stats headers ... commit 935298696f469c0e07c73be687bd055878074ce0 Author: Jean Delvare Date: Mon Apr 13 17:02:14 2009 +0200 i2c: Let new-style drivers implement attach_adapter While it isn't the way the standard device binding model works, it is OK for new-style drivers to implement attach_adapter. It may help convert the renaming legacy drivers to new style drivers faster. Signed-off-by: Jean Delvare Cc: David Brownell commit c758e8cffe3b1bc7970d579371db01b19ff440bf Author: Ben Hutchings Date: Mon Apr 13 17:02:14 2009 +0200 i2c: Fix sparse warnings for I2C_BOARD_INFO() Since the first argument to I2C_BOARD_INFO() must be a string constant, there is no need to parenthesise it, and adding parentheses results in an invalid initialiser for char[]. gcc obviously accepts this syntax as an extension, but sparse complains, e.g.: drivers/net/sfc/boards.c:173:2: warning: array initialized from parenthesized string constant Therefore, remove the parentheses. Signed-off-by: Ben Hutchings Signed-off-by: Jean Delvare commit 3f307fb37a6dd65b7eabda9c6208a9bd161dc16e Author: Jean Delvare Date: Mon Apr 13 17:02:13 2009 +0200 i2c-voodoo3: Deprecate in favor of tdfxfb Support for I2C/DDC was recently added to the tdfxfb driver, which means that the i2c-voodoo3 driver can be deprecated. Signed-off-by: Jean Delvare Cc: Krzysztof Helt commit c454dee21d589476608957ca4f57feaabde62fab Author: Jean Delvare Date: Mon Apr 13 17:02:13 2009 +0200 i2c-algo-pca: Fix use of uninitialized variable in debug message A recent change broke debugging of pca_xfer(), fix it. Reported-by: Geert Uytterhoeven Signed-off-by: Jean Delvare Acked-by: Wolfram Sang commit fc3f55e672e1ed917dd9e215af81939cd3d717da Author: Kuninori Morimoto Date: Mon Apr 13 06:40:04 2009 +0000 sh: ap325: use edge control for ov772x camera Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit f6005354d6d45afeafeca90661911d777c81f1e2 Author: Vegard Nossum Date: Wed Apr 8 18:19:39 2009 +0200 ata: fix obviously wrong comment Also remove the now-useless debug printouts which are supposed to tell us when the scan starts and ends. Signed-off-by: Vegard Nossum Signed-off-by: Jeff Garzik commit aa431dd39d560586db22209b7f78c33455e1a786 Author: Tejun Heo Date: Wed Apr 8 14:25:31 2009 -0700 ahci: force CAP_NCQ for earlier NV MCPs Along with MCP65, MCP67 and 73 also don't set CAP_NCQ. Force it. Reported by zaceni@yandex.ru on bko#13014 and confirmed by Peer Chen. Signed-off-by: Tejun Heo Reported-by: NightFox Cc: Peer Chen Signed-off-by: Jeff Garzik commit f1c22943e92473903288ccab23debc9993c3a560 Author: Jeff Garzik Date: Mon Apr 13 04:09:34 2009 -0400 [libata] sata_via: kill uninit'd var warning Reported and initial patch by Marin Mitov. Signed-off-by: Jeff Garzik commit c85399c2da8b86de8f6877980294fa1a4a88a5a4 Author: Ryusuke Konishi Date: Sun Apr 5 18:30:58 2009 +0900 nilfs2: fix possible mismatch of sufile counters on recovery On-disk counters ndirtysegs and ncleansegs of sufile, can go wrong after roll-forward recovery because nilfs_prepare_segment_for_recovery() function marks segments dirty without adjusting value of these counters. This fixes the problem by adding a function to sufile which does the operation adjusting the counters, and by letting the recovery function use it. Signed-off-by: Ryusuke Konishi commit a703018f7bbec8109419318f5d51f235fdce5155 Author: Ryusuke Konishi Date: Sun Apr 5 18:24:11 2009 +0900 nilfs2: segment usage file cleanups This will simplify sufile.c by sharing common code which repeatedly appears in routines updating a segment usage entry; a wrapper function nilfs_sufile_update() is introduced for the purpose, and counter modifications are integrated to a new function nilfs_sufile_mod_counter(). This is a preparation for the successive bugfix patch ("nilfs2: fix possible mismatch of sufile counters on recovery"). Signed-off-by: Ryusuke Konishi commit 88072faf9a32c92f37c15065496bb6eb309aebe3 Author: Ryusuke Konishi Date: Sun Apr 5 15:03:16 2009 +0900 nilfs2: fix wrong accounting and duplicate brelse in nilfs_sufile_set_error The nilfs_sufile_set_error() function wrongly adjusts the number of dirty segments instead of the number of clean segments. In addition, the function calls brelse() twice for the same buffer head. This fixes these bugs. Signed-off-by: Ryusuke Konishi commit 3efb55b496952e0d29a9ec66d0ceaab175c4e8ca Author: Ryusuke Konishi Date: Mon Mar 30 00:50:19 2009 +0900 nilfs2: simplify handling of active state of segments fix This fixes a bug of ("nilfs2: simplify handling of active state of segments") patch. The patch did not take account that a base index is increased in nilfs_sufile_get_suinfo() function if requested entries go across block boundary on sufile. Due to this bug, the active flag sometimes appears on wrong segments and has induced malfunction of garbage collection. Signed-off-by: Ryusuke Konishi commit e7a7402c0d392dcadc74cae8922f8fae4667605a Author: Ryusuke Konishi Date: Fri Mar 27 10:49:11 2009 +0900 nilfs2: remove module version A MODULE_VERSION() macro has been used in out-of-tree nilfs modules, but it's needless and not updated in tree. So, this removes it along with the version declaration. Signed-off-by: Ryusuke Konishi commit c2698e50e304cd29a7836f05452359a3306a405e Author: Ryusuke Konishi Date: Fri Mar 27 02:53:12 2009 +0900 nilfs2: fix lockdep recursive locking warning on meta data files This fixes the following false detection of lockdep against nilfs meta data files: ============================================= [ INFO: possible recursive locking detected ] 2.6.29 #26 --------------------------------------------- mount.nilfs2/4185 is trying to acquire lock: (&mi->mi_sem){----}, at: [] nilfs_sufile_get_stat+0x1e/0x105 [nilfs2] but task is already holding lock: (&mi->mi_sem){----}, at: [] nilfs_count_free_blocks+0x48/0x84 [nilfs2] Signed-off-by: Ryusuke Konishi commit bcb48891b05b4179edc86298d3dccb2ce90d5413 Author: Ryusuke Konishi Date: Fri Mar 27 02:51:39 2009 +0900 nilfs2: fix lockdep recursive locking warning on bmap The bmap semaphore of DAT file can be held while a bmap of other files is locked. This has caused the following false detection of lockdep check: mount.nilfs2/4667 is trying to acquire lock: (&bmap->b_sem){..--}, at: [] nilfs_bmap_lookup_at_level+0x1a/0x74 [nilfs2] but task is already holding lock: (&bmap->b_sem){..--}, at: [] nilfs_bmap_lookup_at_level+0x1a/0x74 [nilfs2] This will fix the false detection by distinguishing semaphores of the DAT and other files. Signed-off-by: Ryusuke Konishi commit c306af23e19d3c94c9229263c39fe487e915e774 Author: Ryusuke Konishi Date: Thu Mar 26 10:16:57 2009 +0900 nilfs2: return f_fsid for statfs2 This follows the change of Coly Li's series ("fs: return f_fsid for statfs(2)"), and make nilfs2 return f_fsid info for statfs(2). Acked-by: Coly Li Signed-off-by: Ryusuke Konishi commit 574bbe782057fdf0490dc7dec906a2dc26363e20 Author: Frederic Weisbecker Date: Sat Apr 11 03:17:18 2009 +0200 lockdep: continue lock debugging despite some taints Impact: broaden lockdep checks Lockdep is disabled after any kernel taints. This might be convenient to ignore bad locking issues which sources come from outside the kernel tree. Nevertheless, it might be a frustrating experience for the staging developers or those who experience a warning but are focused on another things that require lockdep. The v2 of this patch simply don't disable anymore lockdep in case of TAINT_CRAP and TAINT_WARN events. Signed-off-by: Frederic Weisbecker Cc: LTP Cc: Peter Zijlstra Cc: Greg KH LKML-Reference: <1239412638-6739-2-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 9eeba6138cefc0435695463ddadb0d95e0a6bcd2 Author: Frederic Weisbecker Date: Sat Apr 11 03:17:17 2009 +0200 lockdep: warn about lockdep disabling after kernel taint Impact: provide useful missing info for developers Kernel taint can occur in several situations such as warnings, load of prorietary or staging modules, bad page, etc... But when such taint happens, a developer might still be working on the kernel, expecting that lockdep is still enabled. But a taint disables lockdep without ever warning about it. Such a kernel behaviour doesn't really help for kernel development. This patch adds this missing warning. Since the taint is done most of the time after the main message that explain the real source issue, it seems safe to warn about it inside add_taint() so that it appears at last, without hurting the main information. v2: Use a generic helper to disable lockdep instead of an open coded xchg(). Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra LKML-Reference: <1239412638-6739-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit a30469e7921a6dd2067e9e836d7787cfa0105627 Author: Suresh Siddha Date: Fri Apr 10 15:21:24 2009 -0700 x86: add linux kernel support for YMM state Impact: save/restore Intel-AVX state properly between tasks Intel Advanced Vector Extensions (AVX) introduce 256-bit vector processing capability. More about AVX at http://software.intel.com/sites/avx Add OS support for YMM state management using xsave/xrstor infrastructure to support AVX. Signed-off-by: Suresh Siddha LKML-Reference: <1239402084.27006.8057.camel@localhost.localdomain> Signed-off-by: Ingo Molnar commit 1ee4bd92a7aa49eb66c8d5672e837090d3e7b7ff Author: Marcin Slusarz Date: Fri Apr 10 22:47:17 2009 +0200 x86: fix wrong section of pat_disable & make it static pat_disable cannot be __cpuinit anymore because it's called from pat_init and the callchain looks like this: pat_disable [cpuinit] <- pat_init <- generic_set_all <- ipi_handler <- set_mtrr <- (other non init/cpuinit functions) WARNING: arch/x86/mm/built-in.o(.text+0x449e): Section mismatch in reference from the function pat_init() to the function .cpuinit.text:pat_disable() The function pat_init() references the function __cpuinit pat_disable(). This is often because pat_init lacks a __cpuinit annotation or the annotation of pat_disable is wrong. Non CONFIG_X86_PAT version of pat_disable is static inline, so this version can be static too (and there are no callers outside of this file). Signed-off-by: Marcin Slusarz Acked-by: Sam Ravnborg LKML-Reference: <49DFB055.6070405@gmail.com> Signed-off-by: Ingo Molnar commit 575922248c0df490843ddfbcf3bc65b54c4adb08 Author: Rakib Mullick Date: Sat Apr 11 09:04:59 2009 +0600 x86: Fix section mismatches in mpparse Impact: fix section mismatch In arch/x86/kernel/mpparse.c, smp_reserve_bootmem() has been called and also refers to a function which is in .init section. Thus causes the first warning. And check_irq_src() also requires an __init, because it refers to an .init section. Signed-off-by: Rakib Mullick Cc: Andrew Morton LKML-Reference: Signed-off-by: Ingo Molnar commit 44e9c8b7adc52079f0535f9de0c2c2477831389b Author: Li Zefan Date: Sat Apr 11 15:55:28 2009 +0800 tracing/filters: return proper error code when writing filter file - propagate return value of filter_add_pred() to the user - return -ENOSPC but not -ENOMEM or -EINVAL when the filter array is full Signed-off-by: Li Zefan Acked-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49E04CF0.3010105@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit a3e0ab050774117d4a6173087c8bf3888662a83f Author: Li Zefan Date: Sat Apr 11 15:52:51 2009 +0800 tracing/filters: allow user input integer to be oct or hex Before patch: # echo 'parent_pid == 0x10' > events/sched/sched_process_fork/filter # cat sched/sched_process_fork/filter parent_pid == 0 After patch: # cat sched/sched_process_fork/filter parent_pid == 16 Also check the input more strictly. Signed-off-by: Li Zefan Acked-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49E04C53.4010600@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit bcabd91c271e50eebc0cb9220ac92700332b452e Author: Li Zefan Date: Sat Apr 11 15:52:35 2009 +0800 tracing/filters: fix NULL pointer dereference Try this, and you'll see NULL pointer dereference bug: # echo -n 'parent_comm ==' > sched/sched_process_fork/filter Because we passed NULL ptr to simple_strtoull(). Signed-off-by: Li Zefan Acked-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49E04C43.1050504@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 8433a40eb7f2c4883ad57f9900f63e4d59240eb7 Author: Li Zefan Date: Sat Apr 11 15:52:18 2009 +0800 tracing/filters: NIL-terminate user input filter Make sure messages from user space are NIL-terminated strings, otherwise we could dump random memory while reading filter file. Try this: # echo 'parent_comm ==' > events/sched/sched_process_fork/filter # cat events/sched/sched_process_fork/filter parent_comm == � Signed-off-by: Li Zefan Acked-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49E04C32.6060508@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit b0cbc861a3c05e634520b049b5cc27ad6febb51f Author: Linus Torvalds Date: Sat Apr 11 12:45:20 2009 -0700 Revert "ACPI battery: fix async boot oops" This reverts commit 5d38258ec026921a7b266f4047ebeaa75db358e5, since the underlying problem got fixed properly in the previous commit ("async: Fix module loading async-work regression"). Cc: Arkadiusz Miskiewicz Cc: Vegard Nossum Cc: Len Brown Signed-off-by: Linus Torvalds commit d6de2c80e9d758d2e36c21699117db6178c0f517 Author: Linus Torvalds Date: Fri Apr 10 12:17:41 2009 -0700 async: Fix module loading async-work regression Several drivers use asynchronous work to do device discovery, and we synchronize with them in the compiled-in case before we actually try to mount root filesystems etc. However, when compiled as modules, that synchronization is missing - the module loading completes, but the driver hasn't actually finished probing for devices, and that means that any user mode that expects to use the devices after the 'insmod' is now potentially broken. We already saw one case of a similar issue in the ACPI battery code, where the kernel itself expected the module to be all done, and unmapped the init memory - but the async device discovery was still running. That got hacked around by just removing the "__init" (see commit 5d38258ec026921a7b266f4047ebeaa75db358e5 "ACPI battery: fix async boot oops"), but the real fix is to just make the module loading wait for all async work to be completed. It will slow down module loading, but since common devices should be built in anyway, and since the bug is really annoying and hard to handle from user space (and caused several S3 resume regressions), the simple fix to wait is the right one. This fixes at least http://bugzilla.kernel.org/show_bug.cgi?id=13063 but probably a few other bugzilla entries too (12936, for example), and is confirmed to fix Rafael's storage driver breakage after resume bug report (no bugzilla entry). We should also be able to now revert that ACPI battery fix. Reported-and-tested-by: Rafael J. Wysocki Tested-by: Heinz Diehl Acked-by: Arjan van de Ven Signed-off-by: Linus Torvalds commit 2810ae8c73cbfb37891aa99dfbca46ffd40dbc91 Author: Randy Dunlap Date: Fri Apr 10 14:20:54 2009 -0700 docbook: make cleandocs Add a 'make cleandocs' target to clean up all generated DocBook files. Signed-off-by: Randy Dunlap Signed-off-by: Sam Ravnborg commit 9e5ec8615209f6a5bf2a612120d972b6021790da Author: Maxime Bizon Date: Mon Feb 9 18:49:52 2009 +0100 kbuild: fix spurious initramfs rebuild When gen_initramfs_list is used to generate make dependencies, it includes symbolic links, for which make tracks the link target. Any change to that target will cause an initramfs rebuild, even if the symlink points to something outside of the initramfs directory. If the target happens to be /tmp, the rebuild occurs for each kernel build, since gen_initramfs_list uses mktemp... Proposed way to fix it is to omit symbolic links from generated dependencies, but this has a small drawback: changing perm/owner on a symlink will go unnoticed. Signed-off-by: Maxime Bizon Signed-off-by: Sam Ravnborg commit 20375bf82567b5fecd331048c6cc1fc292b67710 Author: Sam Ravnborg Date: Fri Apr 10 13:18:08 2009 +0200 Documentation: explain the difference between __bitwise and __bitwise__ Simply added explanation from Al Viro in the following mail: http://lkml.indiana.edu/hypermail/linux/kernel/0802.2/3164.html Cc: Al Viro Cc: Randy Dunlap Signed-off-by: Sam Ravnborg commit 5d7d18f5bc507b60d3d8967e2739d5e6ffdd630f Author: David Howells Date: Wed Mar 4 11:59:07 2009 -0800 kbuild: make it possible for the linker to discard local symbols from vmlinux Make it possible for the linker to discard local symbols from vmlinux as they cause vmlinux to balloon when CONFIG_KALLSYMS=y and they cause dump_stack() and get_wchan() to produce useless information under some circumstances. With this we add a config option (CONFIG_STRIP_ASM_SYMS) that will cause the build to supply -X to the linker to tell it to strip temporary local symbols. This doesn't seem to cause gdb any problems. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Sam Ravnborg commit 0fa3a88cfdfc910d7f335aef588edf9819c05d54 Author: Jan Beulich Date: Thu Mar 12 12:28:30 2009 +0000 kbuild: remove pointless strdup() on arguments passed to new_module() in modpost new_module() itself already calls strdup() on its modname parameter. Signed-off-by: Jan Beulich Signed-off-by: Sam Ravnborg commit fe8d0a41081d6d0912386f3672ccc0bf1d675630 Author: Kirill Smelkov Date: Thu Apr 9 15:34:34 2009 +0400 kbuild: fix a few typos in top-level Makefile Signed-off-by: Kirill Smelkov Acked-by: Dmitry Gryazin Signed-off-by: Sam Ravnborg commit c7bb349e7c25df1ae1bbb72675b9bb02e1d9c464 Author: Sam Ravnborg Date: Fri Apr 10 08:52:43 2009 +0200 kbuild: introduce destination-y for exported headers xtensa and arm have asked for a possibility to export headers and locate them in a specific directory when exported. Introduce destiantion-y to support this. This patch in additiona adds some limited documentation for the variables used for exported headers. Signed-off-by: Sam Ravnborg Cc: Oskar Schirmer Cc: Mikael Starvik commit 4774bb1ced60a94d83b28e5a42d4cf01b83d9b60 Author: Peter Korsgaard Date: Thu Mar 26 21:58:04 2009 +0100 kbuild: use git svn instead of git-svn in setlocalversion Use the correct git syntax instead of the deprecated git-. Signed-off-by: Peter Korsgaard Signed-off-by: Sam Ravnborg commit 612c280ef2400c70ea2fd8f2e17549c95002368c Author: Sam Ravnborg Date: Wed Apr 8 08:42:48 2009 +0200 kconfig: fix update-po-config to accect backslash in input Massimo Maiurana reported (slightly edited): ===== In latest 2.6.29 "make update-po-config" fails at msguniq invocation with an "invalid control sequence" error. The offending string is the following, and it's located in drivers/staging/panel/Kconfig:72: "'\e[L' which are specific to the LCD, and a few ANSI codes. The" looks to me like gettext expects strings in printf format, so in this case it thinks "\e" is a control sequence but doesn't recognise it as a valid one. A valid solution would be to tell kxgettext to automatically escape this kind of strings in the */config.pot he produces, so that msguniq would not complain. ===== This patch implements the suggested escaping. Reported-by: Massimo Maiurana Tested-by: Massimo Maiurana Signed-off-by: Sam Ravnborg commit 79ff807cf23ffb527f3f35bdececf56cabcdee07 Author: Uwe Kleine-König Date: Sun Mar 29 15:01:47 2009 +0200 kbuild: fix option processing for -I in headerdep -I takes an argument. Without this change only a 1 is added to @opt_include which is not helpful. Signed-off-by: Uwe Kleine-König Acked-by: Vegard Nossum Signed-off-by: Sam Ravnborg commit e523b38e2f568af58baa13120a994cbf24e6dee0 Author: David Woodhouse Date: Fri Apr 10 22:27:48 2009 -0700 intel-iommu: Avoid panic() for DRHD at address zero. If the BIOS does something obviously stupid, like claiming that the registers for the IOMMU are at physical address zero, then print a nasty message and abort, rather than trying to set up the IOMMU and then later panicking. It's becoming more and more obvious that trusting this stuff to the BIOS was a mistake. Signed-off-by: David Woodhouse commit 3cc000b58360d8df402e31277c3dc0ebe34ad110 Author: Paul Mundt Date: Sat Apr 11 08:39:27 2009 +0900 sh: Plug in support for ARCH=sh64 using sh SRCARCH. This adds in support for building with ARCH=sh64 using the sh SRCARCH. This tidies up the randconfig generation somewhat to make sure that we don't end up with impossible configurations, and without having to rely on things like KCONFIG_ALLCONFIG to detect the proper CPU support subset. Signed-off-by: Paul Mundt commit 7933a3cfba017330ebb25f9820cb25ec9cdd67cc Author: Linus Torvalds Date: Fri Apr 10 14:07:51 2009 -0700 Remove stale include/asm-mn10300/.gitignore file Requested-by: Sam Ravnborg Signed-off-by: Linus Torvalds commit 1bc571853381b81514cfc815b07a5cc2be4c86d2 Author: Kuninori Morimoto Date: Fri Apr 10 13:35:28 2009 -0700 sh: urquell: Fix up address mapping in board comments. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit be79b0928900ffb9567893546a8285054e772a71 Author: Joe Perches Date: Fri Apr 10 12:35:13 2009 -0700 MAINTAINERS - Update MN10300 patterns Signed-off-by: Joe Perches commit 43fbc1eb7160dcb5202242c0c4a4d68cc5b93a5e Author: Joe Perches Date: Fri Apr 10 12:32:11 2009 -0700 MAINTAINERS - Update frv arch patterns Signed-off-by: Joe Perches commit 4a7fdb5f51a4d9228b0ff93494b95f72be5e904a Author: Joe Perches Date: Fri Apr 10 12:28:57 2009 -0700 scripts/get_maintainer.pl - Allow multiple files on command line Improve handling of "by:" signoffs Sorting and frequency checks are done by name/email, not by "by:" tag. Signed-off-by: Joe Perches commit 69aefcead5da3bb9e4aa7e80a3b6da531560c7dc Author: Joe Perches Date: Thu Apr 9 10:39:22 2009 -0700 MAINTAINERS - Update Freescale sound patterns Signed-off-by: Joe Perches commit d5ca6918bc9f336fcbdca430697f5cac150f9376 Author: Joe Perches Date: Thu Apr 9 02:42:01 2009 -0700 MAINTAINERS - Add additional patterns for sections: FINTEK F75375S HARDWARE MONITOR PCA9532 LED DRIVER S390 ZCRYPT DRIVER SERIAL ATA (SATA) SUBSYSTEM TMIO MMC DRIVER Signed-off-by: Joe Perches commit 80811493329eb0034e06edd0de0d448660077687 Author: Joe Perches Date: Wed Apr 8 20:20:27 2009 -0700 MAINTAINERS - Add missing "/" to some pattern directories Signed-off-by: Joe Perches commit 7cfc51b9d379c9b653b64791d8c6561ff61269c0 Author: Joe Perches Date: Wed Apr 8 10:04:18 2009 -0700 MAINTAINERS - Update DRIVER CORE patterns Signed-off-by: Joe Perches commit 9db35182b9528339a4655f4b894ac3305e0c3ac6 Author: Joe Perches Date: Wed Apr 8 08:39:56 2009 -0700 MAINTAINERS - Update M68K patterns Signed-off-by: Joe Perches commit 127c49ae097952b9686038392f862d69ac6a9c6a Author: Joe Perches Date: Wed Apr 8 08:34:04 2009 -0700 MAINTAINERS - Coalesce sections "DVB" and "Video for Linux" Creating new section MEDIA INPUT INFRASTRUCTURE Signed-off-by: Joe Perches commit 0632973db2dc161868b2877f77bd72982d2f7017 Author: Joe Perches Date: Tue Apr 7 21:15:03 2009 -0700 MAINTAINERS - Remove cyblafb frame buffer no longer in tree Signed-off-by: Joe Perches commit 8ed01bbb89c943f714bdf4876f749b1b01792f65 Author: Joe Perches Date: Tue Apr 7 21:13:49 2009 -0700 MAINTAINERS - Remove x86/Voyager no longer in tree Signed-off-by: Joe Perches commit e769980feee8d4f5630aec9e06b03047aea0b9e7 Author: Joe Perches Date: Tue Apr 7 21:12:18 2009 -0700 MAINTAINERS - Update FPU Emulator contact address and web page Signed-off-by: Joe Perches commit 932d18729dd0677472a7f1aea9820010df558c93 Author: Joe Perches Date: Tue Apr 7 21:10:58 2009 -0700 MAINTAINERS - i2c_tiny_usb T: should be W: Signed-off-by: Joe Perches commit cfe81f76c8372175b3c9aeb4fd983f3ef246473a Author: Joe Perches Date: Tue Apr 7 21:09:58 2009 -0700 MAINTAINERS - Add Linus Torvalds' git Signed-off-by: Joe Perches commit 54e5881d0cd75821a48b1bf0977d06fba7cf1670 Author: Joe Perches Date: Tue Apr 7 21:08:10 2009 -0700 MAINTAINERS - standardize "T: git urls" Various forms of "T: git" entries exist: git kernel.org:/ git kernel.org/ git://git.kernel.org/ Standardize on "T: git git://git.kernel.org/" where appropriate Fix a few bad git path entries Signed-off-by: Joe Perches commit 121ea2304436ddd0144b34d3616e552f2620e0dd Author: Joe Perches Date: Tue Apr 7 21:00:22 2009 -0700 MAINTAINERS - Remove HP Fibre Channel HBA no longer in tree Signed-off-by: Joe Perches commit 7d2c86b5a048e74ed375ae7ccc1106deabf8ca57 Author: Joe Perches Date: Tue Apr 7 20:59:01 2009 -0700 MAINTAINERS - Standardize style Use one email address per line Remove file patterns from section names Use tab after : Signed-off-by: Joe Perches commit 679655daffdd2725b66ba2c5a759bbcb316fca5a Author: Joe Perches Date: Tue Apr 7 20:44:32 2009 -0700 MAINTAINERS - Add file patterns Better description of file pattern tag "F:" Add file exclusion tag "X:" Add patterns to sections Signed-off-by: Joe Perches commit cb7301c7a3b2216c93b148fec0718d24f4ee2a99 Author: Joe Perches Date: Tue Apr 7 20:40:12 2009 -0700 Add scripts/get_maintainer.pl A script to parse file pattern information in MAINTAINERS and return selected information about a file or patch usage: scripts/get_maintainer.pl [options] patchfile scripts/get_maintainer.pl [options] -f file version: 0.14 MAINTAINERS field selection options: --email => print email address(es) if any --git => include git "*-by:" signers in commit count order --git-chief-penguins => include (Linus Torvalds) --git-min-signatures => number of signatures required (default: 1) --git-max-maintainers => maximum maintainers to add (default: 5) --git-since => git history to use (default: 1-year-ago) --m => include maintainer(s) if any --n => include name 'Full Name ' --l => include list(s) if any --s => include subscriber only list(s) if any --scm => print SCM tree(s) if any --status => print status if any --subsystem => print subsystem name if any --web => print website(s) if any Output type options: --separator [, ] => separator for multiple entries on 1 line --multiline => print 1 entry per line Default options: [--email --git --m --n --l --multiline] Other options: --version => show version --help => show this help information Signed-off-by: Joe Perches Acked-by: Pavel Machek commit 066123a535927b3f17cac2305258cc71abdb0d92 Author: Tejun Heo Date: Fri Apr 10 12:02:40 2009 -0700 percpu: unbreak alpha percpu For the time being, move the generic percpu_*() accessors to linux/percpu.h. asm-generic/percpu.h is meant to carry generic stuff for low level stuff - declarations, definitions and pointer offset calculation and so on but not for generic interface. Signed-off-by: Ingo Molnar commit 1e17d774db837fe1a536066cbe971114405d2ba1 Merge: d848223 0ce49d6 Author: Linus Torvalds Date: Fri Apr 10 12:01:22 2009 -0700 Merge git://git.infradead.org/~dwmw2/firmware-2.6 * git://git.infradead.org/~dwmw2/firmware-2.6: qla1280: Fix off-by-some error in firmware loading. Add README.AddingFirmware file. Basically telling people not to. firmware: Remove newly-added slicoss and sxg firmware images firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw ALSA: wavefront - Always use request_firmware() Remove fdump tool for av7110 firmware firmware: convert av7110 driver to request_firmware() Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card" Revert "fix modules_install via NFS" Add-add conflicts in firmware/WHENCE fixed manually commit 9b987aeb4a7bc42a3eb8361030b820b0263c31f1 Author: Masami Hiramatsu Date: Thu Apr 9 10:55:33 2009 -0700 x86: fix set_fixmap to use phys_addr_t Impact: fix kprobes crash on 32-bit with RAM above 4G Use phys_addr_t for receiving a physical address argument instead of unsigned long. This allows fixmap to handle pages higher than 4GB on x86-32. Signed-off-by: Masami Hiramatsu Acked-by: Mathieu Desnoyers Cc: Andrew Morton Cc: Ananth N Mavinakayanahalli Cc: systemtap-ml Cc: Gary Hade Cc: Linus Torvalds LKML-Reference: <49DE3695.6040800@redhat.com> Signed-off-by: Ingo Molnar commit d848223808c5d21e1b3cea090047e34722c6254b Merge: 5de4c51 2f2a213 Author: Linus Torvalds Date: Fri Apr 10 10:01:49 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300 * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300: Separate out the proc- and unit-specific header directories from the general Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. commit 5de4c51d2a859a1556b7d20ae1278c3e2d70a79b Merge: 6594d0b e69cc92 Author: Linus Torvalds Date: Fri Apr 10 07:47:13 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv * git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-frv: FRV: Move to arch/frv/include/asm/ FRV: Fix indentation errors to keep git-am happy when moving arch header files commit 0462b5664b2bda5a18fef7efb5bb32ce36590c1a Author: Zhaolei Date: Wed Apr 8 17:00:13 2009 +0800 ftrace: Output REC->var instead of __entry->var for trace format print fmt: "irq=%d return=%s", __entry->irq, __entry->ret ? \"handled\" : \"unhandled\" "__entry" should be convert to "REC" by __stringify() macro. Signed-off-by: Zhao Lei Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49DC679D.2090901@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 8f7c2c37319a81ef4c2bfdec67b1ccd5744d97e4 Author: Zhaolei Date: Wed Apr 8 16:58:57 2009 +0800 Make __stringify support variable argument macros too For example: __stringify(__entry->irq, __entry->ret) will now convert it to: "REC->irq, REC->ret" It also still supports single arguments as the old macro did. Signed-off-by: Zhao Lei Acked-by: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49DC6751.30308@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 2f2a2132ff056bb45697dc855eb4fd95b70b38cb Author: David Howells Date: Fri Apr 10 14:33:48 2009 +0100 Separate out the proc- and unit-specific header directories from the general MN10300 arch headers and place them instead in the same directories as contain the .c files for the processor and unit implementations. This permits the symlinks include/asm/proc and include/asm/unit to be dispensed with. This does, however, require that #include be converted to #include and similarly for asm/unit -> unit. Signed-off-by: David Howells commit da7616610c8d2ec16a8ada44216e836e5fcbd08b Author: David Howells Date: Fri Apr 10 14:19:03 2009 +0100 Move arch headers from include/asm-mn10300/ to arch/mn10300/include/asm/. Signed-off-by: David Howells commit a0d22f485af1553060b4094ee0154537a8f6a8a6 Author: Andy Grover Date: Thu Apr 9 16:45:29 2009 -0700 x86: Document get_user_pages_fast() While better than get_user_pages(), the usage of gupf(), especially the return values and the fact that it can potentially only partially pin the range, warranted some documentation. Signed-off-by: Andy Grover Cc: npiggin@suse.de Cc: akpm@linux-foundation.org LKML-Reference: <1239320729-3262-1-git-send-email-andy.grover@oracle.com> Signed-off-by: Ingo Molnar commit 746cddd37d48a166f170165a0df4bd50fde1ea60 Author: Weidong Han Date: Fri Apr 10 17:17:17 2009 +0800 x86, intr-remap: fix eoi for interrupt remapping without x2apic To simplify level irq migration in the presence of interrupt-remapping, Suresh used a virtual vector (io-apic pin number) to eliminate io-apic RTE modification. Level triggered interrupt will appear as an edge to the local apic cpu but still as level to the IO-APIC. So in addition to do the local apic EOI, it still needs to do IO-APIC directed EOI to clear the remote IRR bit in the IO-APIC RTE. Pls refer to Suresh's patch for more details (commit 0280f7c416c652a2fd95d166f52b199ae61122c0). Now interrupt remapping is decoupled from x2apic, it also needs to do the directed EOI for apic. Otherwise, apic interrupts won't work correctly. Signed-off-by: Weidong Han Cc: iommu@lists.linux-foundation.org Cc: Weidong Han Cc: suresh.b.siddha@intel.com Cc: dwmw2@infradead.org Cc: allen.m.kay@intel.com LKML-Reference: <1239355037-22856-1-git-send-email-weidong.han@intel.com> Signed-off-by: Ingo Molnar commit 4d1f4372dbea068ba4ee3d98231133a4a4ee15bd Author: Li Zefan Date: Fri Apr 10 08:48:36 2009 +0800 tracing: fix document references When moving documents to Documentation/trace/, I forgot to grep Kconfig to find out those references. Signed-off-by: Li Zefan Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Pekka Enberg Cc: Pekka Paalanen Cc: eduard.munteanu@linux360.ro LKML-Reference: <49DE97EF.7080208@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 Author: Lai Jiangshan Date: Thu Apr 2 15:17:08 2009 +0800 tracing: fix splice return too large I got these from strace: splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 12288 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 12288 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 12288 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 16384 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 8192 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 8192 splice(0x3, 0, 0x5, 0, 0x1000, 0x1) = 8192 I wanted to splice_read 4096 bytes, but it returns 8192 or larger. It is because the return value of tracing_buffers_splice_read() does not include "zero out any left over data" bytes. But tracing_buffers_read() includes these bytes, we make them consistent. Signed-off-by: Lai Jiangshan Cc: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49D46674.9030804@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit c7625a555f55d7ae49236cde551786c88f5a5ce1 Author: Lai Jiangshan Date: Thu Apr 2 15:17:04 2009 +0800 tracing: update file->f_pos when splice(2) it Impact: Cleanup These two lines: if (unlikely(*ppos)) return -ESPIPE; in tracing_buffers_splice_read() are not needed, VFS layer has disabled seek(2). We remove these two lines, and then we can update file->f_pos. And tracing_buffers_read() updates file->f_pos, this fix make tracing_buffers_splice_read() updates file->f_pos too. Signed-off-by: Lai Jiangshan Cc: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49D46670.4010503@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit ddd538f3e6a1a4bec2f6942f83a753263e6577b4 Author: Lai Jiangshan Date: Thu Apr 2 15:16:59 2009 +0800 tracing: allocate page when needed Impact: Cleanup Sometimes, we open trace_pipe_raw, but we don't read(2) it, we just splice(2) it, thus, the page is not used. Signed-off-by: Lai Jiangshan Cc: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49D4666B.4010608@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit d1e7e02f30be672c6f6ee40908be83877a0d49d1 Author: Lai Jiangshan Date: Thu Apr 2 15:16:56 2009 +0800 tracing: disable seeking for trace_pipe_raw Impact: disable pread() We set tracing_buffers_fops.llseek to no_llseek, but we can still perform pread() to read this file. That is not expected. This fix uses nonseekable_open() to disable it. tracing_buffers_fops.llseek is still set to no_llseek, it mark this file is a "non-seekable device" and is used by sys_splice(). See also do_splice() or manual of splice(2): ERRORS EINVAL Target file system doesn't support splicing; neither of the descriptors refers to a pipe; or offset given for non-seekable device. Signed-off-by: Lai Jiangshan Cc: Frederic Weisbecker Cc: Steven Rostedt LKML-Reference: <49D46668.8030806@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit e69cc9278831139660cb99bde52908f145338d77 Author: David Howells Date: Fri Apr 10 01:48:06 2009 +0100 FRV: Move to arch/frv/include/asm/ Move arch headers from include/asm-frv/ to arch/frv/include/asm/. Signed-off-by: David Howells commit 187934655fa0637d4ef3967d4543c6dcccf33058 Author: David Howells Date: Fri Apr 10 01:48:01 2009 +0100 FRV: Fix indentation errors to keep git-am happy when moving arch header files Fix indentation errors to keep git-am happy when moving arch header files. Signed-off-by: David Howells commit 6594d0b1cdfd9058f5b766e490ea1c94ae5e0ed4 Merge: 0534c8c f0edef8 Author: Linus Torvalds Date: Thu Apr 9 16:43:30 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (27 commits) xsysace: Fix dereferencing of cf_id after hd_driveid removal at91_ide: turn on PIO 6 support at91_ide: remove unused ide_mm_{outb,inb} ide-cd: reverse NOT_READY sense key logic ide: refactor tf_read() method ide: refactor tf_load() method ide: call write_devctl() method from tf_read() method ide: move common code out of tf_load() method ide: simplify 'struct ide_taskfile' ide: replace IDE_TFLAG_* flags by IDE_VALID_* ide-cd: fix intendation in cdrom_decode_status() ide-cd: unify handling of fs and pc requests in cdrom_decode_status() ide-cd: convert cdrom_decode_status() to use switch statements ide-cd: update debugging support ide-cd: respect REQ_QUIET for fs requests in cdrom_decode_status() ide: remove unused #include tx4939ide: Fix tx4939ide_{in,out}put_data_swap argument tx493[89]ide: Remove big endian version of tx493[89]ide_tf_{load,read} ide-cd: carve out an ide_cd_breathe()-helper for fs write requests ide-cd: move status checking into the IRQ handler ... commit 0534c8cb5c8a8a954751fa01eef7831a475a9ec5 Merge: 54f93b7 07306c0 Author: Linus Torvalds Date: Thu Apr 9 16:42:26 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Add support for new SFP+ PHY RDMA/nes: Add wide_ppm_offset parm for switch compatibility RDMA/nes: Fix SFP+ PHY initialization RDMA/nes: Fix nes_nic_cm_xmit() error handling RDMA/nes: Fix error handling issues RDMA/nes: Fix incorrect casts on 32-bit architectures IPoIB: Document newish features RDMA/cma: Create cm id even when IB port is down RDMA/cma: Use rate from IPoIB broadcast when joining IPoIB multicast groups IPoIB: Avoid free_netdev() BUG when destroying a child interface mlx4_core: Don't leak mailbox for SET_PORT on Ethernet ports RDMA/cxgb3: Release dependent resources only when endpoint memory is freed. RDMA/cxgb3: Handle EEH events IB/mlx4: Use pgprot_writecombine() for BlueFlame pages commit 54f93b74cf8c575bb89f9bf32a40a39b83ace1e9 Merge: 3b3809a 0f2ddca Author: Linus Torvalds Date: Thu Apr 9 16:42:05 2009 -0700 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: ext4: check block device size on mount ext4: Fix off-by-one-error in ext4_valid_extent_idx() ext4: Fix big-endian problem in __ext4_check_blockref() commit 3b3809ac5375f614bbf8671cddeae3c693aa584e Author: Masami Hiramatsu Date: Thu Apr 9 10:55:33 2009 -0700 x86: fix set_fixmap to use phys_addr_t Use phys_addr_t for receiving a physical address argument instead of unsigned long. This allows fixmap to handle pages higher than 4GB on x86-32. Signed-off-by: Masami Hiramatsu Cc: Ingo Molnar Acked-by: Mathieu Desnoyers Signed-off-by: Linus Torvalds commit dc2a5536d633dd2318f82f3d5ad3c9e43cfc21d7 Merge: f36345f 8de2bf9 Author: Felix Blyakher Date: Thu Apr 9 14:12:07 2009 -0500 Merge branch 'master' into for-linus commit 62b8e680e61d3f48f2a12ee248ca03ea8f376926 Author: David Howells Date: Thu Apr 9 18:41:23 2009 +0100 MN10300: Kill MN10300's own profiling Kconfig Kill MN10300's own profiling Kconfig as this is superfluous given that the profiling options have moved to init/Kconfig and arch/Kconfig. Not only is this now superfluous, but the dependencies are not correct. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 6fde836b54f1f0ca3d3c8b7aaf44165a08fe0f9f Author: David Howells Date: Thu Apr 9 17:32:55 2009 +0100 FRV: Use in NOMMU mode asm-frv/pgtable.h could just #include in NOMMU mode rather than #defining macros for lazy MMU and CPU stuff. Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 34574dd10b6d0697b86703388d6d6af9cbf4bb48 Author: David Howells Date: Thu Apr 9 17:14:05 2009 +0100 keys: Handle there being no fallback destination keyring for request_key() When request_key() is called, without there being any standard process keyrings on which to fall back if a destination keyring is not specified, an oops is liable to occur when construct_alloc_key() calls down_write() on dest_keyring's semaphore. Due to function inlining this may be seen as an oops in down_write() as called from request_key_and_link(). This situation crops up during boot, where request_key() is called from within the kernel (such as in CIFS mounts) where nobody is actually logged in, and so PAM has not had a chance to create a session keyring and user keyrings to act as the fallback. To fix this, make construct_alloc_key() not attempt to cache a key if there is no fallback key if no destination keyring is given specifically. Signed-off-by: David Howells Tested-by: Jeff Layton Signed-off-by: Linus Torvalds commit 11ff5f6affe9b75f115a900a5584db339d46002b Author: Stoyan Gaydarov Date: Thu Apr 9 17:10:28 2009 +0100 afs: BUG to BUG_ON changes Signed-off-by: Stoyan Gaydarov Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit e66dd19092497f566e4dda1664688e28fa667265 Merge: c2ea122 f20ab9c Author: Linus Torvalds Date: Thu Apr 9 10:38:23 2009 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: cpu_debug remove execute permission x86: smarten /proc/interrupts output for new counters x86: DMI match for the Dell DXP061 as it needs BIOS reboot x86: make 64 bit to use default_inquire_remote_apic x86, setup: un-resequence mode setting for VGA 80x34 and 80x60 modes x86, intel-iommu: fix X2APIC && !ACPI build failure commit c2ea122cd7c4a094be71641f3961796398035513 Merge: 17b2e9b 66bb748 Author: Linus Torvalds Date: Thu Apr 9 10:37:46 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: consolidate documents blktrace: pass the right pointer to kfree() tracing/syscalls: use a dedicated file header tracing: append a comma to INIT_FTRACE_GRAPH commit 17b2e9bf27d417bc186cc922b4d6d5eaa048f9d8 Merge: 422a253 e3c8ca8 Author: Linus Torvalds Date: Thu Apr 9 10:37:28 2009 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: do not count frozen tasks toward load sched: refresh MAINTAINERS entry sched: Print sched_group::__cpu_power in sched_domain_debug cpuacct: add per-cgroup utime/stime statistics posixtimers, sched: Fix posix clock monotonicity sched_rt: don't allocate cpumask in fastpath cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2 commit f802d969b6a89d3f9b67ef879179824d53420ebe Author: Paul Mundt Date: Thu Apr 9 10:36:54 2009 -0700 sh: Add support for DMA API debugging. This wires up support for the generic DMA API debugging. Signed-off-by: Paul Mundt commit 422a253483aa5de71a2bcdc27b0aa023053f97f8 Merge: 91e58b6 022624a 9756b15 8f2e586 Author: Linus Torvalds Date: Thu Apr 9 10:35:30 2009 -0700 Merge branches 'core-fixes-for-linus', 'irq-fixes-for-linus' and 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: printk: fix wrong format string iter for printk futex: comment requeue key reference semantics * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: irq: fix cpumask memory leak on offstack cpumask kernels * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF) posix-timers: fix RLIMIT_CPU && fork() timers: add missing kernel-doc commit 91e58b6e95a9c6b9efd928ae352eae5e75ae598c Author: Thomas Gleixner Date: Thu Apr 9 18:18:47 2009 +0100 MN10300: Convert obsolete no_irq_type to no_irq_chip Convert the last remaining users to no_irq_chip. Signed-off-by: Thomas Gleixner Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 36cd3c9f925b9307236505ae7ad1ad7ac4d4357c Author: Heiko Carstens Date: Thu Apr 9 18:48:34 2009 +0200 mutex: have non-spinning mutexes on s390 by default Impact: performance regression fix for s390 The adaptive spinning mutexes will not always do what one would expect on virtualized architectures like s390. Especially the cpu_relax() loop in mutex_spin_on_owner might hurt if the mutex holding cpu has been scheduled away by the hypervisor. We would end up in a cpu_relax() loop when there is no chance that the state of the mutex changes until the target cpu has been scheduled again by the hypervisor. For that reason we should change the default behaviour to no-spin on s390. We do have an instruction which allows to yield the current cpu in favour of a different target cpu. Also we have an instruction which allows us to figure out if the target cpu is physically backed. However we need to do some performance tests until we can come up with a solution that will do the right thing on s390. Signed-off-by: Heiko Carstens Acked-by: Peter Zijlstra Cc: Martin Schwidefsky Cc: Christian Borntraeger LKML-Reference: <20090409184834.7a0df7b2@osiris.boeblingen.de.ibm.com> Signed-off-by: Ingo Molnar commit 3121bfe7631126d1b13064855ac2cfa164381bb0 Author: Miklos Szeredi Date: Thu Apr 9 17:37:53 2009 +0200 fuse: fix "direct_io" private mmap MAP_PRIVATE mmap could return stale data from the cache for "direct_io" files. Fix this by flushing the cache on mmap. Found with a slightly modified fsx-linux. Signed-off-by: Miklos Szeredi commit ce60a2f15764f296b0467960759351702c7d2986 Author: Miklos Szeredi Date: Thu Apr 9 17:37:52 2009 +0200 fuse: fix argument type in fuse_get_user_pages() Fix the following warning: fs/fuse/file.c: In function 'fuse_direct_io': fs/fuse/file.c:1002: warning: passing argument 3 of 'fuse_get_user_pages' from incompatible pointer type This was introduced by commit f4975c67 "fuse: allow kernel to access "direct_io" files". Signed-off-by: Miklos Szeredi commit df5529297ec4c32d57dd149398e3add6c37bc054 Merge: 97c18e2 340cd44 Author: Linus Torvalds Date: Thu Apr 9 08:01:21 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm * git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm: dm kcopyd: fix callback race dm kcopyd: prepare for callback race fix dm: implement basic barrier support dm: remove dm_request loop dm: rework queueing and suspension dm: simplify dm_request loop dm: split DMF_BLOCK_IO flag into two dm: rearrange dm_wq_work dm: remove limited barrier support dm: add integrity support commit 97c18e2c7a8e36d2d83d50ee070314aadac73a11 Author: Herbert Xu Date: Thu Apr 9 10:35:47 2009 +0800 module: try_then_request_module must wait Since the whole point of try_then_request_module is to retry the operation after a module has been loaded, we must wait for the module to fully load. Otherwise all sort of things start breaking, e.g., you won't be able to read your encrypted disks on the first attempt. Signed-off-by: Herbert Xu Tested-by: Maciej Rutecki Tested-by: Patrick McHardy Signed-off-by: Linus Torvalds commit 3230e8cd8084423d08ddd3842250a202ad98f840 Merge: 0e3912c f4efdd6 Author: Wim Van Sebroeck Date: Thu Apr 9 05:51:57 2009 +0000 Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 commit e3c8ca8336707062f3f7cb1cd7e6b3c753baccdd Author: Nathan Lynch Date: Wed Apr 8 19:45:12 2009 -0500 sched: do not count frozen tasks toward load Freezing tasks via the cgroup freezer causes the load average to climb because the freezer's current implementation puts frozen tasks in uninterruptible sleep (D state). Some applications which perform job-scheduling functions consult the load average when making decisions. If a cgroup is frozen, the load average does not provide a useful measure of the system's utilization to such applications. This is especially inconvenient if the job scheduler employs the cgroup freezer as a mechanism for preempting low priority jobs. Contrast this with using SIGSTOP for the same purpose: the stopped tasks do not count toward system load. Change task_contributes_to_load() to return false if the task is frozen. This results in /proc/loadavg behavior that better meets users' expectations. Signed-off-by: Nathan Lynch Acked-by: Andrew Morton Acked-by: Nigel Cunningham Tested-by: Nigel Cunningham Cc: Cc: containers@lists.linux-foundation.org Cc: linux-pm@lists.linux-foundation.org Cc: Matt Helsley LKML-Reference: <20090408194512.47a99b95@manatee.lan> Signed-off-by: Ingo Molnar commit 66bb74888eb4bef4ba7c87c931ecb7ecca3a240c Author: Li Zefan Date: Thu Apr 9 11:40:27 2009 +0800 tracing: consolidate documents Move kmemtrace.txt, tracepoints.txt, ftrace.txt and mmiotrace.txt to the new trace/ directory. I didnt find any references to those documents in both source files and documents, so no extra work needs to be done. Signed-off-by: Li Zefan Acked-by: Pekka Paalanen Cc: Steven Rostedt Cc: Frederic Weisbecker Cc: Mathieu Desnoyers LKML-Reference: <49DD6E2B.6090200@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit f20ab9c38fb85b4dde8b4139788ab9e735a35279 Author: Jaswinder Singh Rajput Date: Wed Apr 8 22:49:46 2009 +0530 x86: cpu_debug remove execute permission It seems by mistake these files got execute permissions so removing it. Signed-off-by: Jaswinder Singh Rajput LKML-Reference: <1239211186.9037.2.camel@ht.satnam> Signed-off-by: Ingo Molnar commit 9eb85125ce218a8b8d9a7c982510388e227adbec Author: Li Zefan Date: Thu Apr 9 11:19:40 2009 +0800 blktrace: pass the right pointer to kfree() Impact: fix kfree crash with non-standard act_mask string If passing a string with leading white spaces to strstrip(), the returned ptr != the original ptr. This bug was introduced by me. Signed-off-by: Li Zefan Cc: Jens Axboe Cc: Arnaldo Carvalho de Melo LKML-Reference: <49DD694C.8020902@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 47788c58e66c050982241d9a05eb690daceb05a9 Author: Frederic Weisbecker Date: Wed Apr 8 20:40:59 2009 +0200 tracing/syscalls: use a dedicated file header Impact: fix build warnings and possibe compat misbehavior on IA64 Building a kernel on ia64 might trigger these ugly build warnings: CC arch/ia64/ia32/sys_ia32.o In file included from arch/ia64/ia32/sys_ia32.c:55: arch/ia64/ia32/ia32priv.h:290:1: warning: "elf_check_arch" redefined In file included from include/linux/elf.h:7, from include/linux/module.h:14, from include/linux/ftrace.h:8, from include/linux/syscalls.h:68, from arch/ia64/ia32/sys_ia32.c:18: arch/ia64/include/asm/elf.h:19:1: warning: this is the location of the previous definition [...] sys_ia32.c includes linux/syscalls.h which in turn includes linux/ftrace.h to import the syscalls tracing prototypes. But including ftrace.h can pull too much things for a low level file, especially on ia64 where the ia32 private headers conflict with higher level headers. Now we isolate the syscall tracing headers in their own lightweight file. Reported-by: Tony Luck Tested-by: Tony Luck Signed-off-by: Frederic Weisbecker Acked-by: Tony Luck Signed-off-by: Steven Rostedt Cc: Peter Zijlstra Cc: Jason Baron Cc: "Frank Ch. Eigler" Cc: Mathieu Desnoyers Cc: KOSAKI Motohiro Cc: Lai Jiangshan Cc: Jiaying Zhang Cc: Michael Rubin Cc: Martin Bligh Cc: Michael Davidson LKML-Reference: <20090408184058.GB6017@nowhere> Signed-off-by: Ingo Molnar 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 3ecb1b7df92393647b13b21b1f7142b65c582511 Author: Jeremy Fitzhardinge Date: Sat Mar 7 23:48:41 2009 -0800 xen: add FIX_TEXT_POKE to fixmap FIX_TEXT_POKE[01] are used to map kernel addresses, so they're mapping pfns, not mfns. Signed-off-by: Jeremy Fitzhardinge 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 340cd44451fb0bfa542365e6b4b565bbd44836e2 Author: Mikulas Patocka Date: Thu Apr 9 00:27:17 2009 +0100 dm kcopyd: fix callback race If the thread calling dm_kcopyd_copy is delayed due to scheduling inside split_job/segment_complete and the subjobs complete before the loop in split_job completes, the kcopyd callback could be invoked from the thread that called dm_kcopyd_copy instead of the kcopyd workqueue. dm_kcopyd_copy -> split_job -> segment_complete -> job->fn() Snapshots depend on the fact that callbacks are called from the singlethreaded kcopyd workqueue and expect that there is no racing between individual callbacks. The racing between callbacks can lead to corruption of exception store and it can also mean that exception store callbacks are called twice for the same exception - a likely reason for crashes reported inside pending_complete() / remove_exception(). This patch fixes two problems: 1. job->fn being called from the thread that submitted the job (see above). - Fix: hand over the completion callback to the kcopyd thread. 2. job->fn(read_err, write_err, job->context); in segment_complete reports the error of the last subjob, not the union of all errors. - Fix: pass job->write_err to the callback to report all error bits (it is done already in run_complete_job) Cc: stable@kernel.org Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 73830857bca6f6c9dbd48e906daea50bea42d676 Author: Mikulas Patocka Date: Thu Apr 9 00:27:16 2009 +0100 dm kcopyd: prepare for callback race fix Use a variable in segment_complete() to point to the dm_kcopyd_client struct and only release job->pages in run_complete_job() if any are defined. These changes are needed by the next patch. Cc: stable@kernel.org Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit af7e466a1acededbc10beaba9eec8531d561c566 Author: Mikulas Patocka Date: Thu Apr 9 00:27:16 2009 +0100 dm: implement basic barrier support Barriers are submitted to a worker thread that issues them in-order. The thread is modified so that when it sees a barrier request it waits for all pending IO before the request then submits the barrier and waits for it. (We must wait, otherwise it could be intermixed with following requests.) Errors from the barrier request are recorded in a per-device barrier_error variable. There may be only one barrier request in progress at once. For now, the barrier request is converted to a non-barrier request when sending it to the underlying device. This patch guarantees correct barrier behavior if the underlying device doesn't perform write-back caching. The same requirement existed before barriers were supported in dm. Bottom layer barrier support (sending barriers by target drivers) and handling devices with write-back caches will be done in further patches. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 92c639021ca6e962645114f02e356e7feb131d0b Author: Mikulas Patocka Date: Thu Apr 9 00:27:15 2009 +0100 dm: remove dm_request loop Remove queue_io return value and a loop in dm_request. IO may be submitted to a worker thread with queue_io(). queue_io() sets DMF_QUEUE_IO_TO_THREAD so that all further IO is queued for the thread. When the thread finishes its work, it clears DMF_QUEUE_IO_TO_THREAD and from this point on, requests are submitted from dm_request again. This will be used for processing barriers. Remove the loop in dm_request. queue_io() can submit I/Os to the worker thread even if DMF_QUEUE_IO_TO_THREAD was not set. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 3b00b2036fac7a7667d0676a0f80eee575b8c32b Author: Mikulas Patocka Date: Thu Apr 9 00:27:15 2009 +0100 dm: rework queueing and suspension Rework shutting down on suspend and document the associated rules. Drop write lock in __split_and_process_bio to allow more processing concurrency. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 54d9a1b4513b96cbd835ca6866c6a604d194b2ae Author: Alasdair G Kergon Date: Thu Apr 9 00:27:14 2009 +0100 dm: simplify dm_request loop Refactor the code in dm_request(). Require the new DMF_BLOCK_FOR_SUSPEND flag on readahead bios we will discard so we don't drop such bios while processing a barrier. Signed-off-by: Alasdair G Kergon commit 1eb787ec183d1267cac95aae632e92dee05ed50a Author: Alasdair G Kergon Date: Thu Apr 9 00:27:14 2009 +0100 dm: split DMF_BLOCK_IO flag into two Split the DMF_BLOCK_IO flag into two. DMF_BLOCK_IO_FOR_SUSPEND is set when I/O must be blocked while suspending a device. DMF_QUEUE_IO_TO_THREAD is set when I/O must be queued to a worker thread for later processing. Signed-off-by: Alasdair G Kergon commit df12ee996378a5917e9555169fe278ecca0612d4 Author: Alasdair G Kergon Date: Thu Apr 9 00:27:13 2009 +0100 dm: rearrange dm_wq_work Refactor dm_wq_work() to make later patch more readable. Signed-off-by: Alasdair G Kergon commit 692d0eb9e02cf81fb387ff891f53840db2f3110a Author: Mikulas Patocka Date: Thu Apr 9 00:27:13 2009 +0100 dm: remove limited barrier support Prepare for full barrier implementation: first remove the restricted support. Signed-off-by: Mikulas Patocka Signed-off-by: Alasdair G Kergon commit 9c47008d13add50ec4597a8b9eee200c515282c8 Author: Martin K. Petersen Date: Thu Apr 9 00:27:12 2009 +0100 dm: add integrity support This patch provides support for data integrity passthrough in the device mapper. - If one or more component devices support integrity an integrity profile is preallocated for the DM device. - If all component devices have compatible profiles the DM device is flagged as capable. - Handle integrity metadata when splitting and cloning bios. Signed-off-by: Martin K. Petersen Signed-off-by: Alasdair G Kergon 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 07306c0b98a9a0399bff1b91229b4c3b55912189 Merge: d2ca39f 874d8df 6a3335b 352b09e 4303565 Author: Roland Dreier Date: Wed Apr 8 14:28:21 2009 -0700 Merge branches 'cma', 'cxgb3', 'ipoib', 'mlx4' and 'nes' into for-next commit 4303565df4eb425851ddd22136fec69bdfeede61 Author: Chien Tung Date: Wed Apr 8 14:27:56 2009 -0700 RDMA/nes: Add support for new SFP+ PHY Add new register settings for new SFP+ PHY/firmware. Add new PHY to to nes_netdev_get/set_settings. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit a4849fc157cdbe4fb68cfe37e7222697f003deb5 Author: Chien Tung Date: Wed Apr 8 14:27:18 2009 -0700 RDMA/nes: Add wide_ppm_offset parm for switch compatibility We have observed unstable link with a new BNT switch. Add wide_ppm_offset parameter to allow the user to control the clock ppm offset on the CX4 interface for better compatibility. Default is 100ppm, setting it to 1 will increase it to 300ppm. Change default SerDes1 reference clock to external source. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 1b9493248cf5e9f1ecc045488100cbf3ccd91be1 Author: Chien Tung Date: Wed Apr 8 14:27:09 2009 -0700 RDMA/nes: Fix SFP+ PHY initialization SFP+ PHY initialization has very long delays, incorrect settings for direct attach copper cables, and inconsistent link detection. Adjust delays to the minimum required by the PHY. Worst case is now less than 4 seconds. Add new register settings for direct attach cables. Change link detection logic to use two new registers for more consistent link state detection. Reorganize code to shorten line length. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit d745562cc40bff60f0597004d8128fa0225cc267 Author: Ian Campbell Date: Thu Apr 2 13:24:28 2009 +0100 xen: honour VCPU availability on boot If a VM is booted with offline VCPUs then unplug them during boot. Determining the availability of a VCPU requires access to XenStore which is not available at the point smp_prepare_cpus() is called, therefore we bring up all VCPUS initially and unplug the offline ones as soon as XenStore becomes available. Signed-off-by: Ian Campbell commit 2b2a733447b2bce5fef053df38412e4c0634ec22 Author: Jeremy Fitzhardinge Date: Sun Mar 29 22:57:15 2009 -0700 xen: clean up gate trap/interrupt constants Use GATE_INTERRUPT/TRAP rather than 0xe/f. Signed-off-by: Jeremy Fitzhardinge commit bc6081ff98eec627919e0c68415e46a78fe51dc4 Author: Jeremy Fitzhardinge Date: Fri Mar 27 11:29:02 2009 -0700 xen: set _PAGE_NX in __supported_pte_mask before pagetable construction Some 64-bit machines don't support the NX flag in ptes. Check for NX before constructing the kernel pagetables. Signed-off-by: Jeremy Fitzhardinge commit 9a5a2cac9f99c98d9d15cec17b1904f29d0e8009 Author: Ian Campbell Date: Wed Mar 25 17:46:42 2009 +0000 xen: resume interrupts before system devices. Impact: bugfix Xen domain restore Otherwise the first timer interrupt after resume is missed and we never get another. Signed-off-by: Ian Campbell Signed-off-by: Jeremy Fitzhardinge commit e3f8a74e3a884b91a4390c66ed8175ef74db7067 Author: Jeremy Fitzhardinge Date: Wed Mar 4 17:36:57 2009 -0800 xen/mmu: weaken flush_tlb_other test Impact: fixes crashing bug There's no particular problem with getting an empty cpu mask, so just shortcut-return if we get one. Avoids crash reported by Christophe Saout Signed-off-by: Jeremy Fitzhardinge commit b96229b50d71c548302053c244b89572a5264c0b Author: Jeremy Fitzhardinge Date: Tue Mar 17 13:30:55 2009 -0700 xen/mmu: some early pagetable cleanups 1. make sure early-allocated ptes are pinned, so they can be later unpinned 2. don't pin pmd+pud, just make them RO 3. scatter some __inits around Signed-off-by: Jeremy Fitzhardinge commit 5962c2c8036b4dcf10ec6c481be656ae4700b664 Author: Faisal Latif Date: Wed Apr 8 14:23:55 2009 -0700 RDMA/nes: Fix nes_nic_cm_xmit() error handling We are getting crash or hung situation when we are running network cable pull tests during RDMA traffic. In schedule_nes_timer(), we return an error if nes_nic_cm_xmit() returns failure. This is changed to success as skb is being put on the timer routines to be processed later. In send_syn() case, we are indicating connect failure once from nes_connect() and the other when the rexmit retries expires. The other issue is skb->users which we are incrementing before calling nes_nic_cm_xmit() which calls dev_queue_xmit() but in case of failure we are decrementing the skb->users at the same time putting the skb on the rexmit path. Even if dev_queue_xmit() fails, the skb->users is decremented already. We are removing the decrement of skb->users in case of failure from both schedule_nes_timer() as well as from nes_cm_timer_tick(). There is also extra check in nes_cm_timer_tick() for rexmit failure which does a break from the loop is removed. This causes problem as the other nodes have their cm_node->ref_count incremented and are not processed. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 79fc3d7410c861c8ced5b81a5c3759f6bbf891dc Author: Faisal Latif Date: Wed Apr 8 14:22:20 2009 -0700 RDMA/nes: Fix error handling issues Fix issues found by static code analysis: (1) Check if cm_node was successfully created for loopback connection. (2) schedule_nes_timer() does not free up allocated memory after encountering an error. There is a WARN_ON() for this condition. (3) there is a cm_node->freed flag which is set but not used. Reported-by: Dan Carpenter Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit 7a5efb62f6ae366cefac6be475434906c5061e15 Author: Don Wood Date: Wed Apr 8 14:21:02 2009 -0700 RDMA/nes: Fix incorrect casts on 32-bit architectures The were some incorrect casts to unsigned long that caused 64-bit values to be truncated on 32-bit architectures and made the driver pass invalid adresses and lengths to the hardware. The problems were primarily seen with kernels with highmem configured but some could show up in non-highmem kernels, too. Signed-off-by: Don Wood Signed-off-by: Roland Dreier commit 6a3335b43342b42dd6c69b4bbbde15d622cb49ca Author: Or Gerlitz Date: Wed Apr 8 13:52:01 2009 -0700 IPoIB: Document newish features Update the documentation to include connected mode, stateless offloads and interrupt moderation, and add a reference to the connected mode RFC. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier 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 d2ca39f262806aa2f035f680a14aa55ff9e3d889 Author: Yossi Etigin Date: Wed Apr 8 13:42:33 2009 -0700 RDMA/cma: Create cm id even when IB port is down When doing rdma_resolve_addr(), if the relevant IB port is down, the function fails and the cm_id is not bound to the correct device. Therefore, application does not have a device handle and cannot wait for the port to become active. The function fails because the underlying IPoIB interface is not joined to the broadcast group and therefore the SA does not have a multicast record to take a Q_Key from. The fix is to use lazy Q_Key resolution - cma_set_qkey() will set id_priv->qkey if it was not set, and will be called just before the Q_Key is really required. Signed-off-by: Yossi Etigin Acked-by: Sean Hefty Signed-off-by: Roland Dreier 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 b40bf53effc0338ad7926aa1abce703af372cbd4 Author: Alex Nixon Date: Mon Feb 9 12:05:46 2009 -0800 Xen: Add virt_to_pfn helper function Signed-off-by: Alex Nixon commit 10eceebeaac3049cad018d4a77c941a602cbd7a5 Author: Jeremy Fitzhardinge Date: Sun Mar 8 03:59:04 2009 -0700 x86-64: remove PGE from must-have feature list PGE may not be available when running paravirtualized, so test the cpuid bit before using it. Signed-off-by: Jeremy Fitzhardinge commit 191216b9289ed02256086e6bab4f668112109399 Author: Jeremy Fitzhardinge Date: Sat Mar 7 17:09:27 2009 -0800 xen: mask XSAVE from cpuid Xen leaves XSAVE set in cpuid, but doesn't allow cr4.OSXSAVE to be set. This confuses the kernel and it ends up crashing on an xsetbv instruction. At boot time, try to set cr4.OSXSAVE, and mask XSAVE out of cpuid it we can't. This will produce a spurious error from Xen, but allows us to support XSAVE if/when Xen does. This also factors out the cpuid mask decisions to boot time. Signed-off-by: Jeremy Fitzhardinge commit 1207cf8eb99d8c699919e352292bdf1f519fbba5 Author: Hannes Eder Date: Thu Mar 5 20:13:57 2009 +0100 NULL noise: arch/x86/xen/smp.c Fix this sparse warnings: arch/x86/xen/smp.c:316:52: warning: Using plain integer as NULL pointer arch/x86/xen/smp.c:421:60: warning: Using plain integer as NULL pointer Signed-off-by: Hannes Eder Signed-off-by: Jeremy Fitzhardinge commit c667d5d6a77a5f33f9181bcf92a04fdc69712a2b Author: Jeremy Fitzhardinge Date: Wed Mar 4 16:34:27 2009 -0800 xen: remove xen_load_gdt debug Don't need the noise. Signed-off-by: Jeremy Fitzhardinge commit a957fac50023eac09368ab19d3a7ec725c2657c3 Author: Jeremy Fitzhardinge Date: Wed Mar 4 15:26:00 2009 -0800 xen: make xen_load_gdt simpler Remove use of multicall machinery which is unused (gdt loading is never performance critical). This removes the implicit use of percpu variables, which simplifies understanding how the percpu code's use of load_gdt interacts with this code. Signed-off-by: Jeremy Fitzhardinge commit c7da8c829b3f919089ff021d6ddc376d38299729 Author: Jeremy Fitzhardinge Date: Wed Mar 4 13:02:18 2009 -0800 xen: clean up xen_load_gdt Makes the logic a bit clearer. Signed-off-by: Jeremy Fitzhardinge commit cdaead6b4e657f960d6d6f9f380e7dfeedc6a09b Author: Jeremy Fitzhardinge Date: Fri Feb 27 15:34:59 2009 -0800 xen: split construction of p2m mfn tables from registration Build the p2m_mfn_list_list early with the rest of the p2m table, but register it later when the real shared_info structure is in place. Signed-off-by: Jeremy Fitzhardinge commit e791ca0fd79461ad72559a6e01362da4d7d16253 Author: Jeremy Fitzhardinge Date: Thu Feb 26 15:48:33 2009 -0800 xen: separate p2m allocation from setting When doing very early p2m setting, we need to separate setting from allocation, so split things up accordingly. Signed-off-by: Jeremy Fitzhardinge commit d6382bf77e30799b78f19c0a129d4a9e0e9f2e2a Author: Jeremy Fitzhardinge Date: Fri Feb 20 23:01:26 2009 -0800 xen: disable preempt for leave_lazy_mmu xen_mc_flush() requires preemption to be disabled for its own sanity, so disable it while we're flushing. Signed-off-by: Jeremy Fitzhardinge 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 280b713b5b0fd84cf2469098aee88acbb5de859c Author: Eric Anholt Date: Thu Mar 12 16:56:27 2009 -0700 drm/i915: Allow tiling of objects with bit 17 swizzling by the CPU. Save the bit 17 state of the pages when freeing the page list, and reswizzle them if necessary when rebinding the pages (in case they were swapped out). Since we have userland with expectations that the swizzle enums let it pread and pwrite contents accurately, we can't expose a new swizzle enum for bit 17 (which it would have to GTT map to handle), so we handle it down in pread and pwrite by swizzling the copy when bit 17 of the page address is set. Signed-off-by: Eric Anholt commit e5e9ecde63ba365b510df0f4a9cb3b048a0ad785 Author: Eric Anholt Date: Tue Apr 7 16:01:22 2009 -0700 drm/i915: Correctly set the write flag for get_user_pages in pread. Otherwise, the results of our read didn't show up when we were faulting in the page being read into (as happened with a testcase reading into a big stack area). Likely accounts for some conformance test failures. Signed-off-by: Eric Anholt 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 2bc43b5cf5158a26fa1328234795abed2dff5275 Author: Florian Mickler Date: Mon Apr 6 22:55:41 2009 +0200 drm/i915: Fix use of uninitialized var in 40a5f0de i915_gem_put_relocs_to_user returned an uninitialized value which got returned to userspace. This caused libdrm in my setup to never get out of a do{}while() loop retrying i915_gem_execbuffer. result was hanging X, overheating of cpu and 2-3gb of logfile-spam. This patch adresses the issue by 1. initializing vars in this file where necessary 2. correcting wrongly interpreted return values of copy_[from/to]_user Signed-off-by: Florian Mickler [anholt: cleanups of unnecessary changes, consistency in APIs] Signed-off-by: Eric Anholt commit 5b40f871158da7aaccff442645dae8b97c2e4d50 Author: Ferenc Wagner Date: Mon Apr 6 14:55:09 2009 +0200 drm/i915: indicate framebuffer restore key in SysRq help message At the same time, bring the action message closer to the usual format. Signed-off-by: Ferenc Wagner Acked-by: Jesse Barnes Signed-off-by: Eric Anholt commit 9dff6af860d6b7f661d4360eb859837afaca0a1b Author: Ma Ling Date: Thu Apr 2 13:13:26 2009 +0800 drm/i915: sync hdmi detection by hdmi identifier with 2D Currently we detect HDMI monitor by hardware detection, but if an HDMI-DVI adapter is used to connect a DVI monitor, hardware detection will incorrectly take monitor as HDMI. HDMI spec says any device containing IEEE registration identifier will be treated as HDMI device. The patch intends to detect HDMI monitor by drm_detect_hdmi_monitor function which follows that rule. Signed-off-by: Ma Ling Signed-off-by: Eric Anholt commit 6115707be0e85a9b825f10e95143cb705b87fef8 Author: Shaohua Li Date: Fri Apr 3 15:24:43 2009 +0800 drm/i915: Fix a mismerge of the IGD patch (new .find_pll hooks missed) Signed-off-by: Shaohua Li Signed-off-by: Eric Anholt commit 6911a9b8ae8b2a1dab4dfda9c2bd20f7ca2961d6 Author: Ben Gamari Date: Thu Apr 2 11:24:54 2009 -0700 drm/i915: Implement batch and ring buffer dumping We create a debugfs node (i915_ringbuffer_data) to expose a hex dump of the ring buffer itself. We also expose another debugfs node (i915_ringbuffer_info) with information on the state (i.e. head, tail addresses) of the ringbuffer. For batchbuffer dumping, we look at the device's active_list, dumping each object which has I915_GEM_DOMAIN_COMMAND in its read domains. This is all exposed through the dri/i915_batchbuffers debugfs file with a header for each object (giving the objects gtt_offset so that it can be matched against the offset given in the BATCH_BUFFER_START command. Signed-off-by: Ben Gamari Signed-off-by: Carl Worth Signed-off-by: Eric Anholt 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 59d138120d18930ba9a5466662d45a2bd2223455 Author: Hidetoshi Seto Date: Wed Mar 25 10:50:34 2009 +0900 x86: smarten /proc/interrupts output for new counters Now /proc/interrupts of tip tree has new counters: PLT: Platform interrupts Format change of output, as like that by commit: commit 7a81d9a7da03d2f27840d659f97ef140d032f609 x86: smarten /proc/interrupts output should be applied to these new counters too. Signed-off-by: Hidetoshi Seto Cc: Jan Beulich LKML-Reference: <49C98DEA.8060208@jp.fujitsu.com> Signed-off-by: Ingo Molnar commit 280ff388b1b7a818a64af4c789299e62c0d3c094 Merge: c5da9a2 577c9c4 Author: Ingo Molnar Date: Wed Apr 8 18:04:48 2009 +0200 Merge commit 'v2.6.30-rc1' into x86/urgent Merge reason: fix to be queued up depends on upstream facilities Signed-off-by: Ingo Molnar commit c5da9a2bb24a7928c39495cdabf98d3f7931bde5 Author: Alan Cox Date: Thu Mar 26 20:45:28 2009 +0000 x86: DMI match for the Dell DXP061 as it needs BIOS reboot Closes http://bugzilla.kernel.org/show_bug.cgi?12901 Signed-off-by: Alan Cox LKML-Reference: <20090326204524.4454.8776.stgit@localhost.localdomain> Signed-off-by: Ingo Molnar commit 8f2e586567b1bad72dac7c3810fe9a2ef7117506 Author: Oleg Nesterov Date: Fri Mar 27 01:06:10 2009 +0100 posix-timers: fix RLIMIT_CPU && setitimer(CPUCLOCK_PROF) update_rlimit_cpu() tries to optimize out set_process_cpu_timer() in case when we already have CPUCLOCK_PROF timer which should expire first. But it uses cputime_lt() instead of cputime_gt(). Test case: int main(void) { struct itimerval it = { .it_value = { .tv_sec = 1000 }, }; assert(!setitimer(ITIMER_PROF, &it, NULL)); struct rlimit rl = { .rlim_cur = 1, .rlim_max = 1, }; assert(!setrlimit(RLIMIT_CPU, &rl)); for (;;) ; return 0; } Without this patch, the task is not killed as RLIMIT_CPU demands. Signed-off-by: Oleg Nesterov Acked-by: Peter Zijlstra Cc: Peter Lojkin Cc: Roland McGrath Cc: stable@kernel.org LKML-Reference: <20090327000610.GA10108@redhat.com> Signed-off-by: Ingo Molnar commit 6279a751fe096a21dc7704e918d570d3ff06e769 Author: Oleg Nesterov Date: Fri Mar 27 01:06:07 2009 +0100 posix-timers: fix RLIMIT_CPU && fork() See http://bugzilla.kernel.org/show_bug.cgi?id=12911 copy_signal() copies signal->rlim, but RLIMIT_CPU is "lost". Because posix_cpu_timers_init_group() sets cputime_expires.prof_exp = 0 and thus fastpath_timer_check() returns false unless we have other expired cpu timers. Change copy_signal() to set cputime_expires.prof_exp if we have RLIMIT_CPU. Also, set cputimer.running = 1 in that case. This is not strictly necessary, but imho makes sense. Reported-by: Peter Lojkin Signed-off-by: Oleg Nesterov Acked-by: Peter Zijlstra Cc: Peter Lojkin Cc: Roland McGrath Cc: stable@kernel.org LKML-Reference: <20090327000607.GA10104@redhat.com> Signed-off-by: Ingo Molnar commit 08d63b10db943d4e1ff5ae3abc33467f037477f3 Author: Yinghai Lu Date: Wed Apr 8 08:00:01 2009 -0700 x86: make 64 bit to use default_inquire_remote_apic Impact: restore old behavior for flat and phys_flat Signed-off-by: Yinhai Lu Signed-off-by: Ingo Molnar commit 01fad98a1f1d3b38adcbab4bd97f7f4cb983ffb5 Author: Ingo Molnar Date: Wed Apr 8 17:27:59 2009 +0200 sched: refresh MAINTAINERS entry Peter has become a co-maintainer of the scheduler during the last year, and Robert has become inactive - update the MAINTAINERS entry. Acked-by: Peter Zijlstra Signed-off-by: Ingo Molnar commit 5af8c4e0fac9838428bd718040b664043a05f37c Merge: 46e0bb9 577c9c4 Author: Ingo Molnar Date: Wed Apr 8 17:25:42 2009 +0200 Merge commit 'v2.6.30-rc1' into sched/urgent Merge reason: update to latest upstream to queue up fix Signed-off-by: Ingo Molnar commit 022624a758dc9489388a99ad29577b4c8c09237c Author: Zhaolei Date: Fri Mar 27 17:09:10 2009 +0800 printk: fix wrong format string iter for printk printk("%Q"); Output before patch: %QQ Output after patch: %Q Signed-off-by: Zhao Lei Acked-by: Lai Jiangshan Acked-by: Frederic Weisbecker Cc: torvalds@linux-foundation.org Cc: Steven Rostedt LKML-Reference: <49CC97B6.7040809@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit ff96e612cba32510e263e17b213235fe5746397e Merge: cd84a42 577c9c4 Author: Ingo Molnar Date: Wed Apr 8 17:02:50 2009 +0200 Merge commit 'v2.6.30-rc1' into core/urgent Merge reason: need latest upstream to queue up dependent fix Signed-off-by: Ingo Molnar commit ac15e95090c2588ada4904c8c4ae8edd347acdf0 Author: David Brownell Date: Tue Apr 7 17:51:49 2009 -0700 leds: just ignore invalid GPIOs in leds-gpio Fix build problems with leds-gpio: CC drivers/leds/leds-gpio.o drivers/leds/leds-gpio.c: In function 'create_gpio_led': drivers/leds/leds-gpio.c:85: warning: 'return' with no value, in function returning non-void Signed-off-by: David Brownell Signed-off-by: Richard Purdie commit f0edef8c8b35f04b89311590dd6f1249f07fab3a Author: Grant Likely Date: Wed Apr 8 14:13:04 2009 +0200 xsysace: Fix dereferencing of cf_id after hd_driveid removal Commit 4aaf2fec718f6fbf38668edf733a0ab09a49cab1 (xsysace: make it 'struct hd_driveid'-free) converted the cf_id member of 'struct ace_device' from a 'struct hd_driveid' to a u16 array. However, references to the base of the structure were still using the '&' operator. When the address was used with the ata_id_u32() macro, the compiler used the size of the entire array instead of sizeof(u16) to calculate the offset from the base address. This patch removes the use of the '&' operator from all references of cf_id to fix the bug and remove future confusion. Signed-off-by: Grant Likely Signed-off-by: Bartlomiej Zolnierkiewicz commit fb4252e59452c18b88af014a2c4ee697bbf8cbc6 Author: Stanislaw Gruszka Date: Wed Apr 8 14:13:04 2009 +0200 at91_ide: turn on PIO 6 support As we have already PIO 6 transfer mode supported in IDE layer, we can turn it on in the driver. Signed-off-by: Stanislaw Gruszka Tested-by: "Steve Wootton" Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 55c590b64e70cb9922ff56703578ec271eaaca02 Author: Stanislaw Gruszka Date: Wed Apr 8 14:13:04 2009 +0200 at91_ide: remove unused ide_mm_{outb,inb} Cc: Sergei Shtylyov Signed-off-by: Stanislaw Gruszka commit 3c8a48e9a94be1e063f2f8d7d5f6f691423a3e71 Author: Borislav Petkov Date: Wed Apr 8 14:13:03 2009 +0200 ide-cd: reverse NOT_READY sense key logic Make the case of flushing the drive's cache explicit. There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 3153c26b54230d025c6d536e8d3015def4524906 Author: Sergei Shtylyov Date: Wed Apr 8 14:13:03 2009 +0200 ide: refactor tf_read() method Simplify tf_read() method, making it deal only with 'struct ide_taskfile' and the validity flags that the upper layer passes, and factoring out the code that deals with the high order bytes into ide_tf_readback() to be called from the only two functions interested, ide_complete_cmd() and ide_dump_sector(). This should stop the needless code duplication in this method and so make it about twice smaller than it was; along with simplifying the setup for the method call, this should save both time and space... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit c9ff9e7b64138d87023b733e618f29a1d58543f7 Author: Sergei Shtylyov Date: Wed Apr 8 14:13:03 2009 +0200 ide: refactor tf_load() method Simplify tf_load() method, making it deal only with 'struct ide_taskfile' and the validity flags that the upper layer passes, and moving the code that deals with the high order bytes into the only function interested, do_rw_taskfile(). This should stop the needless code duplication in this method and so make it about twice smaller than it was; along with simplifying the setup for the method call, this should save both time and space... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 30881b9ac91e7c23e0ceb8414ab7de1961809bdd Author: Sergei Shtylyov Date: Wed Apr 8 14:13:02 2009 +0200 ide: call write_devctl() method from tf_read() method Use write_devctl() method to clear/set the HOB bit in tf_read() method. Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 4109d19af73826aa6fee1a1b951670381be88f8b Author: Sergei Shtylyov Date: Wed Apr 8 14:13:02 2009 +0200 ide: move common code out of tf_load() method Move device register masking (and setting drive->select) out of tf_load() method and into the only function that needs to use this code, do_rw_taskfile()... Signed-off-by: Sergei Shtylyov [bart: fix whitespace error] Signed-off-by: Bartlomiej Zolnierkiewicz commit 745483f10c6cefb303007c6873e2bfce54efa8ed Author: Sergei Shtylyov Date: Wed Apr 8 14:13:02 2009 +0200 ide: simplify 'struct ide_taskfile' Make 'struct ide_taskfile' cover only 8 register values and thus put two such fields ('tf' and 'hob') into 'struct ide_cmd', dropping unnecessary 'tf_array' field from it. This required changing the prototype of ide_get_lba_addr() and ide_tf_dump(). Signed-off-by: Sergei Shtylyov [bart: fix setting of ATA_LBA bit for LBA48 commands in __ide_do_rw_disk()] Signed-off-by: Bartlomiej Zolnierkiewicz commit 60f85019c6c8c1aebf3485a313e0da094bc95d07 Author: Sergei Shtylyov Date: Wed Apr 8 14:13:01 2009 +0200 ide: replace IDE_TFLAG_* flags by IDE_VALID_* Replace IDE_TFLAG_{IN|OUT}_* flags meaning to the taskfile register validity on input/output by the IDE_VALID_* flags and introduce 4 symmetric 8-bit register validity indicator subfields, 'valid.{input/output}.{tf|hob}', into the 'struct ide_cmd' instead of using the 'tf_flags' field for that purpose (this field can then be turned from 32-bit into 8-bit one). Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 674f0ea111bc9bff1b4e4841d7da38933c5e3b59 Author: Bartlomiej Zolnierkiewicz Date: Wed Apr 8 14:12:54 2009 +0200 ide-cd: fix intendation in cdrom_decode_status() Based on earlier work by Borislav Petkov. Fix intendation in cdrom_decode_status(), no real code changes. While at it: - beautify comments There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1920c48d796ce7240ba267cb0be85c51895258f8 Author: Bartlomiej Zolnierkiewicz Date: Wed Apr 8 14:12:54 2009 +0200 ide-cd: unify handling of fs and pc requests in cdrom_decode_status() Based on earlier work by Borislav Petkov. Unify handling of fs and pc requests in cdrom_decode_status(). While at it: - remove unreachable code The only change in functionality is that for pc requests more detailed error message will be printed for following sense keys: * ILLEGAL_REQUEST * DATA_PROTECT * MEDIUM_ERROR * BLANK_CHECK Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit e01f251fd09fa7cb3d352eac7de17bb5d5bd1f9d Author: Bartlomiej Zolnierkiewicz Date: Wed Apr 8 14:12:53 2009 +0200 ide-cd: convert cdrom_decode_status() to use switch statements Based on earlier work by Borislav Petkov. Convert cdrom_decode_status() to use switch statements in preparation to unify handling of fs and pc requests. While at it: - remove superfluous comments and do minor CodingStyle fixups There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 98036abf31994244cb5772ecc291f4293a52c20b Author: Borislav Petkov Date: Wed Apr 8 14:12:53 2009 +0200 ide-cd: update debugging support Signed-off-by: Borislav Petkov [bart: extracted from "ide-cd: cleanup cdrom_decode_status" patch] Signed-off-by: Bartlomiej Zolnierkiewicz commit dfa4411cc3a690011cab90e9a536938795366cf9 Author: Borislav Petkov Date: Wed Apr 8 14:12:53 2009 +0200 ide-cd: respect REQ_QUIET for fs requests in cdrom_decode_status() There should be no functional change resulting from this patch. Suggested-by: Bartlomiej Zolnierkiewicz Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 1597cd82504174c816c39cefabacd8a27b993ce0 Author: Huang Weiyi Date: Wed Apr 8 14:12:53 2009 +0200 ide: remove unused #include Remove unused #include in drivers/ide/at91_ide.c. Signed-off-by: Huang Weiyi Signed-off-by: Bartlomiej Zolnierkiewicz commit aa24d9783d1dcba1a25451dadb6fb0ee092bd8df Author: Atsushi Nemoto Date: Wed Apr 8 14:12:52 2009 +0200 tx4939ide: Fix tx4939ide_{in,out}put_data_swap argument The commit adb1af9 ("ide: pass command instead of request to ide_pio_datablock()") missed tx4939ide driver. Signed-off-by: Atsushi Nemoto Cc: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit d68bab503e64e87c464c5a27a56877a04e4404b5 Author: Atsushi Nemoto Date: Wed Apr 8 14:12:52 2009 +0200 tx493[89]ide: Remove big endian version of tx493[89]ide_tf_{load,read} Now tx493[89]ide_tf_{load,read} do not contain word I/O operations. They are endian-free now. Signed-off-by: Atsushi Nemoto Cc: Sergei Shtylyov , Signed-off-by: Bartlomiej Zolnierkiewicz commit 805ec58ad7fd1f65eeb75ed38f11bd08fbd3b988 Author: Borislav Petkov Date: Wed Apr 8 14:12:52 2009 +0200 ide-cd: carve out an ide_cd_breathe()-helper for fs write requests There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit 8e59bfde31e69fb1f630ec0efd24a50c5a51b0bf Author: Borislav Petkov Date: Wed Apr 8 14:12:51 2009 +0200 ide-cd: move status checking into the IRQ handler There should be no functional change resulting from this patch. Signed-off-by: Borislav Petkov Signed-off-by: Bartlomiej Zolnierkiewicz commit cfd30daa0d6cbdb0bbc2bc40a10097231b23b204 Author: Sergei Shtylyov Date: Wed Apr 8 14:12:51 2009 +0200 ide-h8300: remove custom tf_{read|load}() methods Since tf_{read|load}() methods of this driver have now become identical to their standard counterparts using I/O port accesses, there's no need to override those anymore... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 7636e455ea00755b863340570eb47a3652624da3 Author: Sergei Shtylyov Date: Wed Apr 8 14:12:51 2009 +0200 at91_ide: remove custom tf_{read|load}() methods Since tf_{read|load}() methods of this driver have now become identical to their standard counterparts using MMIO accesses, there's no need to override those anymore... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit add4d9a9838fc9a3b3d1886b6ce96cfc08386e9b Author: Sergei Shtylyov Date: Wed Apr 8 14:12:50 2009 +0200 ide-h8300: remove mm_{inw|outw}() Remove two no longer used functions that I've overlooked... Signed-off-by: Sergei Shtylyov Signed-off-by: Bartlomiej Zolnierkiewicz commit 253275c52c8f5848df63f140977ef19800f2dfca Author: Atsushi Nemoto Date: Wed Apr 8 14:12:49 2009 +0200 tx4939ide: remove wmb() * define CHECK_DMA_MASK * remove use of wmb() Reported-by: Grant Grundler Reviewed-by: Grant Grundler Signed-off-by: Atsushi Nemoto commit edafcf73dca2f9531c78eec130df84a8c9654b3b Author: Grant Grundler Date: Wed Apr 8 14:12:49 2009 +0200 ide: remove wmb() from ide-dma-sff.c and scc_pata.c This patch: o replaces "mask" variable in ide_dma_end() with #define. o removes use of wmb() in ide-dma-sff.c and scc_pata.c. o is not tested - I don't have (or want) the HW. Signed-off-by: Grant Grundler Cc: KOBAYASHI Yoshitake Signed-off-by: Bartlomiej Zolnierkiewicz commit d18812070efc658267f7573eec5ce7810128bfeb Author: Geert Uytterhoeven Date: Wed Apr 8 14:12:48 2009 +0200 ide: falconide/q40ide - Use __ide_mm_{in,out}sw() for data Both of commits f94116aeec7a299640dd692128e1d22178affa8d ("ide: cleanup ") and 15a453a955f89f6545118770c669b52e925368bd ("ide: include only when needed") break falconide: | Uniform Multi-Platform E-IDE driver | ide: Falcon IDE controller | Probing IDE interface ide0... | hda: Sarge m68k, ATA DISK drive | ide0 at 0xfff00000 on irq 15 (serialized) | ide-gd driver 1.18 | hda: max request size: 128KiB | hda: 2118816 sectors (1084 MB) w/256KiB Cache, CHS=2102/16/63 | hda:<4>hda: lost interrupt This happens because falconide relies on {in,out}sw() being redefined in , as included by , which is no longer the case. Use __ide_mm_{in,out}sw() from instead, just like ide_{in,out}put_data() do. The same problem seems to exist in q40ide. Signed-off-by: Geert Uytterhoeven Signed-off-by: Bartlomiej Zolnierkiewicz commit aa07573b2bd0fee5a7537cb663fbb2de60278801 Author: Geert Uytterhoeven Date: Wed Apr 8 14:12:47 2009 +0200 ide: Fix host drivers that need IRQF_SHARED commit 255115fb35f80735c21a1cbe9809e9795a3af26e ("ide: allow host drivers to specify IRQ flags") added irq_flags fields to struct ide_port_info and struct ide_host. Drivers can now set ide_port_info.irq_flags = IRQF_SHARED, while init_irq() passes ide_host.irq_flags to request_irq(). Unfortunately ide_host.irq_flags is never set, causing (on ARAnyM): | Uniform Multi-Platform E-IDE driver | ide: Falcon IDE controller | Probing IDE interface ide0... | hda: Sarge m68k, ATA DISK drive | init_irq: sa = 0 | ide0: disabled, unable to get IRQ 15 | ide0: failed to initialize IDE interface | ide0: disabling port Solve this by copying ide_port_info.irq_flags to ide_host.irq_flags in ide_host_alloc(). This bug probably affects the following IDE host drivers: - buddha - delkin_cb - falconide - gayle - ide-cs - macide - q40ide - scc_pata - sgiioc4 Signed-off-by: Geert Uytterhoeven Signed-off-by: Bartlomiej Zolnierkiewicz 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 f876d346e3807647b1de411de6a86c44821896ca Author: Tetsuo Handa Date: Wed Apr 8 14:05:43 2009 +0900 tracing: append a comma to INIT_FTRACE_GRAPH Impact: dont break future extensions of INIT_TASK While not a problem right now, due to lack of a comma, build fails if elements are appended to INIT_TASK() macro in development code: arch/x86/kernel/init_task.c:33: error: request for member `XXXXXXXXXX' in something not a structure or union arch/x86/kernel/init_task.c:33: error: initializer element is not constant arch/x86/kernel/init_task.c:33: error: (near initialization for `init_task.ret_stack') make[1]: *** [arch/x86/kernel/init_task.o] Error 1 make: *** [arch/x86/kernel] Error 2 Signed-off-by: Tetsuo Handa Cc: srostedt@redhat.com LKML-Reference: <200904080505.n3855hcn017109@www262.sakura.ne.jp> Signed-off-by: Ingo Molnar commit 0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3 Author: David Woodhouse Date: Wed Apr 8 01:22:36 2009 -0700 qla1280: Fix off-by-some error in firmware loading. We were calculating the wrong address for the start of the data. Signed-off-by: David Woodhouse Tested-by: Jeremy Higdon commit ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d Merge: 577c9c4 59cc1dd Author: Dmitry Torokhov Date: Wed Apr 8 00:00:33 2009 -0700 Merge branch 'next' into for-linus commit 59cc1dd97ca9ac0363ef2f770901fbd86e2b970a Author: Dmitry Torokhov Date: Tue Apr 7 23:53:26 2009 -0700 Input: i8042 - add HP DV9700 to the noloop list Reported-by: Kenneth Crudup Signed-off-by: Dmitry Torokhov commit 0e3912c75f42986c17d955542247bf04c6eef738 Author: Uwe Kleine-König Date: Sat Mar 28 00:26:56 2009 +0100 [WATCHDOG] omap_wdt.c: move probe function to .devinit.text A pointer to omap_wdt_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König Cc: Alan Cox Cc: Felipe Balbi Cc: George G. Davis Cc: Andrew Morton Signed-off-by: Wim Van Sebroeck commit c98d58e00d8562520c9a69e688f007b860faebaa Author: Uwe Kleine-König Date: Sat Mar 28 00:26:45 2009 +0100 [WATCHDOG] ks8695_wdt.c: move probe function to .devinit.text A pointer to ks8695wdt_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König Cc: Alexey Dobriyan Cc: Alan Cox Cc: Andrew Morton Signed-off-by: Wim Van Sebroeck commit 47dec7c6c48a12bdacdf5f935f10f44e66d9c98c Author: Uwe Kleine-König Date: Sat Mar 28 00:26:26 2009 +0100 [WATCHDOG] at91rm9200_wdt.c: move probe function to .devinit.text A pointer to at91wdt_probe is passed to the core via platform_driver_register and so the function must not disappear when the .init sections are discarded. Otherwise (if also having HOTPLUG=y) unbinding and binding a device to the driver via sysfs will result in an oops as does a device being registered late. An alternative to this patch is using platform_driver_probe instead of platform_driver_register plus removing the pointer to the probe function from the struct platform_driver. Signed-off-by: Uwe Kleine-König Cc: Andrew Victor Cc: Russell King Cc: Jean-Christophe PLAGNIOL-VILLARD Cc: Ilpo Jarvinen Cc: Andrew Morton Signed-off-by: Wim Van Sebroeck commit b8f75b0d79671cb53d94e4ddd1db89502a7dc90e Author: Paulius Zaleckas Date: Tue Mar 31 15:46:57 2009 +0300 [WATCHDOG] remove ARM26 sections Removes ARM26 sections from Kconfig and Makefile, because ARM26 is long gone. Signed-off-by: Paulius Zaleckas Acked-by: Russell King Signed-off-by: Wim Van Sebroeck commit df6707b2190495037a1c8bb5b6f7756b4b9b73ac Author: Thomas Reitmayr Date: Fri Feb 20 19:44:59 2009 +0100 [WATCHDOG] orion5x_wdt: Add shutdown callback, use watchdog ping function * Added a callback to disable the watchdog on shutdown. * Use a separate ping function to reduce the number of register accesses if the watchdog is already enabled and just needs to be reloaded. * Minor cleanup of function names. Signed-off-by: Thomas Reitmayr Signed-off-by: Wim Van Sebroeck commit fc8a9d830fdbc72545187a42f8d71b9fa95764dd Author: Wim Van Sebroeck Date: Wed Mar 25 19:16:28 2009 +0000 [WATCHDOG] i6300esb.c: Restructure initialization of the device The i6300ESB watchdog should be stopped before userspace has access to the watchdog. So fix this and restructure the initialization sequence into: * See if we have a i6300 device * make sure that we have valid module parameters * Initialize the device * register the /dev/watchdog device so that userspace has access Signed-off-by: Wim Van Sebroeck commit 31838d9dac17dce6d68d985fd28c10d7a756dc4d Author: Wim Van Sebroeck Date: Wed Mar 25 19:14:45 2009 +0000 [WATCHDOG] i6300esb.c: Fix the GETSTATUS and GETBOOTSTATUS ioctls. The WDIOC_GETSTATUS and WDIOC_GETBOOTSTATUS should return WDIOF_* flags (and not counter values, ...) Signed-off-by: Wim Van Sebroeck commit bd4e6c18ae02a492094621072e540df02e866f61 Author: Wim Van Sebroeck Date: Wed Mar 25 19:20:10 2009 +0000 [WATCHDOG] i6300esb.c: Cleanup Cleanup to keep checkpatch.pl happy. Signed-off-by: Wim Van Sebroeck commit b35346fd25f3c8c0b6afeb778f8c4f41c5703c84 Author: Paul Mundt Date: Tue Apr 7 17:11:15 2009 -0700 sh: Provide cpumask_of_pcibus() to fix NUMA build. Signed-off-by: Paul Mundt 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 0f2ddca66d70c8ccba7486cf2d79c6b60e777abd Author: From: Thiemo Nagel Date: Tue Apr 7 14:07:47 2009 -0400 ext4: check block device size on mount Signed-off-by: Thiemo Nagel Signed-off-by: "Theodore Ts'o" commit 1e274a582710e95d93b86e8d47e9fcce4ca09d01 Author: H. Peter Anvin Date: Tue Apr 7 10:59:25 2009 -0700 x86, setup: un-resequence mode setting for VGA 80x34 and 80x60 modes Impact: Fixes these modes on at least one system The rewrite of the setup code into C resequenced the font setting and register reprogramming phases of configuring nonstandard VGA modes which use 480 scan lines in text mode. However, there exists at least one board (Micro-Star MS-7383 version 2.0) on which this resequencing causes an unusable display. Revert to the original sequencing: set up 480-line mode, install the font, and then adjust the vertical end register appropriately. This failure was masked by the fact that the 480-line setup was broken until checkin 5f641356127712fbdce0eee120e5ce115860c17f (therefore this is not a -stable candidate bug fix.) Reported-by: Andi Kleen Signed-off-by: H. Peter Anvin commit 6e9793812583e3c9e3674c8c8af1b114afae8673 Author: Kuninori Morimoto Date: Tue Apr 7 08:41:57 2009 +0000 sh: urquell: Add board comment Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit f7d7f866baacc283967ce82ebdfe5d2801059a11 Author: David Woodhouse Date: Mon Apr 6 23:04:40 2009 -0700 x86, intel-iommu: fix X2APIC && !ACPI build failure This build failure: | drivers/pci/dmar.c:47: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘dmar_tbl_size’ | drivers/pci/dmar.c:62: warning: ‘struct acpi_dmar_device_scope’ declared inside parameter list | drivers/pci/dmar.c:62: warning: its scope is only this definition or declaration, which is probably not what you want Triggers due to this commit: d0b03bd: x2apic/intr-remap: decouple interrupt remapping from x2apic Which exposed a pre-existing but dormant fragility of the 'select X86_X2APIC' it moved around and turned that fragility into a build failure. Replace it with a proper 'depends on' construct. Signed-off-by: David Woodhouse LKML-Reference: <1239084280.22733.404.camel@macbook.infradead.org> Signed-off-by: Ingo Molnar 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 0f8e5c298fc801e8eca69e1409604c05d36e0cc4 Author: David Woodhouse Date: Mon Apr 6 17:41:48 2009 -0700 Add README.AddingFirmware file. Basically telling people not to. Signed-off-by: David Woodhouse commit cec20f36d6e5a10db315714c6c3da90792368382 Author: David Woodhouse Date: Mon Apr 6 17:24:16 2009 -0700 firmware: Remove newly-added slicoss and sxg firmware images These are available elsewhere (for example in the linux-firmware.git repository); they have no business being added to the kernel source tree. We are only putting stuff in the firmware/ directory of the kernel source when it's extracted from long-standing drivers which used to include it directly. We didn't intend to open the floodgates to including megabytes of new firmware which was previously being distributed separately. Signed-off-by: David Woodhouse 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 14fa86f7c7f46abc3a1c2f18d9cea859e8e700c0 Author: David Woodhouse Date: Mon Apr 6 17:06:51 2009 -0700 firmware/WHENCE: Add missing origin information for Ambassador atmsar11.fw Looks like we forgot to update WHENCE when we converted this driver. Signed-off-by: David Woodhouse commit 31d3568dfeb1dfb2735f119efe5ece7c6d40969c Author: Fenghua Yu Date: Mon Apr 6 11:21:49 2009 -0700 Intel-IOMMU Alignment Issue in dma_pte_clear_range() This issue was pointed out by Linus. In dma_pte_clear_range() in intel-iommu.c start = PAGE_ALIGN(start); end &= PAGE_MASK; npages = (end - start) / VTD_PAGE_SIZE; In partial page case, start could be bigger than end and npages will be negative. Currently the issue doesn't show up as a real bug in because start and end have been aligned to page boundary already by all callers. So the issue has been hidden. But it is dangerous programming practice. Signed-off-by: Fenghua Yu Signed-off-by: David Woodhouse commit 7c7cae17e04765692aa3d2bda5c771f909219f27 Author: Takashi Iwai Date: Mon Apr 6 14:38:43 2009 -0700 ALSA: wavefront - Always use request_firmware() Always use request_firmware() for loading yss225_registers image. Signed-off-by: Takashi Iwai Signed-off-by: David Woodhouse commit 4f8d182513690b42b20fb81e487be4cd4729e27c Author: Jaswinder Singh Date: Sun Jun 22 18:24:19 2008 +0530 Remove fdump tool for av7110 firmware There's no point in this, since the user can use the BUILTIN_FIRMWARE option to include arbitrary firmware files directly in the kernel image. Thanks to David Woodhouse for help. Signed-off-by: Jaswinder Singh Signed-off-by: David Woodhouse commit 9137f05f7e72517d44b6b0c15b11b419ecb5d201 Author: Jaswinder Singh Date: Mon Apr 6 14:34:12 2009 -0700 firmware: convert av7110 driver to request_firmware() Signed-off-by: Jaswinder Singh Signed-off-by: David Woodhouse commit 4528e429009325790d94cd4f816b386bea8e8291 Author: David Woodhouse Date: Sat Jan 10 14:54:48 2009 +0000 Partially revert "V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card" This reverts a hunk of commit 4b29631db33292d416dc395c56122ea865e7635c which seems to have been an accident, and which re-introduced a previously fixed bug. Signed-off-by: David Woodhouse commit 556b0f58bbcdc96ba8ed67001b4e57c50198da89 Author: David Woodhouse Date: Sat Jan 10 14:53:15 2009 +0000 Revert "fix modules_install via NFS" This reverts commit 8b249b6856f16f09b0e5b79ce5f4d435e439b9d6. This 'fix' is not necessary; we just need to undo the damage caused accidentally by Igor/Mauro in 4b29631db33292d416dc395c56122ea865e7635c ("V4L/DVB (9533): cx88: Add support for TurboSight TBS8910 DVB-S PCI card") Signed-off-by: David Woodhouse commit 8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77 Author: Dave Chinner Date: Mon Apr 6 18:49:12 2009 +0200 xfs: remove xfs_flush_space The only thing we need to do now when we get an ENOSPC condition during delayed allocation reservation is flush all the other inodes with delalloc blocks on them and retry without EOF preallocation. Remove the unneeded mess that is xfs_flush_space() and just call xfs_flush_inodes() directly from xfs_iomap_write_delay(). Also, change the location of the retry label to avoid trying to do EOF preallocation because we don't want to do that at ENOSPC. This enables us to remove the BMAPI_SYNC flag as it is no longer used. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 153fec43ce5264dfe9f3530b281a2e940b25a0a8 Author: Dave Chinner Date: Mon Apr 6 18:48:30 2009 +0200 xfs: flush delayed allcoation blocks on ENOSPC in create If we are creating lots of small files, we can fail to get a reservation for inode create earlier than we should due to EOF preallocation done during delayed allocation reservation. Hence on the first reservation ENOSPC failure flush all the delayed allocation blocks out of the system and retry. This fixes the last commonly triggered spurious ENOSPC issue that has been reported. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit e43afd72d2455defd63a3f94f22fa09b586e58ed Author: Dave Chinner Date: Mon Apr 6 18:47:27 2009 +0200 xfs: block callers of xfs_flush_inodes() correctly xfs_flush_inodes() currently uses a magic timeout to wait for some inodes to be flushed before returning. This isn't really reliable but used to be the best that could be done due to deadlock potential of waiting for the entire flush. Now the inode flush is safe to execute while we hold page and inode locks, we can wait for all the inodes to flush synchronously. Convert the wait mechanism to a completion to do this efficiently. This should remove all remaining spurious ENOSPC errors from the delayed allocation reservation path. This is extracted almost line for line from a larger patch from Mikulas Patocka. Signed-off-by: Mikulas Patocka Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 5825294edd3364cbba6514f70d88debec4f6cec7 Author: Dave Chinner Date: Mon Apr 6 18:45:44 2009 +0200 xfs: make inode flush at ENOSPC synchronous When we are writing to a single file and hit ENOSPC, we trigger a background flush of the inode and try again. Because we hold page locks and the iolock, the flush won't proceed until after we release these locks. This occurs once we've given up and ENOSPC has been reported. Hence if this one is the only dirty inode in the system, we'll get an ENOSPC prematurely. To fix this, remove the async flush from the allocation routines and move it to the top of the write path where we can do a synchronous flush and retry the write again. Only retry once as a second ENOSPC indicates that we really are ENOSPC. This avoids a page cache deadlock when trying to do this flush synchronously in the allocation layer that was identified by Mikulas Patocka. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a8d770d987ee20b59fba6c37d7f0f2a351913c4b Author: Dave Chinner Date: Mon Apr 6 18:44:54 2009 +0200 xfs: use xfs_sync_inodes() for device flushing Currently xfs_device_flush calls sync_blockdev() which is a no-op for XFS as all it's metadata is held in a different address to the one sync_blockdev() works on. Call xfs_sync_inodes() instead to flush all the delayed allocation blocks out. To do this as efficiently as possible, do it via two passes - one to do an async flush of all the dirty blocks and a second to wait for all the IO to complete. This requires some modification to the xfs-sync_inodes_ag() flush code to do efficiently. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 9d7fef74b23fe57803c5f71fab11630d9ec2cb4b Author: Dave Chinner Date: Mon Apr 6 18:42:59 2009 +0200 xfs: inform the xfsaild of the push target before sleeping When trying to reserve log space, we find the amount of space we need, then go to sleep waiting for space. When we are woken, we try to push the tail of the log forward to make sure we have space available. Unfortunately, this means that if there is not space available, and everyone who needs space goes to sleep there is no-one left to push the tail of the log to make space available. Once we have a thread waiting for space to become available, the others queue up behind it in a FIFO, and none of them push the tail of the log. This can result in everyone going to sleep in xlog_grant_log_space() if the first sleeper races with the last I/O that moves the tail of the log forward. With no further I/O tomove the tail of the log, there is nothing to wake the sleepers and hence all transactions just stop. Fix this by making sure the xfsaild will create enough space for the transaction that is about to sleep by moving the push target far enough forwards to ensure that that the curent proceeees will have enough space available when it is woken. That is, we push the AIL before we go to sleep. Because we've inserted the log ticket into the queue before we've pushed and gone to sleep, subsequent transactions will wait behind this one. Hence we are guaranteed to have space available when we are woken. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit c626d174cfe38e7f0545d074c299527892cd8c45 Author: Dave Chinner Date: Mon Apr 6 18:42:11 2009 +0200 xfs: prevent unwritten extent conversion from blocking I/O completion Unwritten extent conversion can recurse back into the filesystem due to memory allocation. Memory reclaim requires I/O completions to be processed to allow the callers to make progress. If the I/O completion workqueue thread is doing the recursion, then we have a deadlock situation. Move unwritten extent completion into it's own workqueue so it doesn't block I/O completions for normal delayed allocation or overwrite data. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 705db3fd4660174a27418bbcb874d209a76044eb Author: Dave Chinner Date: Mon Apr 6 18:40:17 2009 +0200 xfs: fix double free of inode If we fail to initialise the VFS inode in inode_init_always(), it will call ->delete_inode internally resulting in the inode being freed. Hence we need to delay the call to inode_init_always() until after the XFS inode is sufficient set up to handle a call to ->delete_inode, and then if that fails do not touch the inode again at all as it has been freed. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit a6cb767e24b1dbedfcfa8077eab0aa2eab224038 Author: Dave Chinner Date: Mon Apr 6 18:39:27 2009 +0200 xfs: validate log feature fields correctly If the large log sector size feature bit is set in the superblock by accident (say disk corruption), the then fields that are now considered valid are not checked on production kernels. The checks are present as ASSERT statements so cause a panic on a debug kernel. Change this so that the fields are validity checked if the feature bit is set and abort the log mount if the fields do not contain valid values. Reported-by: Eric Sesterhenn Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig commit 090fed50ca11e7fe36e69d8cd46069276a40134b Author: Paul Mundt Date: Mon Apr 6 09:00:16 2009 -0700 sh: wire up sys_preadv/sys_pwritev() syscalls. Signed-off-by: Paul Mundt commit 9bb019f4c25a426deab26c9d1c67c8914bb4424f Author: Yoshihiro Shimoda Date: Mon Apr 6 11:37:15 2009 +0000 sh: sh7785lcr: fix PCI address map for 32-bit mode Fix the problem that cannot work PCI device on 32-bit mode because influence of the commit 68b42d1b548be1840aff7122fdebeb804daf0fa3 ("sh: sh7785lcr: Map whole PCI address space."). So this patch was implement like a 29-bit mode, map whole physical address space of DDR-SDRAM. Signed-off-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit 7fd87b3f1a6955da0a21b4fd99f8939701055172 Author: Francesco VIRLINZI Date: Mon Apr 6 07:17:04 2009 +0000 sh: intc: Added resume from hibernation support to the intc It's required for all modules loaded in the previous runtime session because not initilized duing the kernel start-up. Signed-off-by: Francesco Virlinzi Signed-off-by: Paul Mundt 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 e44543b83bf4ab84dc6bd5b88158c78b1ed1c208 Author: Thiemo Nagel Date: Sat Apr 4 23:30:44 2009 -0400 ext4: Fix off-by-one-error in ext4_valid_extent_idx() Signed-off-by: Thiemo Nagel Signed-off-by: "Theodore Ts'o" commit f73953c0656f2db9073c585c4df2884a8ecd101e Author: Thiemo Nagel Date: Tue Apr 7 18:46:47 2009 -0400 ext4: Fix big-endian problem in __ext4_check_blockref() Commit fe2c8191 introduced a regression on big-endian system, because the checks to make sure block references in non-extent inodes are valid failed to use le32_to_cpu(). Reported-by: Alexander Beregalov Signed-off-by: Thiemo Nagel Tested-by: Alexander Beregalov Signed-off-by: "Theodore Ts'o" Cc: stable@kernel.org 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 9756b15e1b58453a6fd54b85c1ad8515209e10bb Author: Yinghai Lu Date: Mon Mar 30 20:37:20 2009 -0700 irq: fix cpumask memory leak on offstack cpumask kernels Need to free the old cpumask for affinity and pending_mask. Signed-off-by: Yinghai Lu Acked-by: Rusty Russell LKML-Reference: <49D18FF0.50707@kernel.org> Signed-off-by: Ingo Molnar commit cd84a42f315e50edd454c27a3da3951ccd3d735a Author: Darren Hart Date: Thu Apr 2 14:19:38 2009 -0700 futex: comment requeue key reference semantics We've tripped over the futex_requeue drop_count refering to key2 instead of key1. The code is actually correct, but is non-intuitive. This patch adds an explicit comment explaining the requeue. Signed-off-by: Darren Hart Cc: Peter Zijlstra Cc: Nick Piggin Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar commit 633fe795b80693a8198e7d82f66538a72d2bbba2 Author: Randy Dunlap Date: Wed Apr 1 17:47:23 2009 -0700 timers: add missing kernel-doc Add missing kernel-doc parameter notation and change function name to its new name: Warning(kernel/timer.c:543): No description found for parameter 'name' Warning(kernel/timer.c:543): No description found for parameter 'key' Signed-off-by: Randy Dunlap Cc: akpm Cc: Johannes Berg LKML-Reference: <20090401174723.f0bea0eb.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit 84adeee9aaa0d81712de1e0ea74caed3398e4a1d Author: Yossi Etigin Date: Wed Apr 1 13:55:32 2009 -0700 RDMA/cma: Use rate from IPoIB broadcast when joining IPoIB multicast groups When joining an IPoIB multicast group, use the same rate as in the broadcast group. Otherwise, if the RDMA CM creates this group before IPoIB does, it might get a different rate. This will cause IPoIB to fail joining to the same group later on, because IPoIB uses strict rate selection. Signed-off-by: Yossi Etigin Signed-off-by: Roland Dreier commit 46e0bb9c12f4bab539736f1714cbf16600f681ec Author: Gautham R Shenoy Date: Mon Mar 30 10:25:20 2009 +0530 sched: Print sched_group::__cpu_power in sched_domain_debug Impact: extend debug info /proc/sched_debug If the user changes the value of the sched_mc/smt_power_savings sysfs tunable, it'll trigger a rebuilding of the whole sched_domain tree, with the SD_POWERSAVINGS_BALANCE flag set at certain levels. As a result, there would be a change in the __cpu_power of sched_groups in the sched_domain hierarchy. Print the __cpu_power values for each sched_group in sched_domain_debug to help verify this change and correlate it with the change in the load-balancing behavior. Signed-off-by: Gautham R Shenoy Cc: Peter Zijlstra LKML-Reference: <20090330045520.2869.24777.stgit@sofia.in.ibm.com> Signed-off-by: Ingo Molnar commit ef12fefabf94b6a902ad3abd3eb124b00560c445 Author: Bharata B Rao Date: Tue Mar 31 10:02:22 2009 +0530 cpuacct: add per-cgroup utime/stime statistics Add per-cgroup cpuacct controller statistics like the system and user time consumed by the group of tasks. Changelog: v7 - Changed the name of the statistic from utime to user and from stime to system so that in future we could easily add other statistics like irq, softirq, steal times etc easily. v6 - Fixed a bug in the error path of cpuacct_create() (pointed by Li Zefan). v5 - In cpuacct_stats_show(), use cputime64_to_clock_t() since we are operating on a 64bit variable here. v4 - Remove comments in cpuacct_update_stats() which explained why rcu_read_lock() was needed (as per Peter Zijlstra's review comments). - Don't say that percpu_counter_read() is broken in Documentation/cpuacct.txt as per KAMEZAWA Hiroyuki's review comments. v3 - Fix a small race in the cpuacct hierarchy walk. v2 - stime and utime now exported in clock_t units instead of msecs. - Addressed the code review comments from Balbir and Li Zefan. - Moved to -tip tree. v1 - Moved the stime/utime accounting to cpuacct controller. Earlier versions - http://lkml.org/lkml/2009/2/25/129 Signed-off-by: Bharata B Rao Signed-off-by: Balaji Rao Cc: Dhaval Giani Cc: Paul Menage Cc: Andrew Morton Cc: KAMEZAWA Hiroyuki Reviewed-by: Li Zefan Acked-by: Peter Zijlstra Acked-by: Balbir Singh Tested-by: Balbir Singh LKML-Reference: <20090331043222.GA4093@in.ibm.com> Signed-off-by: Ingo Molnar commit c5f8d99585d7b5b7e857fabf8aefd0174903a98c Author: Hidetoshi Seto Date: Tue Mar 31 16:56:03 2009 +0900 posixtimers, sched: Fix posix clock monotonicity Impact: Regression fix (against clock_gettime() backwarding bug) This patch re-introduces a couple of functions, task_sched_runtime and thread_group_sched_runtime, which was once removed at the time of 2.6.28-rc1. These functions protect the sampling of thread/process clock with rq lock. This rq lock is required not to update rq->clock during the sampling. i.e. The clock_gettime() may return ((accounted runtime before update) + (delta after update)) that is less than what it should be. v2 -> v3: - Rename static helper function __task_delta_exec() to do_task_delta_exec() since -tip tree already has a __task_delta_exec() of different version. v1 -> v2: - Revises comments of function and patch description. - Add note about accuracy of thread group's runtime. Signed-off-by: Hidetoshi Seto Acked-by: Peter Zijlstra Cc: stable@kernel.org [2.6.28.x][2.6.29.x] LKML-Reference: <49D1CC93.4080401@jp.fujitsu.com> Signed-off-by: Ingo Molnar commit 13b8bd0a5713bdf05659019badd7c0407984ece1 Author: Rusty Russell Date: Wed Mar 25 15:01:22 2009 +1030 sched_rt: don't allocate cpumask in fastpath Impact: cleanup As pointed out by Steven Rostedt. Since the arg in question is unused, we simply change cpupri_find() to accept NULL. Reported-by: Steven Rostedt Signed-off-by: Rusty Russell LKML-Reference: <200903251501.22664.rusty@rustcorp.com.au> Signed-off-by: Ingo Molnar commit edb5abb1e2a84fd8802a3577d95eac84fe1405ab Author: Roland Dreier Date: Tue Mar 31 10:22:32 2009 -0700 IPoIB: Avoid free_netdev() BUG when destroying a child interface We have to release the RTNL before calling free_netdev() so that the device state has a chance to become NETREG_UNREGISTERED. Otherwise when removing a child interface, we hit the BUG() that tests the device state in free_netdev(). Reported-by: Yossi Etigin Signed-off-by: Roland Dreier commit 352b09edd7fa8145bfc9e5db0cc0fed971b69440 Author: Roland Dreier Date: Tue Mar 31 09:54:15 2009 -0700 mlx4_core: Don't leak mailbox for SET_PORT on Ethernet ports Commit 793730bf ("mlx4_core: Don't perform SET_PORT command for Ethernet ports") introduced a leak of mailbox buffers when SET_PORT was called for Ethernet ports, since it added a return after the mailbox was allocated. Fix this by checking the port type and returning *before* allocating the mailbox. Signed-off-by: Roland Dreier commit a18b83b7ef3c98cd8b4bb885e4a649a8f30fb7b0 Author: Bharata B Rao Date: Mon Mar 23 10:02:53 2009 +0530 cpuacct: make cpuacct hierarchy walk in cpuacct_charge() safe when rcupreempt is used -v2 Impact: fix cgroups race under rcu-preempt cpuacct_charge() obtains task's ca and does a hierarchy walk upwards. This can race with the task's movement between cgroups. This race can cause an access to freed ca pointer in cpuacct_charge() or access to invalid cgroups pointer of the task. This will not happen with rcu or tree rcu as cpuacct_charge() is called with preemption disabled. However if rcupreempt is used, the race is seen. Thanks to Li Zefan for explaining this. Fix this race by explicitly protecting ca and the hierarchy walk with rcu_read_lock(). Changes for v2: - Update patch descrition (as per Li Zefan's review comments). - Remove comments in cpuacct_charge() which explained why rcu_read_lock() was needed (as per Peter Zijlstra's review comments). Signed-off-by: Bharata B Rao Cc: Dhaval Giani Cc: Li Zefan Cc: Paul Menage Cc: KAMEZAWA Hiroyuki Acked-by: Peter Zijlstra Acked-by: Balbir Singh Tested-by: Balbir Singh Signed-off-by: Ingo Molnar commit 874d8df5ed6e36fed07b524c266f6a96dd6d10d9 Author: Steve Wise Date: Mon Mar 30 08:37:59 2009 -0700 RDMA/cxgb3: Release dependent resources only when endpoint memory is freed. The cxgb3 l2t entry, hwtid, and dst entry were being released before all the iwch_ep references were released. This can cause a crash in t3_l2t_send_slow() and other places where the l2t entry is used. The fix is to defer releasing these resources until all endpoint references are gone. Details: - move flags field to the iwch_ep_common struct. - add a flag indicating resources are to be released. - release resources at endpoint free time instead of close/abort time. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 04b5d028f50ff05a8f9ae049ee71f8fdfcf1f5de Author: Steve Wise Date: Mon Mar 30 08:37:56 2009 -0700 RDMA/cxgb3: Handle EEH events - wrap calls into cxgb3 and fail them if we're in the middle of a PCI EEH event. - correctly unwind and release endpoint and other resources when we are in an EEH event. - dispatch IB_EVENT_DEVICE_FATAL event when cxgb3 notifies iw_cxgb3 of a fatal error. Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit e1d60ec6699f19b760df8261e922ae236ea7bb31 Author: Roland Dreier Date: Mon Mar 30 08:31:05 2009 -0700 IB/mlx4: Use pgprot_writecombine() for BlueFlame pages The PAT work on x86 has finally made pgprot_writecombine() a usable API for modular drivers. As the comment indicates, this is exactly what we want to use in mlx4_ib to map BlueFlame pages up to userspace, since using WC for these pages improves small message latency significantly. Signed-off-by: Roland Dreier commit c6375b0a8007fffe65109aeea032a9243df070e1 Author: Michal Simek Date: Fri Mar 27 14:25:52 2009 +0100 microblaze_v8: Add MAINTAINERS fragment Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4286c2b08c1a24fcb96503a3fb43e69cb1ae0410 Author: Michal Simek Date: Fri Mar 27 14:25:51 2009 +0100 microblaze_v8: Uartlite for Microblaze Reviewed-by: Ingo Molnar Acked-by: Peter Korsgaard Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 5f8ffb5f6649a261372547a5841285c23409ab68 Author: Michal Simek Date: Fri Mar 27 14:25:51 2009 +0100 microblaze_v8: Makefiles for Microblaze cpu Reviewed-by: Ingo Molnar Acked-by: Randy Dunlap Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 575ca2883ed7652aba09d7b77332004e45d56f69 Author: Michal Simek Date: Fri Mar 27 14:25:50 2009 +0100 microblaze_v8: Kconfig patches Reviewed-by: Ingo Molnar Acked-by: Randy Dunlap Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit eedbdab99fffb8ed71cac75a722088b8ace2583c Author: Michal Simek Date: Fri Mar 27 14:25:49 2009 +0100 microblaze_v8: Interrupt handling and timer support Reviewed-by: Thomas Gleixner Reviewed-by: Ingo Molnar Reviewed-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 3be100114a352bb4b0eee5b6a847cf4f34ce28b1 Author: Michal Simek Date: Fri Mar 27 14:25:49 2009 +0100 microblaze_v8: syscalls.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 36174f4e8742faed7da08e6110f134cf87dc03df Author: Michal Simek Date: Fri Mar 27 14:25:48 2009 +0100 microblaze_v8: pci headers Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit e96978b2729171f1dbbc0eb5b19c3524ca36e2bf Author: Michal Simek Date: Fri Mar 27 14:25:47 2009 +0100 microblaze_v8: Kbuild file Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4684dadec6ca3f310b0d9ff1860ca6b6f11ffd2d Author: Michal Simek Date: Fri Mar 27 14:25:47 2009 +0100 microblaze_v8: string.h thread_info.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit dd0105a6e9dfd64d73a0aa6f4422f5cb0c743a6c Author: Michal Simek Date: Fri Mar 27 14:25:46 2009 +0100 microblaze_v8: unistd.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 9de8901153ebf8c1070d9aca73c4a98db32abc78 Author: Michal Simek Date: Fri Mar 27 14:25:45 2009 +0100 microblaze_v8: fcntl.h sockios.h ucontext.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit a9ebdfc5edd1600c21f9ae942a95340ca948c788 Author: Michal Simek Date: Fri Mar 27 14:25:44 2009 +0100 microblaze_v8: pool.h socket.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 0a7d800de29ed4e265cfe1a27517c5d51958b94a Author: Michal Simek Date: Fri Mar 27 14:25:44 2009 +0100 microblaze_v8: device.h param.h topology.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4115ac8381b528f76f3d08f2a2387408512891c2 Author: Michal Simek Date: Fri Mar 27 14:25:43 2009 +0100 microblaze_v8: headers files entry.h current.h mman.h registers.h sembuf.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit aa683ff145fd92df147e1fef15f17e06a2ae009f Author: Michal Simek Date: Fri Mar 27 14:25:42 2009 +0100 microblaze_v8: namei.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit a1a741e4143a971dafe66f54defdea2ad9a5be5a Author: Michal Simek Date: Fri Mar 27 14:25:42 2009 +0100 microblaze_v8: gpio.h, serial.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 407f99912bd6e264340dd432c85d4e9c53d34579 Author: Michal Simek Date: Fri Mar 27 14:25:41 2009 +0100 microblaze_v8: headers simple files - empty or redirect to asm-generic Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 3a5c17b573acd712c849ba447d914dae722483b3 Author: Michal Simek Date: Fri Mar 27 14:25:40 2009 +0100 microblaze_v8: sigcontext.h siginfo.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 19d1b40ac5ba821b29fe047512ae9971a31d14c3 Author: Michal Simek Date: Fri Mar 27 14:25:40 2009 +0100 microblaze_v8: termbits.h termios.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit fb621f1790b9a14a44162ba02fb6b31479aa7cc4 Author: Michal Simek Date: Fri Mar 27 14:25:39 2009 +0100 microblaze_v8: stats headers Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 9981cd94d526a300dbef58048b1d281386b7289c Author: Michal Simek Date: Fri Mar 27 14:25:38 2009 +0100 microblaze_v8: clinkage.h linkage.h sections.h kmap_types.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4511ec153afd132da9f4308e7db394820eb52129 Author: Michal Simek Date: Fri Mar 27 14:25:37 2009 +0100 microblaze_v8: system.h processor.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 6a3cece5e5e7e7c0fde769d7cf065fb8aef6e54e Author: Michal Simek Date: Fri Mar 27 14:25:37 2009 +0100 microblaze_v8: headers pgalloc.h pgtable.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 10713b1d9f4e64468e9b9d38c32eea0814568b92 Author: Michal Simek Date: Fri Mar 27 14:25:36 2009 +0100 microblaze_v8: atomic.h bitops.h swab.h byteorder.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4dbdc9a59656d9166f9baaf8733b73e2ad0c8fa5 Author: Michal Simek Date: Fri Mar 27 14:25:35 2009 +0100 microblaze_v8: headers for irq Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 69b1b7817e68379aa55d4677657135a05a287785 Author: Michal Simek Date: Fri Mar 27 14:25:35 2009 +0100 microblaze_v8: dma support Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit c6087fdc7720e7c5cf3d52fccecb3f73e3d52ac7 Author: Michal Simek Date: Fri Mar 27 14:25:34 2009 +0100 microblaze_v8: headers for executables format FLAT, ELF Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 2c572c2824ca5d96bd22b9366389b75ff3620a13 Author: Michal Simek Date: Fri Mar 27 14:25:33 2009 +0100 microblaze_v8: io.h IO operations Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 97f34d71a0e7fea3be9c09ff2e80867b57e32aa4 Author: Michal Simek Date: Fri Mar 27 14:25:33 2009 +0100 microblaze_v8: ioctl support Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 6d9c3f20858039d98da30074b487f2059450a9b1 Author: Michal Simek Date: Fri Mar 27 14:25:32 2009 +0100 microblaze_v8: definitions of types Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 8c4f92fe02394f7bc4c079d0ab943d4aea893f14 Author: Michal Simek Date: Fri Mar 27 14:25:32 2009 +0100 microblaze_v8: bug headers files Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 9b8a45d92718e473d465d47f20e3eaca98ec63b5 Author: Michal Simek Date: Fri Mar 27 14:25:31 2009 +0100 microblaze_v8: includes SHM*, msgbuf Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 4b87d7a4f91d31f186b9d03434f800863aaf16d2 Author: Michal Simek Date: Fri Mar 27 14:25:30 2009 +0100 microblaze_v8: page.h, segment.h, unaligned.h Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit a95d0e1602f9f3ab54c7dbc9727bf22095705d1e Author: Michal Simek Date: Fri Mar 27 14:25:29 2009 +0100 microblaze_v8: memory inicialization, MMU, TLB Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 65bc60930c32b4831800056c8e0a0571c9b6a0bf Author: Michal Simek Date: Fri Mar 27 14:25:29 2009 +0100 microblaze_v8: traps support Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 7dcbbb2b17d4ef0d0541708eddfb720e2e422c3b Author: Michal Simek Date: Fri Mar 27 14:25:28 2009 +0100 microblaze_v8: IPC support Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 2b4384542691fddd309f9324b5a9af976b75e918 Author: Michal Simek Date: Fri Mar 27 14:25:27 2009 +0100 microblaze_v8: ptrace support Reviewed-by: Ingo Molnar Acked-by: John Linn Acked-by: Stephen Neuendorffer Acked-by: John Williams Signed-off-by: Michal Simek commit 216f03481d2fca7094f5f982a65acfc2ca14fa85 Author: Michal Simek Date: Fri Mar 27 14:25:27 2009 +0100 microblaze_v8: delay.h, timex.h Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 6496a23add642b7c9203411bdff3ff761835a80a Author: Michal Simek Date: Fri Mar 27 14:25:26 2009 +0100 microblaze_v8: process and init task function Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit c47f10baa0bd7e3de6b7072cfdcafef58f4147f5 Author: Michal Simek Date: Fri Mar 27 14:25:25 2009 +0100 microblaze_v8: asm-offsets.c Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit ec9f91018408617d32dc189cc5e6d030351270c5 Author: Michal Simek Date: Fri Mar 27 14:25:24 2009 +0100 microblaze_v8: setup.c, setup.h - system setting Reviewed-by: Ingo Molnar Reviewed-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit ecc6dfc8adfc76d323c513bc88cb260344c11139 Author: Michal Simek Date: Fri Mar 27 14:25:24 2009 +0100 microblaze_v8: heartbeat file Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 2660663ff2d34a3665381a2591bbc3ce0cdbd69c Author: Michal Simek Date: Fri Mar 27 14:25:23 2009 +0100 microblaze_v8: uaccess files Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 89272a51b322aa14332d58896b9d377ea9b4e551 Author: Michal Simek Date: Fri Mar 27 14:25:22 2009 +0100 microblaze_v8: early_printk support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit f11e044b449c0534cd2de3465f68925f68190866 Author: Michal Simek Date: Fri Mar 27 14:25:22 2009 +0100 microblaze_v8: checksum support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 322ae8eb91c1730728400c5b8dd1108aef1205b8 Author: Michal Simek Date: Fri Mar 27 14:25:21 2009 +0100 microblaze_v8: supported function for memory - kernel/lib Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 16bfeaf23ead78d937b3eacfb5c7cdc7bff6d3da Author: Michal Simek Date: Fri Mar 27 14:25:20 2009 +0100 microblaze_v8: vmlinux.lds.S - linker script Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 6d5af1a35f363d3bca7ecb4560102ff94f792186 Author: Michal Simek Date: Fri Mar 27 14:25:20 2009 +0100 microblaze_v8: assembler files head.S, entry-nommu.S, syscall_table.S Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 2d43dab99a5387c9bac22fc92e88ae3754672e19 Author: Michal Simek Date: Fri Mar 27 14:25:19 2009 +0100 microblaze_v8: defconfig file Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit b0c62724a52a4f541bfe77c678a0229d7a7c6844 Author: Michal Simek Date: Fri Mar 27 14:25:18 2009 +0100 microblaze_v8: PVR support, cpuinfo support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 93139b1cf85924a3cc758c9a83b8c7b689987729 Author: Michal Simek Date: Fri Mar 27 14:25:18 2009 +0100 microblaze_v8: lmb include file Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit f6b165c6ae540c607a9a62427f1b25bc5743c0aa Author: Michal Simek Date: Fri Mar 27 14:25:17 2009 +0100 microblaze_v8: kernel modules support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 7fbd3232082908e2a50c6776f4779b79085161fa Author: Michal Simek Date: Fri Mar 27 14:25:16 2009 +0100 microblaze_v8: Generic dts file for platforms Reviewed-by: Ingo Molnar Reviewed-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 8beb8503bfa305cd7d9efa590517a9c01e2f97b4 Author: Michal Simek Date: Fri Mar 27 14:25:16 2009 +0100 microblaze_v8: cache support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 37069abf2973f51aa12aa9dcb86c7403c9828161 Author: Michal Simek Date: Fri Mar 27 14:25:15 2009 +0100 microblaze_v8: Selfmodified code Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 2148daa9c45ff4f91b5890f2a453e3130288064c Author: Michal Simek Date: Fri Mar 27 14:25:14 2009 +0100 microblaze_v8: Signal support Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit c4df4bc155bbe18fb91800bb9d29499a4fb211ad Author: Michal Simek Date: Fri Mar 27 14:25:13 2009 +0100 microblaze_v8: exception handling Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 945ce1bc54e40aa0a659226b6e79a0bce065945f Author: Michal Simek Date: Fri Mar 27 14:25:12 2009 +0100 microblaze_v8: Platform bus registration Reviewed-by: Ingo Molnar Reviewed-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 12e8414263f47352b3fec8ba5efff160584202e0 Author: Michal Simek Date: Fri Mar 27 14:25:12 2009 +0100 microblaze_v8: Open firmware files Reviewed-by: Ingo Molnar Reviewed-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 406107dacde125346c313d34534eed937eb25444 Author: Michal Simek Date: Fri Mar 27 14:25:11 2009 +0100 microblaze_v8: Cpuinfo handling Reviewed-by: Ingo Molnar Acked-by: Stephen Neuendorffer Acked-by: John Linn Acked-by: John Williams Signed-off-by: Michal Simek commit 74f733c7257ca878bf0a4b9365a454ef3fefd196 Author: Dmitry Torokhov Date: Mon Mar 9 20:15:08 2009 -0700 Input: arrange drivers/input/misc/Makefile in alphabetical order Everyone adds their driver to the end of the list, hopefully if it is in alphabetical order new drivers will spread out a bit and I can merge them more easily. Signed-off-by: Dmitry Torokhov commit b4be468cc1e65110d9144751bf7079dad6f142b7 Author: Michael Hennerich Date: Mon Mar 9 20:12:52 2009 -0700 Input: add AD7879 Touchscreen driver [randy.dunlap@oracle.com: don't use bus_id] [dtor@mail.ru: locking and other fixups] Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 331b78ed300d9b37bd42dbc8b19f6277151a0dfa Author: Michael Hennerich Date: Mon Mar 9 20:12:52 2009 -0700 Input: add AD7877 touchscreen driver [dtor@mail.ru: locking and other fixups] Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 87f0fd02a4a98df105b8fcfb80f1dcbe28d01cc8 Author: Michael Hennerich Date: Fri Mar 6 01:35:35 2009 -0800 Input: bf54x-keys - fix typo in warning Signed-off-by: Michael Hennerich Signed-off-by: Bryan Wu Signed-off-by: Dmitry Torokhov commit d9bdffd2102404e8ea5f71c5b88dad890984164d Author: Phil Sutter Date: Wed Mar 4 23:27:15 2009 -0800 Input: add driver for S1 button of rb532 Mikrotik's Routerboard 532 has two builtin buttons, from which one triggers a hardware reset. The other one is accessible through GPIO pin 1. Sadly, this pin is being multiplexed with UART0 input, so enabling it as interrupt source (as implied by the gpio-keys driver) is not possible unless UART0 has been turned off. The later one though is a rather bad idea as the Routerboard is an embedded device with only a single serial port, so it's almost always used as serial console device. This patch adds a driver based on INPUT_POLLDEV, which disables the UART and reconfigures GPIO pin 1 temporarily while reading the button state. This procedure works fine and has been tested as part of another, unpublished driver for this device. Signed-off-by: Phil Sutter Signed-off-by: Dmitry Torokhov commit 73969ff0eda233f140bcbed1251431387b43f383 Author: Daniel Mack Date: Wed Mar 4 23:27:14 2009 -0800 Input: generic driver for rotary encoders on GPIOs This patch adds a generic driver for rotary encoders connected to GPIO pins of a system. It relies on gpiolib and generic hardware irqs. The documentation that also comes with this patch explains the concept and how to use the driver. Signed-off-by: Daniel Mack Tested-by: H Hartley Sweeten Signed-off-by: Dmitry Torokhov commit b0ecc7309443dbcf1a0ce2d93f39f5d92c124d42 Author: Helge Deller Date: Wed Mar 4 23:27:15 2009 -0800 Input: hilkbd - fix crash when removing hilkbd module On parisc machines, which don't have HIL, removing the hilkbd module panics the kernel. Fix this by adding proper implementations for the probe and remove functions to the parisc_driver structure. A few functions were renamed to clean up the code and make it easier readable. Disable the MODULE_DEVICE_TABLE() macro on parisc since the kernel module autoloader should instead prefer the hp_sdc driver which takes care of full HIL support, including HIL mouse and HIL tablets. [dtor@mail.ru: fix some section markups] Signed-off-by: Helge Deller Acked-by: Geert Uytterhoeven Signed-off-by: Dmitry Torokhov commit adcb523eb39e0dd2f712d8dbd8e18b5d36a97825 Author: Daniel Mierswa Date: Wed Mar 4 23:27:15 2009 -0800 Input: atkbd - add quirk for Fujitsu Siemens Amilo PA 1510 The volume up and down keys on the Fujitsu Siemens Amilo PA 1510 laptop won't generate release events, so we have to do that. Use the same way that is already used with other models. Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 391916985b009b8934d00f772a3bde0d8a495ebd Author: Daniel Mierswa Date: Wed Mar 4 23:27:15 2009 -0800 Input: atkbd - consolidate force release quirk setup Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 22e39d344f5f3465dffb9e2713bb8d7cf1f5aec8 Author: Mark Brown Date: Wed Mar 4 01:12:49 2009 -0800 Input: add accelerated touchscreen support for Marvell Zylonite This patch implements accelerated touchscreen support for the Marvell Zylonite development platform, supporting pen down interrupts and continuous mode data transfers. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit cd2d64b1a0a12283d63c9d853d5b1403d5cd6c9d Author: Mike Rapoport Date: Wed Mar 4 01:12:49 2009 -0800 Input: ucb1400_ts, mainstone-wm97xx - add BTN_TOUCH events Add BTN_TOUCH event reporting to ucb1400_ts and accelerated mainstone-wm97xx touchscreen drivers. Together with previously posted similar patch for wm97xx-core this will make all touchscreen drivers behave consistently wrt. BTN_TOUCH. Signed-off-by: Mike Rapoport Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit a700e72dd009c79c62e78ebeefa27315db6e1e60 Author: Mark Brown Date: Wed Mar 4 01:12:49 2009 -0800 Input: wm97xx - use disable_irq_nosync() for Mainstone This should make no practical difference since the Mainstone can't be SMP but it is more correct. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 65db86ac07e2f7f91a552490c0be6a99aab8e4a8 Author: Mike Rapoport Date: Wed Mar 4 01:12:37 2009 -0800 Input: wm97xx - add BTN_TOUCH event to wm97xx to use it with Android Android expects BTN_TOUCH events when pen state changes. Add BTN_TOUCH event reporting to allow use of wm97xx touchscreen controller wiht Android devices. Signed-off-by: Mike Rapoport Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit fa88661224946145819a904cef2ec7dd5c9c78bc Author: Dmitry Torokhov Date: Wed Mar 4 00:52:20 2009 -0800 Input: fix polling of /proc/bus/input/devices Tested-by: Alessio Sangalli Signed-off-by: Dmitry Torokhov commit d15c22e78674f9a5bc0de0932a43abe1aafae303 Merge: 0f49548 fec6c6f Author: Dmitry Torokhov Date: Sun Mar 8 16:30:55 2009 -0700 Merge commit 'v2.6.29-rc7' into next commit 0f4954819fb6f840d46076f0dbd313ef5da48f5d Author: Andy Whitcroft Date: Sat Feb 28 14:55:46 2009 -0800 Input: psmouse - add newline to OLPC HGPK touchpad debugging When probing for the OLPC HGPK touchpad the ID of the probed touchpad is emitted, but the debug is missing the terminating newline. This causes later information to run into it, and for that to be categorised incorrectly at KERN_DBG. Fix this up. Reported-by: Matt Zimmerman Signed-off-by: Andy Whitcroft Signed-off-by: Dmitry Torokhov 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 commit 8a49cfa9de4ef47eb9238d625b900d4cdddccf30 Author: Ville Syrjala Date: Thu Jan 29 23:42:16 2009 -0800 Input: ati_remote2 - check module params Validate that the values of the module parameters are within the supported range. Also print the values in hex since that seems like a better match for bitmasks than decimal. Signed-off-by: Ville Syrjala Signed-off-by: Dmitry Torokhov commit d329e33c7c2bdcd955a00c84a9363cb309cad352 Author: Ville Syrjala Date: Thu Jan 29 23:42:16 2009 -0800 Input: ati_remote2 - add per device attrs Add per device channel_mask and mode_mask attributes. They inherit the values from the module parameters when the device is registered. One additional benefit is that now runtime changes to channel_mask can actually affect the hardware channel setup like they should. Signed-off-by: Ville Syrjala Signed-off-by: Dmitry Torokhov commit 169bc1efa84680d0a8c9567539f8577fd52e1a77 Author: Ville Syrjala Date: Thu Jan 29 23:42:16 2009 -0800 Input: ati_remote2 - complete suspend support Add the missing reset_resume, pre_reset and post_reset hooks. Signed-off-by: Ville Syrjala Signed-off-by: Dmitry Torokhov commit e7b5c1ef4d87426da0b689a0a4fa67edda02ea5c Author: Johannes Berg Date: Thu Jan 29 23:17:52 2009 -0800 Input: stop autorepeat timer on key release Whenever you press and then release a key, the CPU wakes up three times: * press * release * autorepeat timer exactly 250ms after press The autorepeat timer has nothing to do, obviously, since you already have released the key, so stop it on key release. [dtor@mail.ru: This changes autorepeat behavior a bit since we now stop autorepeat even if key that is being released is not the one that is being auto-repeated, but I believe the new behavior is better.] Signed-off-by: Johannes Berg Signed-off-by: Dmitry Torokhov commit b0ee0d3eb31a163c958f2960906c44bcdfdc607b Author: Roel Kluin Date: Thu Jan 29 22:56:08 2009 -0800 Input: pc110pad - use no_pci_devices() Use no_pci_devices() helper instead of doing explicit get/put. Signed-off-by: Roel Kluin Signed-off-by: Dmitry Torokhov commit 03dd5e1ba55d43c3a12b8514f9889049037f17f7 Author: Adrian McMenamin Date: Thu Jan 29 22:56:08 2009 -0800 Input: add support for the Maple mouse on the SEGA Dreamcast Signed-off-by: Adrian McMenamin Acked-by: Mike Frysinger Signed-off-by: Dmitry Torokhov